kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2025-12-16 10:03:50 +01:00
Code Releases Activity
RIOT/pkg/esp32_sdk/patches/0026-esp_hw_support-rename-rtc_init.patch
Gunar Schorcht ea0e50d64e pkg/esp32_sdk: add patches for ESP-IDF v5.4
2025-05-27 23:25:36 +02:00

223 lines
9.5 KiB
Diff
Raw Blame History

From a9b8142108e1d9aa88c7d5b2bc968fbe9a0e4433 Mon Sep 17 00:00:00 2001
From: Gunar Schorcht <gunar@schorcht.net>
Date: Sat, 1 Mar 2025 17:17:13 +0100
Subject: [PATCH 26/28] esp_hw_support: rename rtc_init
Rename `rtc_init` to `rtc_init_module` due to name conflicts with RIOT `periph/rtc` module.
---
components/esp_hw_support/port/esp32/include/soc/rtc.h | 2 +-
components/esp_hw_support/port/esp32/rtc_init.c | 2 +-
components/esp_hw_support/port/esp32c2/include/soc/rtc.h | 2 +-
components/esp_hw_support/port/esp32c2/rtc_init.c | 2 +-
components/esp_hw_support/port/esp32c3/include/soc/rtc.h | 2 +-
components/esp_hw_support/port/esp32c3/rtc_init.c | 2 +-
components/esp_hw_support/port/esp32s2/include/soc/rtc.h | 2 +-
components/esp_hw_support/port/esp32s2/rtc_init.c | 2 +-
components/esp_hw_support/port/esp32s3/include/soc/rtc.h | 2 +-
components/esp_hw_support/port/esp32s3/rtc_init.c | 2 +-
components/esp_system/port/soc/esp32/clk.c | 2 +-
components/esp_system/port/soc/esp32c2/clk.c | 2 +-
components/esp_system/port/soc/esp32c3/clk.c | 2 +-
components/esp_system/port/soc/esp32s2/clk.c | 2 +-
components/esp_system/port/soc/esp32s3/clk.c | 2 +-
15 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/components/esp_hw_support/port/esp32/include/soc/rtc.h b/components/esp_hw_support/port/esp32/include/soc/rtc.h
index 22f7cfe157..1f0f9f2e77 100644
--- a/components/esp_hw_support/port/esp32/include/soc/rtc.h
+++ b/components/esp_hw_support/port/esp32/include/soc/rtc.h
@@ -666,7 +666,7 @@ typedef struct rtc_config_s {
* Initialize RTC clock and power control related functions
* @param cfg configuration options as rtc_config_t
*/
-void rtc_init(rtc_config_t cfg);
+void rtc_init_module(rtc_config_t cfg);
#define RTC_VDDSDIO_TIEH_1_8V 0 //!< TIEH field value for 1.8V VDDSDIO
#define RTC_VDDSDIO_TIEH_3_3V 1 //!< TIEH field value for 3.3V VDDSDIO
diff --git a/components/esp_hw_support/port/esp32/rtc_init.c b/components/esp_hw_support/port/esp32/rtc_init.c
index 087824c279..9eecbef376 100644
--- a/components/esp_hw_support/port/esp32/rtc_init.c
+++ b/components/esp_hw_support/port/esp32/rtc_init.c
@@ -17,7 +17,7 @@
#endif
-void rtc_init(rtc_config_t cfg)
+void rtc_init_module(rtc_config_t cfg)
{
/**
* When run rtc_init, it maybe deep sleep reset. Since we power down modem in deep sleep, after wakeup
diff --git a/components/esp_hw_support/port/esp32c2/include/soc/rtc.h b/components/esp_hw_support/port/esp32c2/include/soc/rtc.h
index 9f8d412f59..3d2ae50f99 100644
--- a/components/esp_hw_support/port/esp32c2/include/soc/rtc.h
+++ b/components/esp_hw_support/port/esp32c2/include/soc/rtc.h
@@ -690,7 +690,7 @@ typedef struct {
* Initialize RTC clock and power control related functions
* @param cfg configuration options as rtc_config_t
*/
-void rtc_init(rtc_config_t cfg);
+void rtc_init_module(rtc_config_t cfg);
// -------------------------- CLOCK TREE DEFS ALIAS ----------------------------
// **WARNING**: The following are only for backwards compatibility.
diff --git a/components/esp_hw_support/port/esp32c2/rtc_init.c b/components/esp_hw_support/port/esp32c2/rtc_init.c
index abb5370c67..32549d5376 100644
--- a/components/esp_hw_support/port/esp32c2/rtc_init.c
+++ b/components/esp_hw_support/port/esp32c2/rtc_init.c
@@ -29,7 +29,7 @@ static void set_ocode_by_efuse(int ocode_scheme_ver);
static void calibrate_ocode(void);
static void set_rtc_dig_dbias(void);
-void rtc_init(rtc_config_t cfg)
+void rtc_init_module(rtc_config_t cfg)
{
REGI2C_WRITE_MASK(I2C_DIG_REG, I2C_DIG_REG_XPD_DIG_REG, 0);
REGI2C_WRITE_MASK(I2C_DIG_REG, I2C_DIG_REG_XPD_RTC_REG, 0);
diff --git a/components/esp_hw_support/port/esp32c3/include/soc/rtc.h b/components/esp_hw_support/port/esp32c3/include/soc/rtc.h
index 58a26dd41e..bae3de4931 100644
--- a/components/esp_hw_support/port/esp32c3/include/soc/rtc.h
+++ b/components/esp_hw_support/port/esp32c3/include/soc/rtc.h
@@ -759,7 +759,7 @@ typedef struct {
* Initialize RTC clock and power control related functions
* @param cfg configuration options as rtc_config_t
*/
-void rtc_init(rtc_config_t cfg);
+void rtc_init_module(rtc_config_t cfg);
// -------------------------- CLOCK TREE DEFS ALIAS ----------------------------
// **WARNING**: The following are only for backwards compatibility.
diff --git a/components/esp_hw_support/port/esp32c3/rtc_init.c b/components/esp_hw_support/port/esp32c3/rtc_init.c
index c7a1eb55f0..ed62540c6e 100644
--- a/components/esp_hw_support/port/esp32c3/rtc_init.c
+++ b/components/esp_hw_support/port/esp32c3/rtc_init.c
@@ -29,7 +29,7 @@ static void set_ocode_by_efuse(int calib_version);
static void calibrate_ocode(void);
static void set_rtc_dig_dbias(void);
-void rtc_init(rtc_config_t cfg)
+void rtc_init_module(rtc_config_t cfg)
{
/**
* When run rtc_init, it maybe deep sleep reset. Since we power down modem in deep sleep, after wakeup
diff --git a/components/esp_hw_support/port/esp32s2/include/soc/rtc.h b/components/esp_hw_support/port/esp32s2/include/soc/rtc.h
index 5a3dda4844..109e956af2 100644
--- a/components/esp_hw_support/port/esp32s2/include/soc/rtc.h
+++ b/components/esp_hw_support/port/esp32s2/include/soc/rtc.h
@@ -799,7 +799,7 @@ typedef struct {
* Initialize RTC clock and power control related functions
* @param cfg configuration options as rtc_config_t
*/
-void rtc_init(rtc_config_t cfg);
+void rtc_init_module(rtc_config_t cfg);
/**
* Structure describing vddsdio configuration
diff --git a/components/esp_hw_support/port/esp32s2/rtc_init.c b/components/esp_hw_support/port/esp32s2/rtc_init.c
index 549cdffd43..0f1111c758 100644
--- a/components/esp_hw_support/port/esp32s2/rtc_init.c
+++ b/components/esp_hw_support/port/esp32s2/rtc_init.c
@@ -26,7 +26,7 @@ __attribute__((unused)) static const char *TAG = "rtc_init";
static void set_ocode_by_efuse(int calib_version);
static void calibrate_ocode(void);
-void rtc_init(rtc_config_t cfg)
+void rtc_init_module(rtc_config_t cfg)
{
/**
* When run rtc_init, it maybe deep sleep reset. Since we power down modem in deep sleep, after wakeup
diff --git a/components/esp_hw_support/port/esp32s3/include/soc/rtc.h b/components/esp_hw_support/port/esp32s3/include/soc/rtc.h
index 27a4845f5f..f4c37716e5 100644
--- a/components/esp_hw_support/port/esp32s3/include/soc/rtc.h
+++ b/components/esp_hw_support/port/esp32s3/include/soc/rtc.h
@@ -786,7 +786,7 @@ typedef struct {
* Initialize RTC clock and power control related functions
* @param cfg configuration options as rtc_config_t
*/
-void rtc_init(rtc_config_t cfg);
+void rtc_init_module(rtc_config_t cfg);
/**
* Structure describing vddsdio configuration
diff --git a/components/esp_hw_support/port/esp32s3/rtc_init.c b/components/esp_hw_support/port/esp32s3/rtc_init.c
index bbdf99ee89..3e28058c87 100644
--- a/components/esp_hw_support/port/esp32s3/rtc_init.c
+++ b/components/esp_hw_support/port/esp32s3/rtc_init.c
@@ -43,7 +43,7 @@ uint32_t g_rtc_dbias_pvt_240m = 28;
uint32_t g_dig_dbias_pvt_non_240m = 27;
uint32_t g_rtc_dbias_pvt_non_240m = 27;
-void rtc_init(rtc_config_t cfg)
+void rtc_init_module(rtc_config_t cfg)
{
/**
* When run rtc_init, it maybe deep sleep reset. Since we power down modem in deep sleep, after wakeup
diff --git a/components/esp_system/port/soc/esp32/clk.c b/components/esp_system/port/soc/esp32/clk.c
index 88f72ff947..197a17b5e1 100644
--- a/components/esp_system/port/soc/esp32/clk.c
+++ b/components/esp_system/port/soc/esp32/clk.c
@@ -109,7 +109,7 @@ static void select_rtc_slow_clk(slow_clk_sel_t slow_clk)
void esp_rtc_init(void)
{
rtc_config_t cfg = RTC_CONFIG_DEFAULT();
- rtc_init(cfg);
+ rtc_init_module(cfg);
}
__attribute__((weak)) void esp_clk_init(void)
diff --git a/components/esp_system/port/soc/esp32c2/clk.c b/components/esp_system/port/soc/esp32c2/clk.c
index 6cc267ea6c..5c8fc6c2f4 100644
--- a/components/esp_system/port/soc/esp32c2/clk.c
+++ b/components/esp_system/port/soc/esp32c2/clk.c
@@ -70,7 +70,7 @@ void esp_rtc_init(void)
if (rst_reas == RESET_REASON_CHIP_POWER_ON) {
cfg.cali_ocode = 1;
}
- rtc_init(cfg);
+ rtc_init_module(cfg);
#endif
}
diff --git a/components/esp_system/port/soc/esp32c3/clk.c b/components/esp_system/port/soc/esp32c3/clk.c
index ecb5d08385..bc4687bbd6 100644
--- a/components/esp_system/port/soc/esp32c3/clk.c
+++ b/components/esp_system/port/soc/esp32c3/clk.c
@@ -69,7 +69,7 @@ void esp_rtc_init(void)
) {
cfg.cali_ocode = 1;
}
- rtc_init(cfg);
+ rtc_init_module(cfg);
}
__attribute__((weak)) void esp_clk_init(void)
diff --git a/components/esp_system/port/soc/esp32s2/clk.c b/components/esp_system/port/soc/esp32s2/clk.c
index 2b786b62f9..26d86af6c3 100644
--- a/components/esp_system/port/soc/esp32s2/clk.c
+++ b/components/esp_system/port/soc/esp32s2/clk.c
@@ -72,7 +72,7 @@ void esp_rtc_init(void)
esp_rom_output_tx_wait_idle(CONFIG_ESP_CONSOLE_ROM_SERIAL_PORT_NUM);
}
}
- rtc_init(cfg);
+ rtc_init_module(cfg);
}
__attribute__((weak)) void esp_clk_init(void)
diff --git a/components/esp_system/port/soc/esp32s3/clk.c b/components/esp_system/port/soc/esp32s3/clk.c
index fac148fb41..fe6f9bee6d 100644
--- a/components/esp_system/port/soc/esp32s3/clk.c
+++ b/components/esp_system/port/soc/esp32s3/clk.c
@@ -71,7 +71,7 @@ void esp_rtc_init(void)
if (rst_reas == RESET_REASON_CHIP_POWER_ON) {
cfg.cali_ocode = 1;
}
- rtc_init(cfg);
+ rtc_init_module(cfg);
}
__attribute__((weak)) void esp_clk_init(void)
--
2.34.1
View Git Blame Copy Permalink