Merge pull request #15296 from benpicco/drivers/mtd_spi_nor-rework

drivers/mtd_spi_nor: cleanup & bug fixes

Author: benpicco

boards/ikea-tradfri/board.c

@@ -30,7 +30,6 @@ static const mtd_spi_nor_params_t _ikea_tradfri_nor_params = {
     .wait_chip_erase = 2LU * US_PER_SEC,
     .wait_32k_erase = 500LU *US_PER_MS,
     .wait_sector_erase = 300LU * US_PER_MS,
-    .wait_4k_erase = 300LU * US_PER_MS,
     .wait_chip_wake_up = 1LU * US_PER_MS,
     .clk = IKEA_TRADFRI_NOR_SPI_CLK,
     .flag = IKEA_TRADFRI_NOR_FLAGS,

boards/mulle/board.c

@@ -51,9 +51,8 @@ static devfs_t mulle_nvram_devfs = {
 static const mtd_spi_nor_params_t mulle_nor_params = {
     .opcode = &mtd_spi_nor_opcode_default,
     .wait_chip_erase = 16LU * US_PER_SEC,
-    .wait_sector_erase = 40LU * US_PER_MS,
+    .wait_sector_erase = 10LU * US_PER_MS,
     .wait_32k_erase = 20LU * US_PER_MS,
-    .wait_4k_erase = 10LU * US_PER_MS,
     .wait_chip_wake_up = 1LU * US_PER_MS,
     .spi = MULLE_NOR_SPI_DEV,
     .cs = MULLE_NOR_SPI_CS,

boards/nrf52840dk/mtd.c

@@ -32,7 +32,6 @@ static const mtd_spi_nor_params_t _nrf52840dk_nor_params = {
     .wait_chip_erase = 50LU * US_PER_SEC,
     .wait_32k_erase = 240LU *US_PER_MS,
     .wait_sector_erase = 40LU * US_PER_MS,
-    .wait_4k_erase = 40LU * US_PER_MS,
     .wait_chip_wake_up = 35LU * US_PER_MS,
     .clk = NRF52840DK_NOR_SPI_CLK,
     .flag = NRF52840DK_NOR_FLAGS,

boards/pinetime/board.c

@@ -35,7 +35,6 @@ static const mtd_spi_nor_params_t _pinetime_nor_params = {
     .wait_chip_erase = 9LU * US_PER_SEC,
     .wait_32k_erase = 160LU *US_PER_MS,
     .wait_sector_erase = 70LU * US_PER_MS,
-    .wait_4k_erase = 70LU * US_PER_MS,
     .wait_chip_wake_up = 1LU * US_PER_MS,
     .clk = PINETIME_NOR_SPI_CLK,
     .flag = PINETIME_NOR_FLAGS,

boards/serpente/board.c

@@ -33,7 +33,6 @@ static const mtd_spi_nor_params_t _serpente_nor_params = {
     .wait_chip_erase = 15LU * US_PER_SEC,
     .wait_32k_erase = 250LU * US_PER_MS,
     .wait_sector_erase = 50LU * US_PER_MS,
-    .wait_4k_erase = 150LU * US_PER_MS,
     .wait_chip_wake_up = 1LU * US_PER_MS,
     .clk = SERPENTE_NOR_SPI_CLK,
     .flag = SERPENTE_NOR_FLAGS,

boards/weact-f411ce/board.c

@@ -32,7 +32,6 @@ static const mtd_spi_nor_params_t _weact_nor_params = {
     .wait_chip_erase = 4800LU * US_PER_MS,
     .wait_32k_erase = 300LU * US_PER_MS,
     .wait_sector_erase = 70LU * US_PER_MS,
-    .wait_4k_erase = 70LU * US_PER_MS,
     .wait_chip_wake_up = 1LU * US_PER_MS,
     .clk = WEACT_411CE_NOR_SPI_CLK,
     .flag = WEACT_411CE_NOR_FLAGS,

drivers/include/mtd_spi_nor.h

@@ -49,7 +49,7 @@ typedef struct {
     uint8_t page_program;    /**< Page program */
     uint8_t sector_erase;    /**< Block erase 4 KiB */
     uint8_t block_erase_32k; /**< 32KiB block erase */
-    uint8_t block_erase;     /**< Block erase (usually 64 KiB) */
+    uint8_t block_erase_64k; /**< Block erase (usually 64 KiB) */
     uint8_t chip_erase;      /**< Chip erase */
     uint8_t sleep;           /**< Deep power down */
     uint8_t wake;            /**< Release from deep power down */
@@ -74,24 +74,37 @@ typedef struct __attribute__((packed)) {
  */
 #define JEDEC_NEXT_BANK (0x7f)
 
+/**
+ * @brief   The highest possible bank number when reading manufacturer ID
+ *
+ * @see http://www.jedec.org/standards-documents/results/jep106
+ */
+#define JEDEC_BANK_MAX  (10)
+
 /**
  * @brief   Flag to set when the device support 4KiB sector erase (sector_erase opcode)
  */
 #define SPI_NOR_F_SECT_4K   (1)
+
 /**
  * @brief   Flag to set when the device support 32KiB block erase (block_erase_32k opcode)
  */
 #define SPI_NOR_F_SECT_32K  (2)
 
+/**
+ * @brief   Flag to set when the device support 64KiB block erase (block_erase_32k opcode)
+ */
+#define SPI_NOR_F_SECT_64K  (4)
+
 /**
  * @brief Compile-time parameters for a serial flash device
  */
 typedef struct {
     const mtd_spi_nor_opcode_t *opcode; /**< Opcode table for the device */
     uint32_t wait_chip_erase;   /**< Full chip erase wait time in µs */
-    uint32_t wait_sector_erase; /**< Sector erase wait time in µs */
+    uint32_t wait_64k_erase;    /**< 64KB page erase wait time in µs */
     uint32_t wait_32k_erase;    /**< 32KB page erase wait time in µs */
-    uint32_t wait_4k_erase;     /**< 4KB page erase wait time in µs */
+    uint32_t wait_sector_erase; /**< 4KB sector erase wait time in µs */
     uint32_t wait_chip_wake_up; /**< Chip wake up time in µs */
     spi_clk_t clk;           /**< SPI clock */
     uint16_t flag;           /**< Config flags */