include: spi: relocate spi_nor.h

ExaltZephyr · ExaltZephyr · commit ef5029093558 · 2025-11-19T12:05:57.000+02:00
This commit moves spi_nor.h from drivers/flash
to include/drivers/spi directory and updates
affected flash drivers with new include path

Signed-off-by: Sara Touqan &lt;zephyr@exalt.ps&gt;
Signed-off-by: Sarah Younis &lt;zephyr@exalt.ps&gt;
Signed-off-by: Mohammad Odeh &lt;zephyr@exalt.ps&gt;
diff --git a/drivers/flash/flash_andes_qspi.c b/drivers/flash/flash_andes_qspi.c
@@ -15,7 +15,7 @@
 #include <zephyr/logging/log.h>
 
 #include "flash_andes_qspi.h"
-#include "spi_nor.h"
+#include <zephyr/drivers/spi/spi_nor.h>
 #include "jesd216.h"
 #include "flash_priv.h"
 
diff --git a/drivers/flash/flash_andes_qspi_xip.c b/drivers/flash/flash_andes_qspi_xip.c
@@ -21,7 +21,7 @@
 #include <zephyr/logging/log.h>
 
 #include "flash_andes_qspi.h"
-#include "spi_nor.h"
+#include <zephyr/drivers/spi/spi_nor.h>
 
 LOG_MODULE_REGISTER(flash_andes_xip, CONFIG_FLASH_LOG_LEVEL);
 
diff --git a/drivers/flash/flash_max32_spixf_nor.c b/drivers/flash/flash_max32_spixf_nor.c
@@ -47,7 +47,7 @@
 
 #include <spixf.h>
 
-#include "spi_nor.h"
+#include <zephyr/drivers/spi/spi_nor.h>
 #include "jesd216.h"
 
 #include <zephyr/logging/log.h>
diff --git a/drivers/flash/flash_mcux_flexspi_mx25um51345g.c b/drivers/flash/flash_mcux_flexspi_mx25um51345g.c
@@ -10,7 +10,7 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/irq.h>
 #include <zephyr/sys/util.h>
-#include "spi_nor.h"
+#include <zephyr/drivers/spi/spi_nor.h>
 #include "memc_mcux_flexspi.h"
 
 #ifdef CONFIG_HAS_MCUX_CACHE
diff --git a/drivers/flash/flash_mcux_flexspi_nor.c b/drivers/flash/flash_mcux_flexspi_nor.c
@@ -11,7 +11,7 @@
 #include <zephyr/irq.h>
 #include <zephyr/logging/log.h>
 #include <zephyr/sys/util.h>
-#include "spi_nor.h"
+#include <zephyr/drivers/spi/spi_nor.h>
 #include "jesd216.h"
 #include "memc_mcux_flexspi.h"
 
diff --git a/drivers/flash/flash_mcux_xspi.c b/drivers/flash/flash_mcux_xspi.c
@@ -14,7 +14,7 @@
 #include <zephyr/logging/log.h>
 #include <zephyr/irq.h>
 #include "memc_mcux_xspi.h"
-#include "spi_nor.h"
+#include <zephyr/drivers/spi/spi_nor.h>
 
 LOG_MODULE_REGISTER(flash_mcux_xspi);
 
diff --git a/drivers/flash/flash_mspi_atxp032.c b/drivers/flash/flash_mspi_atxp032.c
@@ -25,7 +25,7 @@ typedef enum mspi_timing_param mspi_timing_param;
 #endif
 
 #include <zephyr/drivers/flash.h>
-#include "spi_nor.h"
+#include <zephyr/drivers/spi/spi_nor.h>
 LOG_MODULE_REGISTER(flash_mspi_atxp032, CONFIG_FLASH_LOG_LEVEL);
 
 #define NOR_WRITE_SIZE                      1
diff --git a/drivers/flash/flash_mspi_emul_device.c b/drivers/flash/flash_mspi_emul_device.c
@@ -13,7 +13,7 @@
 #include <zephyr/drivers/mspi.h>
 #include <zephyr/drivers/mspi_emul.h>
 #include <zephyr/drivers/flash.h>
-#include "spi_nor.h"
+#include <zephyr/drivers/spi/spi_nor.h>
 
 LOG_MODULE_REGISTER(zephyr_mspi_emul_flash, CONFIG_FLASH_LOG_LEVEL);
 
diff --git a/drivers/flash/flash_mspi_is25xX0xx.c b/drivers/flash/flash_mspi_is25xX0xx.c
@@ -17,7 +17,7 @@
 #include <zephyr/drivers/mspi.h>
 #include <zephyr/cache.h>
 #include <zephyr/drivers/flash.h>
-#include "spi_nor.h"
+#include <zephyr/drivers/spi/spi_nor.h>
 
 #if CONFIG_SOC_FAMILY_AMBIQ
 
diff --git a/drivers/flash/flash_mspi_nor.h b/drivers/flash/flash_mspi_nor.h
@@ -14,7 +14,7 @@ extern "C" {
 #include <zephyr/drivers/flash.h>
 #include <zephyr/drivers/mspi.h>
 #include "jesd216.h"
-#include "spi_nor.h"
+#include <zephyr/drivers/spi/spi_nor.h>
 
 #if DT_ANY_INST_HAS_PROP_STATUS_OKAY(supply_gpios)
 #define WITH_SUPPLY_GPIO 1
diff --git a/drivers/flash/flash_npcx_fiu_nor.c b/drivers/flash/flash_npcx_fiu_nor.c
@@ -18,7 +18,7 @@
 #endif
 
 #include "flash_npcx_fiu_qspi.h"
-#include "spi_nor.h"
+#include <zephyr/drivers/spi/spi_nor.h>
 
 #include <zephyr/logging/log.h>
 LOG_MODULE_REGISTER(flash_npcx_fiu_nor, CONFIG_FLASH_LOG_LEVEL);
diff --git a/drivers/flash/flash_nxp_s32_qspi_nor.c b/drivers/flash/flash_nxp_s32_qspi_nor.c
@@ -15,7 +15,7 @@ LOG_MODULE_REGISTER(nxp_s32_qspi_nor, CONFIG_FLASH_LOG_LEVEL);
 
 #include <Qspi_Ip.h>
 
-#include "spi_nor.h"
+#include <zephyr/drivers/spi/spi_nor.h>
 #include "jesd216.h"
 
 #include "memc_nxp_s32_qspi.h"
diff --git a/drivers/flash/flash_realtek_rts5912.c b/drivers/flash/flash_realtek_rts5912.c
@@ -25,7 +25,7 @@ LOG_MODULE_REGISTER(flash_rts5912);
 #include <soc.h>
 #include <string.h>
 
-#include "spi_nor.h"
+#include <zephyr/drivers/spi/spi_nor.h>
 #include "reg/reg_spic.h"
 
 #define FLASH_CMD_RDSFDP         0x5A /* Read SFDP */
diff --git a/drivers/flash/flash_renesas_ra_ospi_b.h b/drivers/flash/flash_renesas_ra_ospi_b.h
@@ -13,7 +13,7 @@
 #include <r_spi_flash_api.h>
 #include <r_ospi_b.h>
 #include "spi_nor_s28hx512t.h"
-#include "spi_nor.h"
+#include <zephyr/drivers/spi/spi_nor.h>
 
 /* Device node */
 #define RA_OSPI_B_NOR_NODE DT_INST(0, renesas_ra_ospi_b_nor)
diff --git a/drivers/flash/flash_renesas_ra_qspi.c b/drivers/flash/flash_renesas_ra_qspi.c
@@ -14,7 +14,7 @@
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/drivers/flash.h>
 #include <zephyr/drivers/flash/ra_flash_api_extensions.h>
-#include "spi_nor.h"
+#include <zephyr/drivers/spi/spi_nor.h>
 #include "r_spi_flash_api.h"
 #include "r_qspi.h"
 
diff --git a/drivers/flash/flash_renesas_rz_qspi.c b/drivers/flash/flash_renesas_rz_qspi.c
@@ -11,7 +11,7 @@
 #include <zephyr/drivers/pinctrl.h>
 #include <zephyr/drivers/flash.h>
 #include <zephyr/cache.h>
-#include "spi_nor.h"
+#include <zephyr/drivers/spi/spi_nor.h>
 #include "r_spi_flash_api.h"
 
 #if defined(CONFIG_FLASH_RENESAS_RZ_QSPI_SPIBSC)
diff --git a/drivers/flash/flash_sf32lb_mpi_qspi_nor.c b/drivers/flash/flash_sf32lb_mpi_qspi_nor.c
@@ -6,7 +6,7 @@
 #define DT_DRV_COMPAT sifli_sf32lb_mpi_qspi_nor
 
 #include "jesd216.h"
-#include "spi_nor.h"
+#include <zephyr/drivers/spi/spi_nor.h>
 
 #include <stdint.h>
 
diff --git a/drivers/flash/flash_stm32_ospi.c b/drivers/flash/flash_stm32_ospi.c
@@ -22,7 +22,7 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/irq.h>
 
-#include "spi_nor.h"
+#include <zephyr/drivers/spi/spi_nor.h>
 #include "jesd216.h"
 
 #include "flash_stm32_ospi.h"
diff --git a/drivers/flash/flash_stm32_qspi.c b/drivers/flash/flash_stm32_qspi.c
@@ -47,7 +47,7 @@
 
 #include <stm32_ll_dma.h>
 
-#include "spi_nor.h"
+#include <zephyr/drivers/spi/spi_nor.h>
 #include "jesd216.h"
 
 #include <zephyr/logging/log.h>
diff --git a/drivers/flash/flash_stm32_xspi.c b/drivers/flash/flash_stm32_xspi.c
@@ -25,7 +25,7 @@
 #include <zephyr/drivers/gpio.h>
 #include <zephyr/irq.h>
 
-#include "spi_nor.h"
+#include <zephyr/drivers/spi/spi_nor.h>
 #include "jesd216.h"
 
 #include <zephyr/logging/log.h>
diff --git a/drivers/flash/jesd216.c b/drivers/flash/jesd216.c
@@ -8,7 +8,7 @@
 #include <sys/types.h>
 #include <zephyr/kernel.h>
 #include "jesd216.h"
-#include "spi_nor.h"
+#include <zephyr/drivers/spi/spi_nor.h>
 
 static bool extract_instr(uint16_t packed,
 			  struct jesd216_instr *res)
diff --git a/drivers/flash/nrf_qspi_nor.c b/drivers/flash/nrf_qspi_nor.c
@@ -19,7 +19,7 @@
 #include <zephyr/irq.h>
 LOG_MODULE_REGISTER(qspi_nor, CONFIG_FLASH_LOG_LEVEL);
 
-#include "spi_nor.h"
+#include <zephyr/drivers/spi/spi_nor.h>
 #include "jesd216.h"
 #include "flash_priv.h"
 #include <nrf_erratas.h>
diff --git a/drivers/flash/spi_nor.c b/drivers/flash/spi_nor.c
@@ -21,7 +21,7 @@
 #include <zephyr/pm/device.h>
 #include <zephyr/pm/device_runtime.h>
 
-#include "spi_nor.h"
+#include <zephyr/drivers/spi/spi_nor.h>
 #include "jesd216.h"
 #include "flash_priv.h"
 
@@ -742,7 +742,7 @@ static int mxicy_rdcr(const struct device *dev)
 	uint16_t cr = -ENOSYS;
 
 	if (cfg->mxicy_mx25r_power_mode_exist) {
-		int ret = spi_nor_cmd_read(dev, CMD_RDCR, &cr, sizeof(cr));
+		int ret = spi_nor_cmd_read(dev, SPI_NOR_CMD_RDCR, &cr, sizeof(cr));
 
 		if (ret < 0) {
 			return ret;
diff --git a/include/zephyr/drivers/spi/spi_nor.h b/include/zephyr/drivers/spi/spi_nor.h
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-#ifndef __SPI_NOR_H__
-#define __SPI_NOR_H__
+#ifndef ZEPHYR_INCLUDE_DRIVERS_SPI_NOR_H_
+#define ZEPHYR_INCLUDE_DRIVERS_SPI_NOR_H_
 
 #include <zephyr/sys/util.h>
 
@@ -129,6 +129,4 @@
 #define SPI_NOR_IS_32K_ALIGNED(_ofs) SPI_NOR_IS_ALIGNED(_ofs, 15)
 #define SPI_NOR_IS_64K_ALIGNED(_ofs) SPI_NOR_IS_ALIGNED(_ofs, 16)
 
-#define CMD_RDCR 0x15 /* Read the configuration register. */
-
-#endif /*__SPI_NOR_H__*/
+#endif /* ZEPHYR_INCLUDE_DRIVERS_SPI_NOR_H_ */
