From 1ba2ac83e6419ef383570df516109d605b1ef0f7 Mon Sep 17 00:00:00 2001
From: Li Shuai <lishuai@espressif.com>
Date: Fri, 16 Jul 2021 17:44:03 +0800
Subject: [PATCH] fix rtc register read error and add workaround for rtc bus
 isolate issue

---
 components/esp_system/Kconfig       | 5 +++++
 components/esp_system/sleep_modes.c | 4 ++++
 2 files changed, 9 insertions(+)

diff --git a/components/esp_system/Kconfig b/components/esp_system/Kconfig
index db8c818451..ed9b30d004 100644
--- a/components/esp_system/Kconfig
+++ b/components/esp_system/Kconfig
@@ -117,6 +117,11 @@ menu "ESP System Settings"
             pull-up, you do not need to select this option, otherwise, you
             should enable this option.
 
+    config ESP_SYSTEM_SLEEP_RTC_BUS_ISO_WORKAROUND
+        bool
+        default y if IDF_TARGET_ESP32 || IDF_TARGET_ESP32S2 || IDF_TARGET_ESP32S3
+
+
     menu "RTC Clock Config"
         # This is used for configure the RTC clock.
         config RTC_CLOCK_BBPLL_POWER_ON_WITH_USB
diff --git a/components/esp_system/sleep_modes.c b/components/esp_system/sleep_modes.c
index 24aacb410d..408174ca1e 100644
--- a/components/esp_system/sleep_modes.c
+++ b/components/esp_system/sleep_modes.c
@@ -831,6 +831,10 @@ esp_err_t esp_light_sleep_start(void)
     // Decide which power domains can be powered down
     uint32_t pd_flags = get_power_down_flags();
 
+#ifdef CONFIG_ESP_SYSTEM_SLEEP_RTC_BUS_ISO_WORKAROUND
+    pd_flags &= ~RTC_SLEEP_PD_RTC_PERIPH;
+#endif
+
     // Re-calibrate the RTC Timer clock
 #if defined(CONFIG_ESP32_RTC_CLK_SRC_EXT_CRYS) || defined(CONFIG_ESP32S2_RTC_CLK_SRC_EXT_CRYS) || defined(CONFIG_ESP32C3_RTC_CLK_SRC_EXT_CRYS)
     if (rtc_clk_slow_freq_get() == RTC_SLOW_FREQ_32K_XTAL) {