clean up, rename PIN_QSPI_DATAx to PIN_QSPI_IOx

Author: hathach

cores/nRF5/flash/flash_qspi.c

@@ -128,10 +128,10 @@ void flash_qspi_init (void)
     .pins = {
       .sck_pin = g_ADigitalPinMap[PIN_QSPI_SCK],
       .csn_pin = g_ADigitalPinMap[PIN_QSPI_CS],
-      .io0_pin = g_ADigitalPinMap[PIN_QSPI_DATA0],
-      .io1_pin = g_ADigitalPinMap[PIN_QSPI_DATA1],
-      .io2_pin = g_ADigitalPinMap[PIN_QSPI_DATA2],
-      .io3_pin = g_ADigitalPinMap[PIN_QSPI_DATA3],
+      .io0_pin = g_ADigitalPinMap[PIN_QSPI_IO0],
+      .io1_pin = g_ADigitalPinMap[PIN_QSPI_IO1],
+      .io2_pin = g_ADigitalPinMap[PIN_QSPI_IO2],
+      .io3_pin = g_ADigitalPinMap[PIN_QSPI_IO3],
     },
     .prot_if = {
       .readoc = NRF_QSPI_READOC_READ4IO,

variants/feather_nrf52840_express/variant.cpp

@@ -104,8 +104,5 @@ void initVariant()
 
   pinMode(PIN_LED2, OUTPUT);
   ledOff(PIN_LED2);
-
-  // Init External Flash
-  flash_qspi_init();
 }
 

variants/feather_nrf52840_express/variant.h

@@ -122,15 +122,13 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 #define PIN_WIRE_SDA         (22)
 #define PIN_WIRE_SCL         (23)
 
-/*
- * QSPI interface for external flash
- */
+// QSPI Pins
 #define PIN_QSPI_SCK         27
 #define PIN_QSPI_CS          28
-#define PIN_QSPI_DATA0       29
-#define PIN_QSPI_DATA1       30
-#define PIN_QSPI_DATA2       31
-#define PIN_QSPI_DATA3       32
+#define PIN_QSPI_IO0         29
+#define PIN_QSPI_IO1         30
+#define PIN_QSPI_IO2         31
+#define PIN_QSPI_IO3         32
 
 // On-board QSPI Flash
 #define EXTERNAL_FLASH_DEVICES   GD25Q16C

variants/metro_nrf52840_express/variant.h

@@ -122,15 +122,13 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 #define PIN_WIRE_SDA         (22)
 #define PIN_WIRE_SCL         (23)
 
-/*
- * QSPI interface for external flash
- */
-#define PIN_QSPI_SCK         27
-#define PIN_QSPI_CS          28
-#define PIN_QSPI_DATA0       29
-#define PIN_QSPI_DATA1       30
-#define PIN_QSPI_DATA2       31
-#define PIN_QSPI_DATA3       32
+// QSPI Pins
+#define PIN_QSPI_SCK       27
+#define PIN_QSPI_CS        28
+#define PIN_QSPI_IO0       29
+#define PIN_QSPI_IO1       30
+#define PIN_QSPI_IO2       31
+#define PIN_QSPI_IO3       32
 
 // On-board QSPI Flash
 // If EXTERNAL_FLASH_DEVICES is not defined, all supported devices will be used

variants/pca10056/variant.cpp

@@ -45,9 +45,6 @@ void initVariant()
   ledOff(PIN_LED1);
 
   pinMode(PIN_LED2, OUTPUT);
-  ledOff(PIN_LED2);
-
-  // Init External Flash
-  flash_qspi_init();
+  ledOff(PIN_LED2);;
 }
 

variants/pca10056/variant.h

@@ -114,15 +114,13 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 #define PIN_WIRE_SDA         (26)
 #define PIN_WIRE_SCL         (27)
 
-/*
- * QSPI interface for external flash
- */
+// QSPI Pins
 #define PIN_QSPI_SCK         19
 #define PIN_QSPI_CS          17
-#define PIN_QSPI_DATA0       20
-#define PIN_QSPI_DATA1       21
-#define PIN_QSPI_DATA2       22
-#define PIN_QSPI_DATA3       23
+#define PIN_QSPI_IO0         20
+#define PIN_QSPI_IO1         21
+#define PIN_QSPI_IO2         22
+#define PIN_QSPI_IO3         23
 
 // On-board QSPI Flash
 #define EXTERNAL_FLASH_DEVICES   MX25R6435F