Merge branch 'bugfix/fix_h4_spi_file_missing' into 'master'

spi: fix spi support on h4 after diver/cmakelist refactored

See merge request espressif/esp-idf!22358

components/driver/test_apps/spi/master/main/test_spi_master.c

@@ -117,6 +117,15 @@ TEST_CASE("SPI Master clockdiv calculation routines", "[spi]")
     }
 #endif
 
+#if SOC_SPI_SUPPORT_CLK_AHB
+    clk_tree_src_get_freq_hz(SPI_CLK_SRC_AHB, CLK_TREE_SRC_FREQ_PRECISION_APPROX, &clock_source_hz);
+    printf("\nTest clock source AHB = %ld\n", clock_source_hz);
+    TEST_ASSERT((48 * 1000 * 1000) == clock_source_hz);
+    for (int i = 0; i < TEST_CLK_TIMES; i++) {
+        check_spi_pre_n_for(SPI_CLK_SRC_AHB, test_clk_param.clk_param_48m[i][0], test_clk_param.clk_param_48m[i][1], test_clk_param.clk_param_48m[i][2]);
+    }
+#endif
+
 #if SOC_SPI_SUPPORT_CLK_PLL_F40M
     clk_tree_src_get_freq_hz(SPI_CLK_SRC_PLL_F40M, CLK_TREE_SRC_FREQ_PRECISION_APPROX, &clock_source_hz);
     printf("\nTest clock source PLL_40M = %ld\n", clock_source_hz);

components/hal/esp32h4/include/hal/spi_ll.h

@@ -99,7 +99,15 @@ typedef enum {
  */
 static inline void spi_ll_set_clk_source(spi_dev_t *hw, spi_clock_source_t clk_source)
 {
-    //empty, keep this for compatibility
+    switch (clk_source)
+    {
+        case SPI_CLK_SRC_XTAL:
+            hw->clk_gate.mst_clk_sel = 0;
+            break;
+        default:
+            hw->clk_gate.mst_clk_sel = 1;
+            break;
+    }
 }
 
 /**

components/soc/esp32h4/include/soc/Kconfig.soc_caps.in

@@ -75,6 +75,10 @@ config SOC_SDM_SUPPORTED
     bool
     default y
 
+config SOC_GPSPI_SUPPORTED
+    bool
+    default y
+
 config SOC_LEDC_SUPPORTED
     bool
     default y
@@ -583,6 +587,10 @@ config SOC_SPI_SUPPORT_CLK_AHB
     bool
     default y
 
+config SOC_SPI_SUPPORT_CLK_XTAL
+    bool
+    default y
+
 config SOC_SPI_PERIPH_SUPPORT_CONTROL_DUMMY_OUT
     bool
     default y

components/soc/esp32h4/include/soc/clk_tree_defs.h

@@ -254,14 +254,15 @@ typedef enum {
 /**
  * @brief Array initializer for all supported clock sources of SPI
  */
-#define SOC_SPI_CLKS {SOC_MOD_CLK_AHB}
+#define SOC_SPI_CLKS {SOC_MOD_CLK_AHB, SOC_MOD_CLK_XTAL}
 
 /**
  * @brief Type of SPI clock source.
  */
 typedef enum {
-    SPI_CLK_SRC_DEFAULT = SOC_MOD_CLK_AHB,     /*!< Select AHB as SPI source clock */
+    SPI_CLK_SRC_DEFAULT = SOC_MOD_CLK_AHB,     /*!< Select AHB 48M as SPI source clock */
-    SPI_CLK_SRC_AHB = SOC_MOD_CLK_AHB,         /*!< Select AHB as SPI source clock */
+    SPI_CLK_SRC_AHB = SOC_MOD_CLK_AHB,         /*!< Select AHB 48M as SPI source clock */
+    SPI_CLK_SRC_XTAL = SOC_MOD_CLK_XTAL,       /*!< Select XTAL 32M as SPI source clock */
 } soc_periph_spi_clk_src_t;
 
 //////////////////////////////////////////////////SDM//////////////////////////////////////////////////////////////

components/soc/esp32h4/include/soc/soc_caps.h

@@ -51,6 +51,7 @@
 #define SOC_I2S_SUPPORTED               1
 #define SOC_RMT_SUPPORTED               1
 #define SOC_SDM_SUPPORTED               1
+#define SOC_GPSPI_SUPPORTED             1
 #define SOC_LEDC_SUPPORTED              1
 #define SOC_I2C_SUPPORTED               1
 #define SOC_SYSTIMER_SUPPORTED          1
@@ -288,6 +289,7 @@
 #define SOC_SPI_SUPPORT_CONTINUOUS_TRANS    1
 #define SOC_SPI_SUPPORT_SLAVE_HD_VER2       1
 #define SOC_SPI_SUPPORT_CLK_AHB             1
+#define SOC_SPI_SUPPORT_CLK_XTAL            1
 
 // Peripheral supports DIO, DOUT, QIO, or QOUT
 // host_id = 0 -> SPI0/SPI1, host_id = 1 -> SPI2,