soc/rtc: fix RTC_TOUCH_TRIG_EN or RTC_ULP_TRIG_EN should keep RTC_PERIPH power on
This commit is contained in:
parent
016c8d8b05
commit
9a229f4077
|
@ -786,6 +786,18 @@ config ESP32_RTC_CLK_CAL_CYCLES
|
||||||
In case more value will help improve the definition of the launch of the crystal.
|
In case more value will help improve the definition of the launch of the crystal.
|
||||||
If the crystal could not start, it will be switched to internal RC.
|
If the crystal could not start, it will be switched to internal RC.
|
||||||
|
|
||||||
|
config ESP32_RTC_EXTERNAL_CRYSTAL_ADDITIONAL_CURRENT
|
||||||
|
bool "Additional current for external 32kHz crystal"
|
||||||
|
depends on ESP32_RTC_CLOCK_SOURCE_EXTERNAL_CRYSTAL
|
||||||
|
default "n"
|
||||||
|
help
|
||||||
|
Choose which additional current is used for rtc external crystal.
|
||||||
|
|
||||||
|
- "Enable current by touch" option provides touch pad9 current to
|
||||||
|
external 32kHz crystal, at the expense of slightly higher (4-5uA) deep
|
||||||
|
sleep current consumption. Note that enabled Touch or ULP wakeup
|
||||||
|
source at sleep, this item is invalid even selected ESP32_RTC_EXTERNAL_CRYSTAL_ADDITIONAL_CURRENT.
|
||||||
|
|
||||||
config ESP32_RTC_XTAL_BOOTSTRAP_CYCLES
|
config ESP32_RTC_XTAL_BOOTSTRAP_CYCLES
|
||||||
int "Bootstrap cycles for external 32kHz crystal"
|
int "Bootstrap cycles for external 32kHz crystal"
|
||||||
depends on ESP32_RTC_CLOCK_SOURCE_EXTERNAL_CRYSTAL
|
depends on ESP32_RTC_CLOCK_SOURCE_EXTERNAL_CRYSTAL
|
||||||
|
|
|
@ -95,6 +95,7 @@ esp_err_t esp_sleep_disable_wakeup_source(esp_sleep_source_t source);
|
||||||
* source is used.
|
* source is used.
|
||||||
* @return
|
* @return
|
||||||
* - ESP_OK on success
|
* - ESP_OK on success
|
||||||
|
* - ESP_ERR_NOT_SUPPORTED if additional current by touch (CONFIG_ESP32_RTC_EXTERNAL_CRYSTAL_ADDITIONAL_CURRENT) is enabled.
|
||||||
* - ESP_ERR_INVALID_STATE if ULP co-processor is not enabled or if wakeup triggers conflict
|
* - ESP_ERR_INVALID_STATE if ULP co-processor is not enabled or if wakeup triggers conflict
|
||||||
*/
|
*/
|
||||||
esp_err_t esp_sleep_enable_ulp_wakeup();
|
esp_err_t esp_sleep_enable_ulp_wakeup();
|
||||||
|
@ -121,6 +122,7 @@ esp_err_t esp_sleep_enable_timer_wakeup(uint64_t time_in_us);
|
||||||
*
|
*
|
||||||
* @return
|
* @return
|
||||||
* - ESP_OK on success
|
* - ESP_OK on success
|
||||||
|
* - ESP_ERR_NOT_SUPPORTED if additional current by touch (CONFIG_ESP32_RTC_EXTERNAL_CRYSTAL_ADDITIONAL_CURRENT) is enabled.
|
||||||
* - ESP_ERR_INVALID_STATE if wakeup triggers conflict
|
* - ESP_ERR_INVALID_STATE if wakeup triggers conflict
|
||||||
*/
|
*/
|
||||||
esp_err_t esp_sleep_enable_touchpad_wakeup();
|
esp_err_t esp_sleep_enable_touchpad_wakeup();
|
||||||
|
|
|
@ -401,6 +401,9 @@ esp_err_t esp_sleep_disable_wakeup_source(esp_sleep_source_t source)
|
||||||
|
|
||||||
esp_err_t esp_sleep_enable_ulp_wakeup()
|
esp_err_t esp_sleep_enable_ulp_wakeup()
|
||||||
{
|
{
|
||||||
|
#ifdef CONFIG_ESP32_RTC_EXTERNAL_CRYSTAL_ADDITIONAL_CURRENT
|
||||||
|
return ESP_ERR_NOT_SUPPORTED;
|
||||||
|
#endif
|
||||||
#ifdef CONFIG_ULP_COPROC_ENABLED
|
#ifdef CONFIG_ULP_COPROC_ENABLED
|
||||||
if(s_config.wakeup_triggers & RTC_EXT0_TRIG_EN) {
|
if(s_config.wakeup_triggers & RTC_EXT0_TRIG_EN) {
|
||||||
ESP_LOGE(TAG, "Conflicting wake-up trigger: ext0");
|
ESP_LOGE(TAG, "Conflicting wake-up trigger: ext0");
|
||||||
|
@ -434,6 +437,9 @@ static void timer_wakeup_prepare()
|
||||||
|
|
||||||
esp_err_t esp_sleep_enable_touchpad_wakeup()
|
esp_err_t esp_sleep_enable_touchpad_wakeup()
|
||||||
{
|
{
|
||||||
|
#ifdef CONFIG_ESP32_RTC_EXTERNAL_CRYSTAL_ADDITIONAL_CURRENT
|
||||||
|
return ESP_ERR_NOT_SUPPORTED;
|
||||||
|
#endif
|
||||||
if (s_config.wakeup_triggers & (RTC_EXT0_TRIG_EN)) {
|
if (s_config.wakeup_triggers & (RTC_EXT0_TRIG_EN)) {
|
||||||
ESP_LOGE(TAG, "Conflicting wake-up trigger: ext0");
|
ESP_LOGE(TAG, "Conflicting wake-up trigger: ext0");
|
||||||
return ESP_ERR_INVALID_STATE;
|
return ESP_ERR_INVALID_STATE;
|
||||||
|
@ -693,6 +699,13 @@ static uint32_t get_power_down_flags()
|
||||||
if (s_config.pd_options[ESP_PD_DOMAIN_XTAL] != ESP_PD_OPTION_ON) {
|
if (s_config.pd_options[ESP_PD_DOMAIN_XTAL] != ESP_PD_OPTION_ON) {
|
||||||
pd_flags |= RTC_SLEEP_PD_XTAL;
|
pd_flags |= RTC_SLEEP_PD_XTAL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ((s_config.wakeup_triggers & (RTC_TOUCH_TRIG_EN | RTC_ULP_TRIG_EN)) == 0) {
|
||||||
|
// If enabled EXT1 only and enable the additional current by touch, should be keep RTC_PERIPH power on.
|
||||||
|
#if ((defined CONFIG_ESP32_RTC_CLOCK_SOURCE_EXTERNAL_CRYSTAL) && (defined CONFIG_ESP32_RTC_EXTERNAL_CRYSTAL_ADDITIONAL_CURRENT))
|
||||||
|
pd_flags &= ~RTC_SLEEP_PD_RTC_PERIPH;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
return pd_flags;
|
return pd_flags;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -124,6 +124,7 @@ static void rtc_clk_32k_enable_common(int dac, int dres, int dbias)
|
||||||
REG_SET_FIELD(RTC_IO_XTAL_32K_PAD_REG, RTC_IO_DRES_XTAL_32K, dres);
|
REG_SET_FIELD(RTC_IO_XTAL_32K_PAD_REG, RTC_IO_DRES_XTAL_32K, dres);
|
||||||
REG_SET_FIELD(RTC_IO_XTAL_32K_PAD_REG, RTC_IO_DBIAS_XTAL_32K, dbias);
|
REG_SET_FIELD(RTC_IO_XTAL_32K_PAD_REG, RTC_IO_DBIAS_XTAL_32K, dbias);
|
||||||
|
|
||||||
|
#ifdef CONFIG_ESP32_RTC_EXTERNAL_CRYSTAL_ADDITIONAL_CURRENT
|
||||||
/* TOUCH sensor can provide additional current to external XTAL.
|
/* TOUCH sensor can provide additional current to external XTAL.
|
||||||
In some case, X32N and X32P PAD don't have enough drive capability to start XTAL */
|
In some case, X32N and X32P PAD don't have enough drive capability to start XTAL */
|
||||||
SET_PERI_REG_MASK(RTC_IO_TOUCH_CFG_REG, RTC_IO_TOUCH_XPD_BIAS_M);
|
SET_PERI_REG_MASK(RTC_IO_TOUCH_CFG_REG, RTC_IO_TOUCH_XPD_BIAS_M);
|
||||||
|
@ -137,6 +138,7 @@ static void rtc_clk_32k_enable_common(int dac, int dres, int dbias)
|
||||||
So the Touch DAC start to drive some current from VDD to TOUCH8(which is also XTAL-N)
|
So the Touch DAC start to drive some current from VDD to TOUCH8(which is also XTAL-N)
|
||||||
*/
|
*/
|
||||||
SET_PERI_REG_MASK(RTC_IO_TOUCH_PAD9_REG, RTC_IO_TOUCH_PAD9_XPD_M);
|
SET_PERI_REG_MASK(RTC_IO_TOUCH_PAD9_REG, RTC_IO_TOUCH_PAD9_XPD_M);
|
||||||
|
#endif // CONFIG_ESP32_RTC_EXTERNAL_CRYSTAL_ADDITIONAL_CURRENT
|
||||||
/* Power up external xtal */
|
/* Power up external xtal */
|
||||||
SET_PERI_REG_MASK(RTC_IO_XTAL_32K_PAD_REG, RTC_IO_XPD_XTAL_32K_M);
|
SET_PERI_REG_MASK(RTC_IO_XTAL_32K_PAD_REG, RTC_IO_XPD_XTAL_32K_M);
|
||||||
}
|
}
|
||||||
|
@ -147,9 +149,11 @@ void rtc_clk_32k_enable(bool enable)
|
||||||
rtc_clk_32k_enable_common(XTAL_32K_DAC_VAL, XTAL_32K_DRES_VAL, XTAL_32K_DBIAS_VAL);
|
rtc_clk_32k_enable_common(XTAL_32K_DAC_VAL, XTAL_32K_DRES_VAL, XTAL_32K_DBIAS_VAL);
|
||||||
} else {
|
} else {
|
||||||
/* Disable X32N and X32P pad drive external xtal */
|
/* Disable X32N and X32P pad drive external xtal */
|
||||||
CLEAR_PERI_REG_MASK(RTC_IO_XTAL_32K_PAD_REG, RTC_IO_XPD_XTAL_32K);
|
CLEAR_PERI_REG_MASK(RTC_IO_XTAL_32K_PAD_REG, RTC_IO_XPD_XTAL_32K_M);
|
||||||
|
#ifdef CONFIG_ESP32_RTC_EXTERNAL_CRYSTAL_ADDITIONAL_CURRENT
|
||||||
/* Power down TOUCH */
|
/* Power down TOUCH */
|
||||||
CLEAR_PERI_REG_MASK(RTC_IO_TOUCH_PAD9_REG, RTC_IO_TOUCH_PAD9_XPD_M);
|
CLEAR_PERI_REG_MASK(RTC_IO_TOUCH_PAD9_REG, RTC_IO_TOUCH_PAD9_XPD_M);
|
||||||
|
#endif // CONFIG_ESP32_RTC_EXTERNAL_CRYSTAL_ADDITIONAL_CURRENT
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue