Add support for W25N02K 2Gbit/256Mbyte FLASH (betaflight#13677)

* Add support for W25N02K 2Gbit/256Mbyte FLASH * Remove duplicate defintion check * Rename W25N01G_BB_*_BLOCK macros * Remove debug * Create unified driver for W25N01G and W25N02K devices * Put device parameters in a table * Add W25N01GV to stacked die driver
HThuren · Jun 8, 2024 · ab022b0 · ab022b0
1 parent 6080bff
commit ab022b0
Show file tree

Hide file tree

Showing 7 changed files with 272 additions and 260 deletions.
diff --git a/mk/source.mk b/mk/source.mk
@@ -247,7 +247,7 @@ RX_SRC = \
 FLASH_SRC += \
             drivers/flash.c \
             drivers/flash_m25p16.c \
-            drivers/flash_w25n01g.c \
+            drivers/flash_w25n.c \
             drivers/flash_w25q128fv.c \
             drivers/flash_w25m.c \
             io/flashfs.c

diff --git a/src/main/drivers/flash.c b/src/main/drivers/flash.c
@@ -31,7 +31,7 @@
 #include "flash.h"
 #include "flash_impl.h"
 #include "flash_m25p16.h"
-#include "flash_w25n01g.h"
+#include "flash_w25n.h"
 #include "flash_w25q128fv.h"
 #include "flash_w25m.h"
 #include "drivers/bus_spi.h"
@@ -162,8 +162,8 @@ MMFLASH_CODE_NOINLINE static bool flashOctoSpiInit(const flashConfig_t *flashCon
 #ifdef USE_OCTOSPI_EXPERIMENTAL
                 if (!memoryMappedModeEnabledOnBoot) {
                     // These flash chips DO NOT support memory mapped mode; suitable flash read commands must be available.
-#if defined(USE_FLASH_W25N01G)
-                    if (!detected && w25n01g_identify(&flashDevice, jedecID)) {
+#if defined(USE_FLASH_W25N01G) || defined(USE_FLASH_W25N02K)
+                    if (!detected && w25n_identify(&flashDevice, jedecID)) {
                         detected = true;
                     }
 #endif
@@ -247,7 +247,7 @@ static bool flashQuadSpiInit(const flashConfig_t *flashConfig)
 
             if (offset == 1) {
 #if defined(USE_FLASH_W25N01G)
-                if (!detected && w25n01g_identify(&flashDevice, jedecID)) {
+                if (!detected && w25n_identify(&flashDevice, jedecID)) {
                     detected = true;
                 }
 #endif
@@ -333,8 +333,8 @@ static bool flashSpiInit(const flashConfig_t *flashConfig)
         jedecID = (readIdResponse[1] << 16) | (readIdResponse[2] << 8) | (readIdResponse[3]);
     }
 
-#ifdef USE_FLASH_W25N01G
-    if (!detected && w25n01g_identify(&flashDevice, jedecID)) {
+#ifdef USE_FLASH_W25N
+    if (!detected && w25n_identify(&flashDevice, jedecID)) {
         detected = true;
     }
 #endif

diff --git a/src/main/drivers/flash_w25m.c b/src/main/drivers/flash_w25m.c
@@ -43,7 +43,7 @@
 
 #include "flash_m25p16.h"
 #include "flash_w25m.h"
-#include "flash_w25n01g.h"
+#include "flash_w25n.h"
 
 #include "pg/flash.h"
 
@@ -52,6 +52,7 @@
 #define JEDEC_ID_WINBOND_W25M512                     0xEF7119 // W25Q256 x 2
 #define JEDEC_ID_WINBOND_W25M02G                     0xEFAB21 // W25N01G x 2
 #define JEDEC_ID_WINBOND_W25Q256                     0xEF4019
+#define JEDEC_ID_WINBOND_W25N01GV                    0xEFAA21
 
 static const flashVTable_t w25m_vTable;
 
@@ -143,7 +144,7 @@ bool w25m_identify(flashDevice_t *fdevice, uint32_t jedecID)
             w25m_dieSelect(fdevice->io.handle.dev, die);
             dieDevice[die].io.handle.dev = fdevice->io.handle.dev;
             dieDevice[die].io.mode = fdevice->io.mode;
-            w25n01g_identify(&dieDevice[die], JEDEC_ID_WINBOND_W25N01GV);
+            w25n_identify(&dieDevice[die], JEDEC_ID_WINBOND_W25N01GV);
         }
 
         fdevice->geometry.flashType = FLASH_TYPE_NAND;