feat(driver_spi): split spi hal component

components/esp_hal_mspi/CMakeLists.txt

@@ -24,7 +24,9 @@ elseif(NOT BOOTLOADER_BUILD)
 
 endif()
 
-idf_component_register(SRCS ${srcs}
-                    INCLUDE_DIRS ${includes}
-                    REQUIRES soc hal
-                    PRIV_REQUIRES esp_hal_gpio)
+idf_component_register(
+    SRCS ${srcs}
+    INCLUDE_DIRS ${includes}
+    REQUIRES soc hal esp_hal_gpspi
+    PRIV_REQUIRES esp_hal_gpio
+)

components/esp_hal_mspi/esp32/include/hal/spi_flash_ll.h

@@ -15,9 +15,8 @@
 #pragma once
 
 #include <stdlib.h>
-#include "soc/spi_periph.h"
+#include "soc/spi_reg.h"
 #include "soc/spi_struct.h"
-#include "hal/spi_types.h"
 #include "hal/spi_flash_types.h"
 #include <sys/param.h> // For MIN/MAX
 #include <stdbool.h>

components/esp_hal_mspi/esp32c2/include/hal/gpspi_flash_ll.h

@@ -13,7 +13,8 @@
 #pragma once
 
 #include <stdlib.h>
-#include "soc/spi_periph.h"
+#include "soc/spi_reg.h"
+#include "soc/spi_struct.h"
 #include "hal/spi_types.h"
 #include "hal/spi_flash_types.h"
 #include <sys/param.h> // For MIN/MAX

components/esp_hal_mspi/esp32c2/include/hal/spimem_flash_ll.h

@@ -19,7 +19,9 @@
 #include <stdbool.h>
 #include <string.h>
 #include "hal/misc.h"
-#include "soc/spi_periph.h"
+#include "soc/spi_mem_struct.h"
+#include "soc/spi_mem_reg.h"
+#include "soc/interrupts.h"
 #include "hal/spi_types.h"
 #include "hal/spi_flash_types.h"
 

components/esp_hal_mspi/esp32c3/include/hal/gpspi_flash_ll.h

@@ -13,7 +13,7 @@
 #pragma once
 
 #include <stdlib.h>
-#include "soc/spi_periph.h"
+#include "soc/spi_reg.h"
 #include "soc/spi_struct.h"
 #include "hal/spi_types.h"
 #include "hal/spi_flash_types.h"

components/esp_hal_mspi/esp32c3/include/hal/spimem_flash_ll.h

@@ -18,9 +18,9 @@
 #include <sys/param.h> // For MIN/MAX
 #include <stdbool.h>
 #include <string.h>
-
-#include "soc/spi_periph.h"
+#include "soc/spi_mem_reg.h"
 #include "soc/spi_mem_struct.h"
+#include "soc/interrupts.h"
 #include "hal/assert.h"
 #include "hal/spi_types.h"
 #include "hal/spi_flash_types.h"

components/esp_hal_mspi/esp32c5/include/hal/gpspi_flash_ll.h

@@ -13,7 +13,7 @@
 #pragma once
 
 #include <stdlib.h>
-#include "soc/spi_periph.h"
+#include "soc/spi_reg.h"
 #include "soc/spi_struct.h"
 #include "soc/pcr_struct.h"
 #include "hal/assert.h"

components/esp_hal_mspi/esp32c5/include/hal/spimem_flash_ll.h

@@ -18,18 +18,17 @@
 #include <sys/param.h> // For MIN/MAX
 #include <stdbool.h>
 #include <string.h>
-
-#include "soc/spi_periph.h"
-#include "soc/spi_mem_struct.h"
 #include "soc/spi_mem_reg.h"
+#include "soc/spi_mem_struct.h"
+#include "soc/interrupts.h"
+#include "soc/pcr_struct.h"
+#include "soc/clk_tree_defs.h"
 #include "hal/assert.h"
 #include "hal/misc.h"
 #include "hal/spi_types.h"
 #include "hal/spi_flash_types.h"
-#include "soc/pcr_struct.h"
-#include "esp_rom_sys.h"
 #include "hal/clk_tree_ll.h"
-#include "soc/clk_tree_defs.h"
+#include "esp_rom_sys.h"
 
 #ifdef __cplusplus
 extern "C" {

components/esp_hal_mspi/esp32c6/include/hal/gpspi_flash_ll.h

@@ -13,7 +13,7 @@
 #pragma once
 
 #include <stdlib.h>
-#include "soc/spi_periph.h"
+#include "soc/spi_reg.h"
 #include "soc/spi_struct.h"
 #include "soc/pcr_struct.h"
 #include "hal/spi_types.h"

components/esp_hal_mspi/esp32c6/include/hal/spimem_flash_ll.h

@@ -18,14 +18,14 @@
 #include <sys/param.h> // For MIN/MAX
 #include <stdbool.h>
 #include <string.h>
-
-#include "soc/spi_periph.h"
+#include "soc/spi_mem_reg.h"
 #include "soc/spi_mem_struct.h"
+#include "soc/interrupts.h"
+#include "soc/pcr_struct.h"
 #include "hal/assert.h"
 #include "hal/misc.h"
 #include "hal/spi_types.h"
 #include "hal/spi_flash_types.h"
-#include "soc/pcr_struct.h"
 
 #ifdef __cplusplus
 extern "C" {

components/esp_hal_mspi/esp32c61/include/hal/gpspi_flash_ll.h

@@ -13,7 +13,7 @@
 #pragma once
 
 #include <stdlib.h>
-#include "soc/spi_periph.h"
+#include "soc/spi_reg.h"
 #include "soc/spi_struct.h"
 #include "soc/pcr_struct.h"
 #include "hal/spi_types.h"

components/esp_hal_mspi/esp32c61/include/hal/spimem_flash_ll.h

@@ -18,17 +18,17 @@
 #include <sys/param.h> // For MIN/MAX
 #include <stdbool.h>
 #include <string.h>
-
-#include "soc/spi_periph.h"
+#include "soc/spi_mem_reg.h"
 #include "soc/spi_mem_struct.h"
+#include "soc/interrupts.h"
+#include "soc/pcr_struct.h"
+#include "soc/clk_tree_defs.h"
 #include "hal/assert.h"
 #include "hal/misc.h"
 #include "hal/spi_types.h"
 #include "hal/spi_flash_types.h"
-#include "soc/pcr_struct.h"
-#include "esp_rom_sys.h"
 #include "hal/clk_tree_ll.h"
-#include "soc/clk_tree_defs.h"
+#include "esp_rom_sys.h"
 
 #ifdef __cplusplus
 extern "C" {

components/esp_hal_mspi/esp32h2/include/hal/gpspi_flash_ll.h

@@ -13,7 +13,7 @@
 #pragma once
 
 #include <stdlib.h>
-#include "soc/spi_periph.h"
+#include "soc/spi_reg.h"
 #include "soc/spi_struct.h"
 #include "soc/pcr_struct.h"
 #include "hal/spi_types.h"

components/esp_hal_mspi/esp32h2/include/hal/spimem_flash_ll.h

@@ -18,14 +18,14 @@
 #include <sys/param.h> // For MIN/MAX
 #include <stdbool.h>
 #include <string.h>
-
-#include "soc/spi_periph.h"
+#include "soc/spi_mem_reg.h"
 #include "soc/spi_mem_struct.h"
+#include "soc/interrupts.h"
+#include "soc/pcr_struct.h"
+#include "soc/clk_tree_defs.h"
 #include "hal/assert.h"
 #include "hal/spi_types.h"
 #include "hal/spi_flash_types.h"
-#include "soc/pcr_struct.h"
-#include "soc/clk_tree_defs.h"
 #include "hal/misc.h"
 
 #ifdef __cplusplus

components/esp_hal_mspi/esp32h21/include/hal/gpspi_flash_ll.h

@@ -13,7 +13,7 @@
 #pragma once
 
 #include <stdlib.h>
-#include "soc/spi_periph.h"
+#include "soc/spi_reg.h"
 #include "soc/spi_struct.h"
 #include "soc/pcr_struct.h"
 #include "hal/spi_types.h"

components/esp_hal_mspi/esp32h21/include/hal/spimem_flash_ll.h

@@ -18,18 +18,16 @@
 #include <sys/param.h> // For MIN/MAX
 #include <stdbool.h>
 #include <string.h>
-
-#include "soc/spi_periph.h"
+#include "soc/spi_mem_reg.h"
 #include "soc/spi_mem_struct.h"
+#include "soc/interrupts.h"
+#include "soc/pcr_struct.h"
+#include "soc/clk_tree_defs.h"
 #include "hal/assert.h"
 #include "hal/spi_types.h"
 #include "hal/spi_flash_types.h"
-#include "soc/pcr_struct.h"
-#include "soc/clk_tree_defs.h"
 #include "hal/misc.h"
 
-//TODO: [ESP32H21] IDF-11609, inherit from h2
-
 #ifdef __cplusplus
 extern "C" {
 #endif

components/esp_hal_mspi/esp32h4/include/hal/gpspi_flash_ll.h

@@ -13,7 +13,7 @@
 #pragma once
 
 #include <stdlib.h>
-#include "soc/spi_periph.h"
+#include "soc/spi_reg.h"
 #include "soc/spi_struct.h"
 #include "soc/pcr_struct.h"
 #include "hal/spi_types.h"

components/esp_hal_mspi/esp32h4/include/hal/spimem_flash_ll.h

@@ -18,14 +18,14 @@
 #include <sys/param.h> // For MIN/MAX
 #include <stdbool.h>
 #include <string.h>
-
-#include "soc/spi_periph.h"
+#include "soc/spi_mem_reg.h"
 #include "soc/spi_mem_struct.h"
+#include "soc/pcr_struct.h"
+#include "soc/interrupts.h"
 #include "hal/assert.h"
 #include "hal/misc.h"
 #include "hal/spi_types.h"
 #include "hal/spi_flash_types.h"
-#include "soc/pcr_struct.h"
 #include "esp_rom_sys.h"
 
 #ifdef __cplusplus

components/esp_hal_mspi/esp32p4/include/hal/gpspi_flash_ll.h

@@ -13,7 +13,7 @@
 #pragma once
 
 #include <stdlib.h>
-#include "soc/spi_periph.h"
+#include "soc/spi_reg.h"
 #include "soc/spi_struct.h"
 #include "soc/hp_sys_clkrst_struct.h"
 #include "hal/assert.h"

components/esp_hal_mspi/esp32p4/include/hal/spimem_flash_ll.h

@@ -18,17 +18,18 @@
 #include <sys/param.h> // For MIN/MAX
 #include <stdbool.h>
 #include <string.h>
-
-#include "soc/spi_periph.h"
+#include "soc/spi_mem_reg.h"
+#include "soc/spi_mem_struct.h"
 #include "soc/spi1_mem_c_struct.h"
 #include "soc/spi1_mem_c_reg.h"
 #include "soc/hp_sys_clkrst_struct.h"
+#include "soc/interrupts.h"
+#include "soc/chip_revision.h"
 #include "hal/assert.h"
 #include "hal/spi_types.h"
 #include "hal/spi_flash_types.h"
 #include "hal/misc.h"
 #include "hal/efuse_hal.h"
-#include "soc/chip_revision.h"
 #include "hal/clk_tree_ll.h"
 #include "hal/config.h"
 

components/esp_hal_mspi/esp32s2/include/hal/gpspi_flash_ll.h

@@ -13,7 +13,7 @@
 #pragma once
 
 #include <stdlib.h>
-#include "soc/spi_periph.h"
+#include "soc/spi_reg.h"
 #include "soc/spi_struct.h"
 #include "hal/spi_types.h"
 #include "hal/spi_flash_types.h"

components/esp_hal_mspi/esp32s2/include/hal/spimem_flash_ll.h

@@ -18,8 +18,7 @@
 #include <sys/param.h> // For MIN/MAX
 #include <stdbool.h>
 #include <string.h>
-
-#include "soc/spi_periph.h"
+#include "soc/spi_mem_reg.h"
 #include "soc/spi_mem_struct.h"
 #include "hal/assert.h"
 #include "hal/spi_types.h"

components/esp_hal_mspi/esp32s3/include/hal/gpspi_flash_ll.h

@@ -13,8 +13,8 @@
 #pragma once
 
 #include <stdlib.h>
-#include "soc/spi_periph.h"
 #include "soc/spi_struct.h"
+#include "soc/spi_reg.h"
 #include "hal/spi_types.h"
 #include "hal/spi_flash_types.h"
 #include <sys/param.h> // For MIN/MAX

components/esp_hal_mspi/esp32s3/include/hal/spimem_flash_ll.h

@@ -19,9 +19,10 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include "soc/spi_periph.h"
-#include "hal/assert.h"
+#include "soc/interrupts.h"
+#include "soc/spi_mem_reg.h"
 #include "soc/spi_mem_struct.h"
+#include "hal/assert.h"
 #include "hal/spi_types.h"
 #include "hal/spi_flash_types.h"
 #include "hal/misc.h"