wip qspi flash

apache · Jul 18, 2024 · e58a064 · e58a064
1 parent a0a803f
commit e58a064
Show file tree

Hide file tree

Showing 14 changed files with 126 additions and 867 deletions.
diff --git a/hw/bsp/nordic_pca10056/src/hal_bsp.c b/hw/bsp/nordic_pca10056/src/hal_bsp.c
@@ -51,7 +51,7 @@ hal_bsp_flash_dev(uint8_t id)
     }
 #if MYNEWT_VAL(QSPI_ENABLE)
     if (id == 1) {
-        return &nrf52k_qspi_dev;
+        return &nrf_qspi_dev;
     }
 #endif
     return NULL;

diff --git a/hw/bsp/nordic_pca10059/src/hal_bsp.c b/hw/bsp/nordic_pca10059/src/hal_bsp.c
@@ -51,7 +51,7 @@ hal_bsp_flash_dev(uint8_t id)
     }
 #if MYNEWT_VAL(QSPI_ENABLE)
     if (id == 1) {
-        return &nrf52k_qspi_dev;
+        return &nrf_qspi_dev;
     }
 #endif
     return NULL;

diff --git a/hw/bsp/nordic_pca10095/src/hal_bsp.c b/hw/bsp/nordic_pca10095/src/hal_bsp.c
@@ -57,7 +57,7 @@ hal_bsp_flash_dev(uint8_t id)
     }
 #if MYNEWT_VAL(QSPI_ENABLE)
     if (id == 1) {
-        return &nrf5340_qspi_dev;
+        return &nrf_qspi_dev;
     }
 #endif
 #if MYNEWT_VAL(IPC_NRF5340_FLASH_CLIENT)

diff --git a/hw/bsp/nordic_pca10121/src/hal_bsp.c b/hw/bsp/nordic_pca10121/src/hal_bsp.c
@@ -58,7 +58,7 @@ hal_bsp_flash_dev(uint8_t id)
     }
 #if MYNEWT_VAL(QSPI_ENABLE)
     if (id == 1) {
-        return &nrf5340_qspi_dev;
+        return &nrf_qspi_dev;
     }
 #endif
 #if MYNEWT_VAL(IPC_NRF5340_FLASH_CLIENT)

diff --git a/hw/bsp/nordic_thingy53/src/hal_bsp.c b/hw/bsp/nordic_thingy53/src/hal_bsp.c
@@ -57,7 +57,7 @@ hal_bsp_flash_dev(uint8_t id)
     }
 #if MYNEWT_VAL(QSPI_ENABLE)
     if (id == 1) {
-        return &nrf5340_qspi_dev;
+        return &nrf_qspi_dev;
     }
 #endif
 #if MYNEWT_VAL(IPC_NRF5340_FLASH_CLIENT)

diff --git a/hw/bsp/ublox_bmd_345/src/hal_bsp.c b/hw/bsp/ublox_bmd_345/src/hal_bsp.c
@@ -52,7 +52,7 @@ hal_bsp_flash_dev(uint8_t id)
     }
 #if MYNEWT_VAL(QSPI_ENABLE)
     if (id == 1) {
-        return &nrf52k_qspi_dev;
+        return &nrf_qspi_dev;
     }
 #endif
     return NULL;

diff --git a/hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_hal.h b/hw/mcu/nordic/nrf52xxx/include/mcu/nrf52_hal.h
@@ -40,8 +40,6 @@ struct nrf52_hal_i2c_cfg {
     uint32_t i2c_frequency;
 };
 
-extern const struct hal_flash nrf52k_qspi_dev;
-
 /* SPI configuration (used for both master and slave) */
 struct nrf52_hal_spi_cfg {
     uint8_t sck_pin;

diff --git a/hw/mcu/nordic/nrf52xxx/include/nrfx_config_nrf52840.h b/hw/mcu/nordic/nrf52xxx/include/nrfx_config_nrf52840.h
@@ -782,8 +782,12 @@
  * Boolean. Accepted values: 0 and 1.
  */
 #ifndef NRFX_QSPI_ENABLED
+#if MYNEWT_VAL(QSPI_ENABLE)
+#define NRFX_QSPI_ENABLED 1
+#else
 #define NRFX_QSPI_ENABLED 0
 #endif
+#endif
 
 /**
  * @brief NRFX_QSPI_DEFAULT_CONFIG_IRQ_PRIORITY