From b7e3886bf2e364bddbfd0b79aca4555386d63934 Mon Sep 17 00:00:00 2001
From: Xia Xiaotian <xiaxiaotian@espressif.com>
Date: Mon, 30 Dec 2019 16:51:12 +0800
Subject: [PATCH] Fix ESP32S2BETA WiFi initialization crash issue

    ESP32S2BETA does not need to enable WiFi common clock in WiFi library, for
WiFi common clock is not disabled when WiFi is in sleep state.
---
 .../esp_wifi/include/esp_private/wifi_os_adapter.h   |  2 ++
 components/esp_wifi/lib                              |  2 +-
 components/esp_wifi/src/phy_init.c                   | 12 +++++++++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/components/esp_wifi/include/esp_private/wifi_os_adapter.h b/components/esp_wifi/include/esp_private/wifi_os_adapter.h
index c7eb4af6d1..06cb730ee6 100644
--- a/components/esp_wifi/include/esp_private/wifi_os_adapter.h
+++ b/components/esp_wifi/include/esp_private/wifi_os_adapter.h
@@ -79,8 +79,10 @@ typedef struct {
     void (* _dport_access_stall_other_cpu_end_wrap)(void);
     int32_t (* _phy_rf_deinit)(uint32_t module);
     void (* _phy_load_cal_and_init)(uint32_t module);
+#if CONFIG_IDF_TARGET_ESP32
     void (* _phy_common_clock_enable)(void);
     void (* _phy_common_clock_disable)(void);
+#endif
     int32_t (* _read_mac)(uint8_t* mac, uint32_t type);
     void (* _timer_arm)(void *timer, uint32_t tmout, bool repeat);
     void (* _timer_disarm)(void *timer);
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index 53a0e9fc26..5c6c4dc741 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 53a0e9fc2617060d302438f41d5b42430e6364a3
+Subproject commit 5c6c4dc74151a462fd3ef17c7e89dd11377237fc
diff --git a/components/esp_wifi/src/phy_init.c b/components/esp_wifi/src/phy_init.c
index dd146a6cbe..87fb3afc7c 100644
--- a/components/esp_wifi/src/phy_init.c
+++ b/components/esp_wifi/src/phy_init.c
@@ -57,11 +57,13 @@ static uint32_t s_module_phy_rf_init = 0;
 /* Whether modem sleep is turned on */
 static volatile bool s_is_phy_rf_en = false;
 
+#if CONFIG_IDF_TARGET_ESP32
 /* Whether WiFi/BT common clock enabled reference */
 static volatile int32_t s_common_clock_enable_ref = 0;
 
 /* PHY spinlock mux */
 static portMUX_TYPE s_phy_spin_lock = portMUX_INITIALIZER_UNLOCKED;
+#endif
 
 /* Bit mask of modules needing to enter modem sleep mode */
 static uint32_t s_modem_sleep_module_enter = 0;
@@ -128,7 +130,6 @@ static inline void phy_update_wifi_mac_time(bool en_clock_stopped, int64_t now)
         }
     }
 }
-#endif
 
 IRAM_ATTR static inline void phy_spin_lock(void)
 {
@@ -147,9 +148,11 @@ IRAM_ATTR static inline void phy_spin_unlock(void)
         portEXIT_CRITICAL(&s_phy_spin_lock);
     }
 }
+#endif
 
 IRAM_ATTR void esp_phy_common_clock_enable(void)
 {
+#if CONFIG_IDF_TARGET_ESP32
     phy_spin_lock();
 
     if (s_common_clock_enable_ref == 0) {
@@ -159,10 +162,14 @@ IRAM_ATTR void esp_phy_common_clock_enable(void)
 
     s_common_clock_enable_ref++;
     phy_spin_unlock();
+#else
+    periph_module_enable(PERIPH_WIFI_BT_COMMON_MODULE);
+#endif
 }
 
 IRAM_ATTR void esp_phy_common_clock_disable(void)
 {
+#if CONFIG_IDF_TARGET_ESP32
     phy_spin_lock();
 
     if (s_common_clock_enable_ref > 0) {
@@ -177,6 +184,9 @@ IRAM_ATTR void esp_phy_common_clock_disable(void)
     }
 
     phy_spin_unlock();
+#else
+    periph_module_disable(PERIPH_WIFI_BT_COMMON_MODULE);
+#endif
 }
 
 esp_err_t esp_phy_rf_init(const esp_phy_init_data_t* init_data, esp_phy_calibration_mode_t mode,