alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'feature/esp32s3_remove_rtc_apb_freq_reg' into 'master'

Browse Source 
esp32s3: Remove APB frequency RTC register

See merge request espressif/esp-idf!11137
This commit is contained in:
Angus Gratton 2021-06-29 23:50:23 +00:00
commit 2f8debdde1
6 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
components/esp_hw_support/port/esp32s3/rtc_clk.c
View File

@ -42,6 +42,8 @@ static const char *TAG = "rtc_clk";
// Current PLL frequency, in MHZ (320 or 480). Zero if PLL is not enabled. // Current PLL frequency, in MHZ (320 or 480). Zero if PLL is not enabled.
static uint32_t s_cur_pll_freq; static uint32_t s_cur_pll_freq;
static uint32_t s_apb_freq;
static void rtc_clk_cpu_freq_to_8m(void); static void rtc_clk_cpu_freq_to_8m(void);
void rtc_clk_32k_enable_internal(x32k_config_t cfg) void rtc_clk_32k_enable_internal(x32k_config_t cfg)
@ -510,16 +512,12 @@ void rtc_clk_xtal_freq_update(rtc_xtal_freq_t xtal_freq)
void rtc_clk_apb_freq_update(uint32_t apb_freq) void rtc_clk_apb_freq_update(uint32_t apb_freq)
{ {
WRITE_PERI_REG(RTC_APB_FREQ_REG, clk_val_to_reg_val(apb_freq >> 12)); s_apb_freq = apb_freq;
} }
uint32_t rtc_clk_apb_freq_get(void) uint32_t rtc_clk_apb_freq_get(void)
{ {
uint32_t freq_hz = reg_val_to_clk_val(READ_PERI_REG(RTC_APB_FREQ_REG)) << 12; return s_apb_freq;
// round to the nearest MHz
freq_hz += MHZ / 2;
uint32_t remainder = freq_hz % MHZ;
return freq_hz - remainder;
} }
void rtc_clk_divider_set(uint32_t div) void rtc_clk_divider_set(uint32_t div)

5
components/esp_hw_support/port/esp32s3/rtc_clk_common.h
View File

@ -35,9 +35,8 @@ extern "C" {
void rtc_clk_cpu_freq_to_xtal(int freq, int div); void rtc_clk_cpu_freq_to_xtal(int freq, int div);
/* Values of RTC_XTAL_FREQ_REG and RTC_APB_FREQ_REG are stored as two copies in /* Value of RTC_XTAL_FREQ_REG is stored as two copies in lower and upper 16-bit
* lower and upper 16-bit halves. These are the routines to work with such a * halves. These are the routines to work with that representation.
* representation.
*/ */
static inline bool clk_val_is_valid(uint32_t val) static inline bool clk_val_is_valid(uint32_t val)
{ {

3
components/esp_rom/include/esp32s3/rom/rtc.h
View File

@ -51,7 +51,7 @@ extern "C" {
* RTC_CNTL_STORE2_REG Boot time, low word * RTC_CNTL_STORE2_REG Boot time, low word
* RTC_CNTL_STORE3_REG Boot time, high word * RTC_CNTL_STORE3_REG Boot time, high word
* RTC_CNTL_STORE4_REG External XTAL frequency * RTC_CNTL_STORE4_REG External XTAL frequency
* RTC_CNTL_STORE5_REG APB bus frequency * RTC_CNTL_STORE5_REG FAST_RTC_MEMORY_LENGTH
* RTC_CNTL_STORE6_REG FAST_RTC_MEMORY_ENTRY * RTC_CNTL_STORE6_REG FAST_RTC_MEMORY_ENTRY
* RTC_CNTL_STORE7_REG FAST_RTC_MEMORY_CRC * RTC_CNTL_STORE7_REG FAST_RTC_MEMORY_CRC
************************************************************************************* *************************************************************************************
@ -61,7 +61,6 @@ extern "C" {
#define RTC_BOOT_TIME_LOW_REG RTC_CNTL_STORE2_REG #define RTC_BOOT_TIME_LOW_REG RTC_CNTL_STORE2_REG
#define RTC_BOOT_TIME_HIGH_REG RTC_CNTL_STORE3_REG #define RTC_BOOT_TIME_HIGH_REG RTC_CNTL_STORE3_REG
#define RTC_XTAL_FREQ_REG RTC_CNTL_STORE4_REG #define RTC_XTAL_FREQ_REG RTC_CNTL_STORE4_REG
#define RTC_APB_FREQ_REG RTC_CNTL_STORE5_REG
#define RTC_ENTRY_ADDR_REG RTC_CNTL_STORE6_REG #define RTC_ENTRY_ADDR_REG RTC_CNTL_STORE6_REG
#define RTC_RESET_CAUSE_REG RTC_CNTL_STORE6_REG #define RTC_RESET_CAUSE_REG RTC_CNTL_STORE6_REG
#define RTC_MEMORY_CRC_REG RTC_CNTL_STORE7_REG #define RTC_MEMORY_CRC_REG RTC_CNTL_STORE7_REG

11
components/esp_system/fpga_overrides.c
View File

@ -22,6 +22,13 @@
static const char *TAG = "fpga"; static const char *TAG = "fpga";
#ifdef CONFIG_IDF_TARGET_ESP32
#include "esp32/rom/rtc.h"
#endif
#ifdef CONFIG_IDF_TARGET_ESP32S2
#include "esp32s2/rom/rtc.h"
#endif
extern void ets_update_cpu_frequency(uint32_t ticks_per_us); extern void ets_update_cpu_frequency(uint32_t ticks_per_us);
static void s_warn(void) static void s_warn(void)
@ -41,7 +48,9 @@ void bootloader_clock_configure(void)
uint32_t apb_freq_hz = 40000000; uint32_t apb_freq_hz = 40000000;
#endif // CONFIG_IDF_TARGET_ESP32S2 #endif // CONFIG_IDF_TARGET_ESP32S2
ets_update_cpu_frequency(apb_freq_hz / 1000000); ets_update_cpu_frequency(apb_freq_hz / 1000000);
REG_WRITE(RTC_CNTL_STORE5_REG, (apb_freq_hz >> 12) | ((apb_freq_hz >> 12) << 16)); #ifdef RTC_APB_FREQ_REG
REG_WRITE(RTC_APB_FREQ_REG, (apb_freq_hz >> 12) | ((apb_freq_hz >> 12) << 16));
#endif
REG_WRITE(RTC_CNTL_STORE4_REG, (xtal_freq_mhz) | ((xtal_freq_mhz) << 16)); REG_WRITE(RTC_CNTL_STORE4_REG, (xtal_freq_mhz) | ((xtal_freq_mhz) << 16));
} }

6
components/esp_system/port/soc/esp32s3/reset_reason.c
View File

@ -84,10 +84,8 @@ esp_reset_reason_t esp_reset_reason(void)
* is only used for deep sleep reset, and in this case the reason provided by * is only used for deep sleep reset, and in this case the reason provided by
* rtc_get_reset_reason is unambiguous. * rtc_get_reset_reason is unambiguous.
* *
* Same layout is used as for RTC_APB_FREQ_REG (a.k.a. RTC_CNTL_STORE5_REG): * In addition to that, MSB is set to 1, which doesn't happen when
* the value is replicated in low and high half-words. In addition to that, * RTC_CNTL_STORE6_REG contains deep sleep wake stub address.
* MSB is set to 1, which doesn't happen when RTC_CNTL_STORE6_REG contains
* deep sleep wake stub address.
*/ */
#define RST_REASON_BIT 0x80000000 #define RST_REASON_BIT 0x80000000

7
components/soc/esp32s3/include/soc/rtc.h
View File

@ -480,14 +480,13 @@ void rtc_clk_cpu_freq_get_config(rtc_cpu_freq_config_t *out_config);
void rtc_clk_cpu_freq_set_xtal(void); void rtc_clk_cpu_freq_set_xtal(void);
/** /**
* @brief Store new APB frequency value into RTC_APB_FREQ_REG * @brief Store new APB frequency value in RAM
* *
* This function doesn't change any hardware clocks. * This function doesn't change any hardware clocks.
* *
* Functions which perform frequency switching and change APB frequency call * Functions which perform frequency switching and change APB frequency call
* this function to update the value of APB frequency stored in RTC_APB_FREQ_REG * this function to update the value of APB frequency stored in RAM.
* (one of RTC general purpose retention registers). This should not normally * (This should not normally be called from application code.)
* be called from application code.
* *
* @param apb_freq new APB frequency, in Hz * @param apb_freq new APB frequency, in Hz
*/ */