Merge pull request #327 from UnTraDe/spi_nand_flash/support_for_micro…

…n_MT29F added support for Micron MT29F nand flash ()
espressif · Jul 23, 2024 · 2da4e71 · 2da4e71
2 parents 47c8e7b + 2f4efeb
commit 2da4e71
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 2 deletions.
diff --git a/spi_nand_flash/examples/nand_flash/main/spi_nand_flash_example_main.c b/spi_nand_flash/examples/nand_flash/main/spi_nand_flash_example_main.c
@@ -121,6 +121,7 @@ static spi_nand_flash_device_t *example_init_nand_flash(void)
         .sclk_io_num = PIN_CLK,
         .quadhd_io_num = PIN_HD,
         .quadwp_io_num = PIN_WP,
+        .max_transfer_sz = 4096 * 2,
     };
 
     // Initialize the SPI bus

diff --git a/spi_nand_flash/idf_component.yml b/spi_nand_flash/idf_component.yml
@@ -1,4 +1,4 @@
-version: "0.1.0"
+version: "0.2.0"
 description: Driver for accessing SPI NAND Flash
 url: https://github.com/espressif/idf-extra-components/tree/master/spi_nand_flash
 issues: https://github.com/espressif/idf-extra-components/issues

diff --git a/spi_nand_flash/src/nand.c b/spi_nand_flash/src/nand.c
@@ -129,6 +129,31 @@ static esp_err_t spi_nand_gigadevice_init(spi_nand_flash_device_t *dev)
     return ESP_OK;
 }
 
+static esp_err_t spi_nand_micron_init(spi_nand_flash_device_t *dev)
+{
+    uint8_t device_id;
+    spi_nand_transaction_t t = {
+        .command = CMD_READ_ID,
+        .dummy_bits = 16,
+        .miso_len = 1,
+        .miso_data = &device_id
+    };
+    spi_nand_execute_transaction(dev->config.device_handle, &t);
+    dev->read_page_delay_us = 115;
+    dev->erase_block_delay_us = 2000;
+    dev->program_page_delay_us = 240;
+    switch (device_id) {
+    case MICRON_DI_34:
+        dev->dhara_nand.num_blocks = 2048;
+        dev->dhara_nand.log2_ppb = 6;        // 64 pages per block
+        dev->dhara_nand.log2_page_size = 12; // 4096 bytes per page
+        break;
+    default:
+        return ESP_ERR_INVALID_RESPONSE;
+    }
+    return ESP_OK;
+}
+
 static esp_err_t detect_chip(spi_nand_flash_device_t *dev)
 {
     uint8_t manufacturer_id;
@@ -148,6 +173,8 @@ static esp_err_t detect_chip(spi_nand_flash_device_t *dev)
         return spi_nand_winbond_init(dev);
     case SPI_NAND_FLASH_GIGADEVICE_MI: // GigaDevice
         return spi_nand_gigadevice_init(dev);
+    case SPI_NAND_FLASH_MICRON_MI: // Micron
+        return spi_nand_micron_init(dev);
     default:
         return ESP_ERR_INVALID_RESPONSE;
     }

diff --git a/spi_nand_flash/src/nand_flash_devices.h b/spi_nand_flash/src/nand_flash_devices.h
@@ -10,6 +10,7 @@
 #define SPI_NAND_FLASH_GIGADEVICE_MI  0xC8
 #define SPI_NAND_FLASH_ALLIANCE_MI    0x52
 #define SPI_NAND_FLASH_WINBOND_MI     0xEF
+#define SPI_NAND_FLASH_MICRON_MI      0x2C
 
 //Device ID (DI) for supported nand flash devices
 
@@ -39,3 +40,5 @@
 #define WINBOND_DI_AA21               0xAA21
 #define WINBOND_DI_BA21               0xBA21
 #define WINBOND_DI_BC21               0xBC21
+
+#define MICRON_DI_34                  0x34
diff --git a/spi_nand_flash/test_app/main/idf_component.yml b/spi_nand_flash/test_app/main/idf_component.yml
@@ -1,4 +1,4 @@
 dependencies:
   espressif/spi_nand_flash:
-    version: '0.1.0'
+    version: '*'
     override_path: '../../'