michaelh/zephyr
1
0
Fork 0
Code Releases Activity

counter: stm32 rtc: improve assigning configs

Browse source 
The config values have been hardcoded as magic values. Introduce
universal calculation based on the DTS entries.

Signed-off-by: Dawid Niedzwiecki <dawidn@google.com>
This commit is contained in:
Dawid Niedzwiecki 2023-08-16 09:43:14 +02:00 • committed by Carles Cufí
commit ad53863d1a
1 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

37
drivers/counter/counter_ll_stm32_rtc.c
View file

@ -61,6 +61,23 @@ LOG_MODULE_REGISTER(counter_rtc_stm32, CONFIG_COUNTER_LOG_LEVEL);
#define COUNTER_NO_DATE #define COUNTER_NO_DATE
#endif #endif
#if DT_INST_CLOCKS_CELL_BY_IDX(0, 1, bus) == STM32_SRC_LSI
/* LSI */
#define RTCCLK_FREQ STM32_LSI_FREQ
#else
/* LSE */
#define RTCCLK_FREQ STM32_LSE_FREQ
#endif /* DT_INST_CLOCKS_CELL_BY_IDX(0, 1, bus) == STM32_SRC_LSI */
#if !defined(CONFIG_SOC_SERIES_STM32F1X)
#define RTC_ASYNCPRE BIT_MASK(7)
#else /* CONFIG_SOC_SERIES_STM32F1X */
#define RTC_ASYNCPRE (RTCCLK_FREQ - 1)
#endif /* CONFIG_SOC_SERIES_STM32F1X */
/* Adjust the second sync prescaler to get 1Hz on ck_spre */
#define RTC_SYNCPRE ((RTCCLK_FREQ / (1 + RTC_ASYNCPRE)) - 1)
struct rtc_stm32_config { struct rtc_stm32_config {
struct counter_config_info counter_info; struct counter_config_info counter_info;
LL_RTC_InitTypeDef ll_rtc_config; LL_RTC_InitTypeDef ll_rtc_config;
@ -477,30 +494,16 @@ static const struct stm32_pclken rtc_clk[] = STM32_DT_INST_CLOCKS(0);
static const struct rtc_stm32_config rtc_config = { static const struct rtc_stm32_config rtc_config = {
.counter_info = { .counter_info = {
.max_top_value = UINT32_MAX, .max_top_value = UINT32_MAX,
.freq = 1, .freq = RTCCLK_FREQ / ((RTC_ASYNCPRE + 1) * (RTC_SYNCPRE + 1)),
.flags = COUNTER_CONFIG_INFO_COUNT_UP, .flags = COUNTER_CONFIG_INFO_COUNT_UP,
.channels = 1, .channels = 1,
}, },
.ll_rtc_config = { .ll_rtc_config = {
.AsynchPrescaler = RTC_ASYNCPRE,
#if !defined(CONFIG_SOC_SERIES_STM32F1X) #if !defined(CONFIG_SOC_SERIES_STM32F1X)
.HourFormat = LL_RTC_HOURFORMAT_24HOUR, .HourFormat = LL_RTC_HOURFORMAT_24HOUR,
#if DT_INST_CLOCKS_CELL_BY_IDX(0, 1, bus) == STM32_SRC_LSI .SynchPrescaler = RTC_SYNCPRE,
/* prescaler values for LSI @ 32 KHz */
.AsynchPrescaler = 0x7F,
.SynchPrescaler = 0x00F9,
#else /* DT_INST_CLOCKS_CELL_BY_IDX(0, 1, bus) == STM32_SRC_LSE */
/* prescaler values for LSE @ 32768 Hz */
.AsynchPrescaler = 0x7F,
.SynchPrescaler = 0x00FF,
#endif
#else /* CONFIG_SOC_SERIES_STM32F1X */ #else /* CONFIG_SOC_SERIES_STM32F1X */
#if DT_INST_CLOCKS_CELL_BY_IDX(0, 1, bus) == STM32_SRC_LSI
/* prescaler values for LSI @ 40 KHz */
.AsynchPrescaler = 0x9C3F,
#else /* DT_INST_CLOCKS_CELL_BY_IDX(0, 1, bus) == STM32_SRC_LSE */
/* prescaler values for LSE @ 32768 Hz */
.AsynchPrescaler = 0x7FFF,
#endif
.OutPutSource = LL_RTC_CALIB_OUTPUT_NONE, .OutPutSource = LL_RTC_CALIB_OUTPUT_NONE,
#endif /* CONFIG_SOC_SERIES_STM32F1X */ #endif /* CONFIG_SOC_SERIES_STM32F1X */
}, },