summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-04-14 03:28:03 +0000
committerQMK Bot <hello@qmk.fm>2022-04-14 03:28:03 +0000
commit88028dd982ef8048e582abda10c47128dfe223b4 (patch)
tree983f9a04175cf035d274a8f73b6f00e22ec7c206 /drivers
parent2858415789c5ff60b52f41b27059735018a3fa4b (diff)
parent18e56902c996854fdb3b68a26f07c0751883701d (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'drivers')
-rw-r--r--drivers/flash/flash_spi.c2
-rw-r--r--drivers/flash/flash_spi.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/flash/flash_spi.c b/drivers/flash/flash_spi.c
index f4cbf65159..684ee06d71 100644
--- a/drivers/flash/flash_spi.c
+++ b/drivers/flash/flash_spi.c
@@ -57,7 +57,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Mode setting comands */
#define FLASH_CMD_DP 0xB9 /* DP (Deep Power Down) */
-#define FLASH_CMD_RDP 0xAB /* RDP (Release form Deep Power Down) */
+#define FLASH_CMD_RDP 0xAB /* RDP (Release from Deep Power Down) */
/* Status register */
#define FLASH_FLAG_WIP 0x01 /* Write in progress bit */
diff --git a/drivers/flash/flash_spi.h b/drivers/flash/flash_spi.h
index abe95e955e..87460fc210 100644
--- a/drivers/flash/flash_spi.h
+++ b/drivers/flash/flash_spi.h
@@ -74,21 +74,21 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
The sector size of the FLASH in bytes, as specified in the datasheet.
*/
#ifndef EXTERNAL_FLASH_SECTOR_SIZE
-# define EXTERNAL_FLASH_SECTOR_SIZE (4 * 1024)
+# define EXTERNAL_FLASH_SECTOR_SIZE (4 * 1024L)
#endif
/*
The block size of the FLASH in bytes, as specified in the datasheet.
*/
#ifndef EXTERNAL_FLASH_BLOCK_SIZE
-# define EXTERNAL_FLASH_BLOCK_SIZE (64 * 1024)
+# define EXTERNAL_FLASH_BLOCK_SIZE (64 * 1024L)
#endif
/*
The total size of the FLASH in bytes, as specified in the datasheet.
*/
#ifndef EXTERNAL_FLASH_SIZE
-# define EXTERNAL_FLASH_SIZE (512 * 1024)
+# define EXTERNAL_FLASH_SIZE (512 * 1024L)
#endif
/*