From e5e0621273992d836e2dff396ef0e7cfc1f77424 Mon Sep 17 00:00:00 2001 From: Yidi Lin Date: Fri, 14 Mar 2025 16:23:01 +0800 Subject: [PATCH] soc/mediatek/common: Move common API declarations to rtc_common.h Move following function declarations to rtc_common.h. - rtc_init() - rtc_boot() - rtc_get_frequency_meter() - rtc_gpio_init() - rtc_read() - rtc_write() BUG=b:388796896 TEST=build coreboot for all MediaTek platforms Change-Id: I6210251a5cf3f80836d5f8a09c9ecfd133677b35 Signed-off-by: Yidi Lin Reviewed-on: https://review.coreboot.org/c/coreboot/+/86927 Tested-by: build bot (Jenkins) Reviewed-by: Yu-Ping Wu --- src/mainboard/google/rauru/romstage.c | 2 +- src/soc/mediatek/common/include/soc/rtc_common.h | 7 +++++++ src/soc/mediatek/mt8173/include/soc/rtc.h | 6 ------ src/soc/mediatek/mt8173/rtc.c | 2 +- src/soc/mediatek/mt8183/include/soc/rtc.h | 6 ------ src/soc/mediatek/mt8186/include/soc/rtc.h | 9 --------- src/soc/mediatek/mt8188/include/soc/rtc.h | 8 +------- src/soc/mediatek/mt8192/include/soc/rtc.h | 7 +------ src/soc/mediatek/mt8195/include/soc/rtc.h | 7 +------ src/soc/mediatek/mt8196/include/soc/mt6685_rtc.h | 3 --- src/soc/mediatek/mt8196/include/soc/rtc.h | 5 ----- 11 files changed, 12 insertions(+), 50 deletions(-) diff --git a/src/mainboard/google/rauru/romstage.c b/src/mainboard/google/rauru/romstage.c index 584af61d0f..89602532d7 100644 --- a/src/mainboard/google/rauru/romstage.c +++ b/src/mainboard/google/rauru/romstage.c @@ -11,12 +11,12 @@ #include #include #include -#include #include #include #include #include #include +#include #include #include diff --git a/src/soc/mediatek/common/include/soc/rtc_common.h b/src/soc/mediatek/common/include/soc/rtc_common.h index 7a22a01544..4e3d7110ef 100644 --- a/src/soc/mediatek/common/include/soc/rtc_common.h +++ b/src/soc/mediatek/common/include/soc/rtc_common.h @@ -104,5 +104,12 @@ void rtc_osc_init(void); bool rtc_powerkey_init(void); void rtc_boot_common(void); u16 rtc_eosc_cali(void); +/* Complete the RTC initialization process and register settings. */ +int rtc_init(int recover); +void rtc_boot(void); +u16 rtc_get_frequency_meter(u16 val, u16 measure_src, u16 window_size); +bool rtc_gpio_init(void); +void rtc_read(u16 addr, u16 *rdata); +void rtc_write(u16 addr, u16 wdata); #endif /* SOC_MEDIATEK_RTC_COMMON_H */ diff --git a/src/soc/mediatek/mt8173/include/soc/rtc.h b/src/soc/mediatek/mt8173/include/soc/rtc.h index 6956931a0a..aef108ed72 100644 --- a/src/soc/mediatek/mt8173/include/soc/rtc.h +++ b/src/soc/mediatek/mt8173/include/soc/rtc.h @@ -99,10 +99,4 @@ enum { RTC_CALI_BBPU_2SEC_STAT = 1U << 11 }; -/* external API */ -int rtc_init(int recover); -void rtc_boot(void); -void rtc_read(u16 addr, u16 *rdata); -void rtc_write(u16 addr, u16 wdata); - #endif /* SOC_MEDIATEK_MT8173_RTC_H */ diff --git a/src/soc/mediatek/mt8173/rtc.c b/src/soc/mediatek/mt8173/rtc.c index 326a951096..8d86e1520a 100644 --- a/src/soc/mediatek/mt8173/rtc.c +++ b/src/soc/mediatek/mt8173/rtc.c @@ -8,7 +8,7 @@ #include /* initialize rtc related gpio */ -static bool rtc_gpio_init(void) +bool rtc_gpio_init(void) { u16 con; diff --git a/src/soc/mediatek/mt8183/include/soc/rtc.h b/src/soc/mediatek/mt8183/include/soc/rtc.h index 8c8ed096bb..835cdda878 100644 --- a/src/soc/mediatek/mt8183/include/soc/rtc.h +++ b/src/soc/mediatek/mt8183/include/soc/rtc.h @@ -80,12 +80,6 @@ enum { /* external API */ -int rtc_init(int recover); -bool rtc_gpio_init(void); -void rtc_boot(void); -u16 rtc_get_frequency_meter(u16 val, u16 measure_src, u16 window_size); void mt6358_dcxo_disable_unused(void); -void rtc_read(u16 addr, u16 *rdata); -void rtc_write(u16 addr, u16 wdata); #endif /* SOC_MEDIATEK_MT8183_RTC_H */ diff --git a/src/soc/mediatek/mt8186/include/soc/rtc.h b/src/soc/mediatek/mt8186/include/soc/rtc.h index bf357d15bb..75b68540ad 100644 --- a/src/soc/mediatek/mt8186/include/soc/rtc.h +++ b/src/soc/mediatek/mt8186/include/soc/rtc.h @@ -83,13 +83,4 @@ enum { PMIC_FQMTR_CKSEL_MASK = 7U << 0, }; - -/* external API */ -int rtc_init(int recover); -bool rtc_gpio_init(void); -void rtc_boot(void); -u16 rtc_get_frequency_meter(u16 val, u16 measure_src, u16 window_size); -void rtc_read(u16 addr, u16 *rdata); -void rtc_write(u16 addr, u16 wdata); - #endif /* SOC_MEDIATEK_MT8186_RTC_H */ diff --git a/src/soc/mediatek/mt8188/include/soc/rtc.h b/src/soc/mediatek/mt8188/include/soc/rtc.h index 67a67017d9..7947f346cf 100644 --- a/src/soc/mediatek/mt8188/include/soc/rtc.h +++ b/src/soc/mediatek/mt8188/include/soc/rtc.h @@ -4,6 +4,7 @@ #define SOC_MEDIATEK_MT8188_RTC_H #include +#include #include #include @@ -82,11 +83,4 @@ enum { RTC_K_EOSC_RSV_2 = 1 << 10, }; -void rtc_read(u16 addr, u16 *rdata); -void rtc_write(u16 addr, u16 wdata); -int rtc_init(int recover); -bool rtc_gpio_init(void); -void rtc_boot(void); -u16 rtc_get_frequency_meter(u16 val, u16 measure_src, u16 window_size); - #endif /* SOC_MEDIATEK_MT8188_RTC_H */ diff --git a/src/soc/mediatek/mt8192/include/soc/rtc.h b/src/soc/mediatek/mt8192/include/soc/rtc.h index 10a529ad4b..0df519f15f 100644 --- a/src/soc/mediatek/mt8192/include/soc/rtc.h +++ b/src/soc/mediatek/mt8192/include/soc/rtc.h @@ -4,6 +4,7 @@ #define SOC_MEDIATEK_MT8192_RTC_H #include +#include #include #include @@ -83,10 +84,4 @@ enum { RTC_K_EOSC_RSV_2 = 1 << 10, }; -void rtc_read(u16 addr, u16 *rdata); -void rtc_write(u16 addr, u16 wdata); -int rtc_init(int recover); -bool rtc_gpio_init(void); -void rtc_boot(void); -u16 rtc_get_frequency_meter(u16 val, u16 measure_src, u16 window_size); #endif /* SOC_MEDIATEK_MT8192_RTC_H */ diff --git a/src/soc/mediatek/mt8195/include/soc/rtc.h b/src/soc/mediatek/mt8195/include/soc/rtc.h index 342aadf776..3210ac1be2 100644 --- a/src/soc/mediatek/mt8195/include/soc/rtc.h +++ b/src/soc/mediatek/mt8195/include/soc/rtc.h @@ -4,6 +4,7 @@ #define SOC_MEDIATEK_MT8195_RTC_H #include +#include #include #include @@ -83,10 +84,4 @@ enum { RTC_K_EOSC_RSV_2 = 1 << 10, }; -void rtc_read(u16 addr, u16 *rdata); -void rtc_write(u16 addr, u16 wdata); -int rtc_init(int recover); -bool rtc_gpio_init(void); -void rtc_boot(void); -u16 rtc_get_frequency_meter(u16 val, u16 measure_src, u16 window_size); #endif /* SOC_MEDIATEK_MT8195_RTC_H */ diff --git a/src/soc/mediatek/mt8196/include/soc/mt6685_rtc.h b/src/soc/mediatek/mt8196/include/soc/mt6685_rtc.h index aa576ff38c..e46fd90ff6 100644 --- a/src/soc/mediatek/mt8196/include/soc/mt6685_rtc.h +++ b/src/soc/mediatek/mt8196/include/soc/mt6685_rtc.h @@ -147,7 +147,4 @@ #define SCK_TOP_XTAL_SEL_MASK 0x1 #define SCK_TOP_XTAL_SEL_SHIFT 0 -/* Complete the RTC initialization process and register settings. */ -void rtc_boot(void); - #endif /* SOC_MEDIATEK_MT8196_MT6685_RTC_H */ diff --git a/src/soc/mediatek/mt8196/include/soc/rtc.h b/src/soc/mediatek/mt8196/include/soc/rtc.h index ba90669671..b315998713 100644 --- a/src/soc/mediatek/mt8196/include/soc/rtc.h +++ b/src/soc/mediatek/mt8196/include/soc/rtc.h @@ -66,11 +66,6 @@ struct rtc_clk_freq { u16 fqm26m_target_ck; }; -int rtc_init(int recover); -bool rtc_gpio_init(void); -u16 rtc_get_frequency_meter(u16 val, u16 measure_src, u16 window_size); void rtc_get_time(struct rtc_time *tm); -void rtc_read(u16 addr, u16 *rdata); -void rtc_write(u16 addr, u16 wdata); #endif /* SOC_MEDIATEK_MT8196_RTC_H */