arm, am33xx: move rtc32k_enable() to common place
move rtc32k_enable() to common place so all am33xx boards can use it.
--- arch/arm/cpu/armv7/am33xx/board.c | 18 ++++++++++++++++++ arch/arm/include/asm/arch-am33xx/sys_proto.h | 4 ++++ board/isee/igep0033/board.c | 16 ---------------- board/phytec/pcm051/board.c | 16 ---------------- board/ti/am335x/board.c | 16 ---------------- board/ti/ti814x/evm.c | 16 ----------------
6 Dateien ge?ndert, 22 Zeilen hinzugef?gt(+), 64 Zeilen entfernt(-)
arch/arm/cpu/armv7/am33xx/board.c +18 -0
@@ -149,3 +149,21 @@ int arch_misc_init(void)#endif return 0 ; } + +#ifdef CONFIG_SPL_BUILD +void rtc32k_enable (void ) +{ +struct rtc_regs *rtc = (struct rtc_regs *)RTC_BASE ; + +/* +* Unlock the RTC's registers. For more details please see the +* RTC_SS section of the TRM. In order to unlock we need to +* write these specific values (keys) in this order. +*/ +writel (0x83e70b13 , &rtc->kick0r); +writel (0x95a4f1e0 , &rtc->kick1r); + +/* Enable the RTC 32K OSC by setting bits 3 and 6. */ +writel ((1 <<3 ) | (1 <<6 ), &rtc->osc); +} +#endif
arch/arm/include/asm/arch-am33xx/sys_proto.h +4 -0
@@ -40,4 +40,8 @@ void gpmc_init(void);void enable_gpmc_cs_config (const u32 *gpmc_config,struct gpmc_cs *cs,u32 base,u32 size);void omap_nand_switch_ecc (uint32_t ,uint32_t ); + +#ifdef CONFIG_SPL_BUILD +void rtc32k_enable (void ); +#endif #endif
board/isee/igep0033/board.c +0 -16
@@ -51,22 +51,6 @@ static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;#define UART_CLK_RUNNING_MASK 0x1#define UART_SMART_IDLE_EN (0x1 << 0x3) -static void rtc32k_enable (void ) -{ -struct rtc_regs *rtc = (struct rtc_regs *)RTC_BASE ; - -/* -* Unlock the RTC's registers. For more details please see the -* RTC_SS section of the TRM. In order to unlock we need to -* write these specific values (keys) in this order. -*/ -writel (0x83e70b13 , &rtc->kick0r); -writel (0x95a4f1e0 , &rtc->kick1r); - -/* Enable the RTC 32K OSC by setting bits 3 and 6. */ -writel ((1 <<3 ) | (1 <<6 ), &rtc->osc); -} -static const struct ddr_data ddr3_data = { .datardsratio0 =K4B2G1646EBIH9_RD_DQS , .datawdsratio0 =K4B2G1646EBIH9_WR_DQS ,
board/phytec/pcm051/board.c +0 -16
@@ -59,22 +59,6 @@ static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;/* DDR RAM defines */ #define DDR_CLK_MHZ 303/* DDR_DPLL_MULT value */ -static void rtc32k_enable (void ) -{ -struct rtc_regs *rtc = (struct rtc_regs *)RTC_BASE ; - -/* -* Unlock the RTC's registers. For more details please see the -* RTC_SS section of the TRM. In order to unlock we need to -* write these specific values (keys) in this order. -*/ -writel (0x83e70b13 , &rtc->kick0r); -writel (0x95a4f1e0 , &rtc->kick1r); - -/* Enable the RTC 32K OSC by setting bits 3 and 6. */ -writel ((1 <<3 ) | (1 <<6 ), &rtc->osc); -} -static const struct ddr_data ddr3_data = { .datardsratio0 =MT41J256M8HX15E_RD_DQS , .datawdsratio0 =MT41J256M8HX15E_WR_DQS ,
board/ti/am335x/board.c +0 -16
@@ -132,22 +132,6 @@ static int read_eeprom(void)#define UART_CLK_RUNNING_MASK 0x1#define UART_SMART_IDLE_EN (0x1 << 0x3) -static void rtc32k_enable (void ) -{ -struct rtc_regs *rtc = (struct rtc_regs *)RTC_BASE ; - -/* -* Unlock the RTC's registers. For more details please see the -* RTC_SS section of the TRM. In order to unlock we need to -* write these specific values (keys) in this order. -*/ -writel (0x83e70b13 , &rtc->kick0r); -writel (0x95a4f1e0 , &rtc->kick1r); - -/* Enable the RTC 32K OSC by setting bits 3 and 6. */ -writel ((1 <<3 ) | (1 <<6 ), &rtc->osc); -} -static const struct ddr_data ddr2_data = { .datardsratio0 = ((MT47H128M16RT25E_RD_DQS<<30) | (MT47H128M16RT25E_RD_DQS<<20) |
board/ti/ti814x/evm.c +0 -16
@@ -48,22 +48,6 @@ static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;#define UART_CLK_RUNNING_MASK 0x1#define UART_SMART_IDLE_EN (0x1 << 0x3) -static void rtc32k_enable (void ) -{ -struct rtc_regs *rtc = (struct rtc_regs *)RTC_BASE ; - -/* -* Unlock the RTC's registers. For more details please see the -* RTC_SS section of the TRM. In order to unlock we need to -* write these specific values (keys) in this order. -*/ -writel (0x83e70b13 , &rtc->kick0r); -writel (0x95a4f1e0 , &rtc->kick1r); - -/* Enable the RTC 32K OSC by setting bits 3 and 6. */ -writel ((1 <<3 ) | (1 <<6 ), &rtc->osc); -} -static void uart_enable (void ) {u32 regVal;
Signature · 1 line
1.7.11.7
Quoted 1 line · Heiko Schocher
move
rtc32k_enable()to common place so all am33xx boards can use it.
[snip]
arch/arm/include/asm/arch-am33xx/sys_proto.h void gpmc_init(void); · line 46
Quoted 3 lines
arch/arm/include/asm/arch-am33xx/sys_proto.h +3
-0+#ifdef CONFIG_SPL_BUILD +void rtc32k_enable (void ); +#endif
No need for ifdef on prototypes.
Otherwise, good cleanup, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20130604/87ef8441/attachment.pgp>
Hello Tom,
Am 04.06.2013 23:14, schrieb Tom Rini:
Quoted 9 lines · Heiko Schocher
Quoted 2 lines
move
rtc32k_enable()to common place so all am33xx boards can use it.[snip]
arch/arm/include/asm/arch-am33xx/sys_proto.h void gpmc_init(void); · line 46
Quoted 3 lines
arch/arm/include/asm/arch-am33xx/sys_proto.h +3
-0+#ifdef CONFIG_SPL_BUILD +void rtc32k_enable (void ); +#endif No need for ifdef on prototypes.
Yep, fixed.
Thanks.
bye,
Heiko
Signature · 2 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
PATCH v2 1/1 arm, am33xx: move rtc32k_enable() to common place
In reply to Heiko Schochermove rtc32k_enable() to common place so all am33xx boards can use it.
---
- changes for v2:
remove ifdef around prototype, as Tom Rini suggested
arch/arm/cpu/armv7/am33xx/board.c | 18 ++++++++++++++++++ arch/arm/include/asm/arch-am33xx/sys_proto.h | 2 ++ board/isee/igep0033/board.c | 16 ---------------- board/phytec/pcm051/board.c | 16 ---------------- board/ti/am335x/board.c | 16 ---------------- board/ti/ti814x/evm.c | 16 ----------------
6 Dateien ge?ndert, 20 Zeilen hinzugef?gt(+), 64 Zeilen entfernt(-)
arch/arm/cpu/armv7/am33xx/board.c +18 -0
@@ -149,3 +149,21 @@ int arch_misc_init(void)#endif return 0 ; } + +#ifdef CONFIG_SPL_BUILD +void rtc32k_enable (void ) +{ +struct rtc_regs *rtc = (struct rtc_regs *)RTC_BASE ; + +/* +* Unlock the RTC's registers. For more details please see the +* RTC_SS section of the TRM. In order to unlock we need to +* write these specific values (keys) in this order. +*/ +writel (0x83e70b13 , &rtc->kick0r); +writel (0x95a4f1e0 , &rtc->kick1r); + +/* Enable the RTC 32K OSC by setting bits 3 and 6. */ +writel ((1 <<3 ) | (1 <<6 ), &rtc->osc); +} +#endif
arch/arm/include/asm/arch-am33xx/sys_proto.h +2 -0
@@ -40,4 +40,6 @@ void gpmc_init(void);void enable_gpmc_cs_config (const u32 *gpmc_config,struct gpmc_cs *cs,u32 base,u32 size);void omap_nand_switch_ecc (uint32_t ,uint32_t ); + +void rtc32k_enable (void );#endif
board/isee/igep0033/board.c +0 -16
@@ -51,22 +51,6 @@ static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;#define UART_CLK_RUNNING_MASK 0x1#define UART_SMART_IDLE_EN (0x1 << 0x3) -static void rtc32k_enable (void ) -{ -struct rtc_regs *rtc = (struct rtc_regs *)RTC_BASE ; - -/* -* Unlock the RTC's registers. For more details please see the -* RTC_SS section of the TRM. In order to unlock we need to -* write these specific values (keys) in this order. -*/ -writel (0x83e70b13 , &rtc->kick0r); -writel (0x95a4f1e0 , &rtc->kick1r); - -/* Enable the RTC 32K OSC by setting bits 3 and 6. */ -writel ((1 <<3 ) | (1 <<6 ), &rtc->osc); -} -static const struct ddr_data ddr3_data = { .datardsratio0 =K4B2G1646EBIH9_RD_DQS , .datawdsratio0 =K4B2G1646EBIH9_WR_DQS ,
board/phytec/pcm051/board.c +0 -16
@@ -59,22 +59,6 @@ static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;/* DDR RAM defines */ #define DDR_CLK_MHZ 303/* DDR_DPLL_MULT value */ -static void rtc32k_enable (void ) -{ -struct rtc_regs *rtc = (struct rtc_regs *)RTC_BASE ; - -/* -* Unlock the RTC's registers. For more details please see the -* RTC_SS section of the TRM. In order to unlock we need to -* write these specific values (keys) in this order. -*/ -writel (0x83e70b13 , &rtc->kick0r); -writel (0x95a4f1e0 , &rtc->kick1r); - -/* Enable the RTC 32K OSC by setting bits 3 and 6. */ -writel ((1 <<3 ) | (1 <<6 ), &rtc->osc); -} -static const struct ddr_data ddr3_data = { .datardsratio0 =MT41J256M8HX15E_RD_DQS , .datawdsratio0 =MT41J256M8HX15E_WR_DQS ,
board/ti/am335x/board.c +0 -16
@@ -132,22 +132,6 @@ static int read_eeprom(void)#define UART_CLK_RUNNING_MASK 0x1#define UART_SMART_IDLE_EN (0x1 << 0x3) -static void rtc32k_enable (void ) -{ -struct rtc_regs *rtc = (struct rtc_regs *)RTC_BASE ; - -/* -* Unlock the RTC's registers. For more details please see the -* RTC_SS section of the TRM. In order to unlock we need to -* write these specific values (keys) in this order. -*/ -writel (0x83e70b13 , &rtc->kick0r); -writel (0x95a4f1e0 , &rtc->kick1r); - -/* Enable the RTC 32K OSC by setting bits 3 and 6. */ -writel ((1 <<3 ) | (1 <<6 ), &rtc->osc); -} -static const struct ddr_data ddr2_data = { .datardsratio0 = ((MT47H128M16RT25E_RD_DQS<<30) | (MT47H128M16RT25E_RD_DQS<<20) |
board/ti/ti814x/evm.c +0 -16
@@ -48,22 +48,6 @@ static struct ctrl_dev *cdev = (struct ctrl_dev *)CTRL_DEVICE_BASE;#define UART_CLK_RUNNING_MASK 0x1#define UART_SMART_IDLE_EN (0x1 << 0x3) -static void rtc32k_enable (void ) -{ -struct rtc_regs *rtc = (struct rtc_regs *)RTC_BASE ; - -/* -* Unlock the RTC's registers. For more details please see the -* RTC_SS section of the TRM. In order to unlock we need to -* write these specific values (keys) in this order. -*/ -writel (0x83e70b13 , &rtc->kick0r); -writel (0x95a4f1e0 , &rtc->kick1r); - -/* Enable the RTC 32K OSC by setting bits 3 and 6. */ -writel ((1 <<3 ) | (1 <<6 ), &rtc->osc); -} -static void uart_enable (void ) {u32 regVal;
Signature · 1 line
1.7.11.7