Merge branch 'chip/add_wifi_support_for_esp32s31_rebase_master' into 'master'

feat(wifi): add wifi support for esp32s31

See merge request espressif/esp-idf!47339

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

@@ -207,6 +207,18 @@ config SOC_USB_UTMI_PHY_NUM
     int
     default 1
 
+config SOC_PHY_SUPPORTED
+    bool
+    default y
+
+config SOC_WIFI_SUPPORTED
+    bool
+    default y
+
+config SOC_PHY_CALIBRATION_CLOCK_IS_INDEPENDENT
+    bool
+    default y
+
 config SOC_XTAL_SUPPORT_40M
     bool
     default y
@@ -791,6 +803,14 @@ config SOC_MODEM_CLOCK_IS_INDEPENDENT
     bool
     default y
 
+config SOC_MODEM_CLOCK_SOC_PLL_SOURCE_CG_SUPPORTED
+    bool
+    default y
+
+config SOC_MODEM_CLOCK_WIFI_BB_80X1_AS_APB
+    bool
+    default y
+
 config SOC_CLK_RC_FAST_SUPPORT_CALIBRATION
     bool
     default y
@@ -990,3 +1010,43 @@ config SOC_JPEG_DECODE_SUPPORTED
 config SOC_JPEG_ENCODE_SUPPORTED
     bool
     default y
+
+config SOC_WIFI_HW_TSF
+    bool
+    default y
+
+config SOC_WIFI_FTM_SUPPORT
+    bool
+    default y
+
+config SOC_WIFI_GCMP_SUPPORT
+    bool
+    default y
+
+config SOC_WIFI_WAPI_SUPPORT
+    bool
+    default y
+
+config SOC_WIFI_CSI_SUPPORT
+    bool
+    default y
+
+config SOC_WIFI_MESH_SUPPORT
+    bool
+    default y
+
+config SOC_WIFI_HE_SUPPORT
+    bool
+    default y
+
+config SOC_WIFI_MAC_VERSION_NUM
+    int
+    default 3
+
+config SOC_WIFI_NAN_SUPPORT
+    bool
+    default y
+
+config SOC_WIFI_LIGHT_SLEEP_CLK_WIDTH
+    int
+    default 12

components/soc/esp32s31/include/soc/gpio_sig_map.h

@@ -24,6 +24,8 @@
 #define SD_CARD_CDATA7_2_PAD_OUT_IDX            7
 #define PAD_MODEM_ANT_SEL0_IDX                  8
 #define PAD_MODEM_ANT_SEL1_IDX                  9
+#define ANT_SEL0_IDX                            PAD_MODEM_ANT_SEL0_IDX
+#define ANT_SEL1_IDX                            PAD_MODEM_ANT_SEL1_IDX
 #define UART0_RXD_PAD_IN_IDX                    10
 #define UART0_TXD_PAD_OUT_IDX                   10
 #define UART0_CTS_PAD_IN_IDX                    11
@@ -80,8 +82,10 @@
 #define I2S1_I_WS_PAD_OUT_IDX                   36
 #define PCNT1_RST_IN0_IDX                       37
 #define PAD_MODEM_ANT_SEL2_IDX                  37
+#define ANT_SEL2_IDX                            PAD_MODEM_ANT_SEL2_IDX
 #define PCNT1_RST_IN1_IDX                       38
 #define PAD_MODEM_ANT_SEL3_IDX                  38
+#define ANT_SEL3_IDX                            PAD_MODEM_ANT_SEL3_IDX
 #define PCNT1_RST_IN2_IDX                       39
 #define PAD_MODEM_ANT_SEL4_IDX                  39
 #define PCNT1_RST_IN3_IDX                       40

components/soc/esp32s31/include/soc/periph_defs.h

@@ -32,7 +32,7 @@ typedef enum {
 } shared_periph_module_t;
 
 #define PERIPH_MODEM_MODULE_MIN PERIPH_WIFI_MODULE
-#define PERIPH_MODEM_MODULE_MAX PERIPH_MODEM_ADC_COMMON_FE_MODULE
+#define PERIPH_MODEM_MODULE_MAX PERIPH_PHY_CALIBRATION_MODULE
 #define PERIPH_MODEM_MODULE_NUM (PERIPH_MODEM_MODULE_MAX - PERIPH_MODEM_MODULE_MIN + 1)
 #define IS_MODEM_MODULE(periph)  ((periph>=PERIPH_MODEM_MODULE_MIN) && (periph<=PERIPH_MODEM_MODULE_MAX))
 

components/soc/esp32s31/include/soc/soc_caps.h

@@ -109,6 +109,9 @@
 #define SOC_USB_FSLS_PHY_NUM            (0U)
 #define SOC_USB_UTMI_PHY_NUM            (1U)
 
+#define SOC_PHY_SUPPORTED                1
+#define SOC_WIFI_SUPPORTED               1
+#define SOC_PHY_CALIBRATION_CLOCK_IS_INDEPENDENT 1
 /*-------------------------- XTAL CAPS ---------------------------------------*/
 #define SOC_XTAL_SUPPORT_40M            1
 
@@ -367,6 +370,8 @@
 
 // /*-------------------------- CLOCK SUBSYSTEM CAPS ----------------------------------------*/
 #define SOC_MODEM_CLOCK_IS_INDEPENDENT            (1)
+#define SOC_MODEM_CLOCK_SOC_PLL_SOURCE_CG_SUPPORTED (1)
+#define SOC_MODEM_CLOCK_WIFI_BB_80X1_AS_APB       (1)
 
 #define SOC_CLK_RC_FAST_SUPPORT_CALIBRATION       (1)
 
@@ -445,3 +450,16 @@
 /*--------------------------- JPEG --------------------------------*/
 #define SOC_JPEG_DECODE_SUPPORTED                 (1)
 #define SOC_JPEG_ENCODE_SUPPORTED                 (1)
+/*------------------------------------ WI-FI CAPS ------------------------------------*/
+#define SOC_WIFI_HW_TSF                     (1)    /*!< Support hardware TSF */
+#define SOC_WIFI_FTM_SUPPORT                (1)    /*!< Support FTM */
+#define SOC_WIFI_GCMP_SUPPORT               (1)    /*!< Support GCMP(GCMP128 and GCMP256) */
+#define SOC_WIFI_WAPI_SUPPORT               (1)    /*!< Support WAPI */
+#define SOC_WIFI_CSI_SUPPORT                (1)    /*!< Support CSI */
+#define SOC_WIFI_MESH_SUPPORT               (1)    /*!< Support WIFI MESH */
+#define SOC_WIFI_HE_SUPPORT                 (1)    /*!< Support Wi-Fi 6 */
+#define SOC_WIFI_MAC_VERSION_NUM            (3)    /*!< Wi-Fi MAC version num is 3 */
+#define SOC_WIFI_NAN_SUPPORT                (1)    /*!< Support WIFI Aware (NAN) */
+
+/*--------------- WIFI LIGHT SLEEP CLOCK WIDTH CAPS --------------------------*/
+#define SOC_WIFI_LIGHT_SLEEP_CLK_WIDTH  (12)