Browse Source

ARM: AMx3xx: Centralize early clock initialization

This is similar to Commit 93e6253d11030 ("ARM: OMAP4/5: Centralize
early clock initialization") that was done for OMAP4+, reflecting the same
for AM33xx and AM43xx SoCs to centralize clock initialization.

Signed-off-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
[trini: Add setup_early_clocks that calls setup_clocks_for_console for
        ti81xx]
Signed-off-by: Tom Rini <trini@konsulko.com>
Lokesh Vutla 8 years ago
parent
commit
b64a7cb92d

+ 1 - 1
arch/arm/cpu/armv7/am33xx/board.c

@@ -286,7 +286,7 @@ void early_system_init(void)
 #endif
 	watchdog_disable();
 	set_uart_mux_conf();
-	setup_clocks_for_console();
+	setup_early_clocks();
 	uart_soft_reset();
 #if defined(CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC)
 	/* Enable RTC32K clock */

+ 7 - 2
arch/arm/cpu/armv7/am33xx/clock.c

@@ -232,10 +232,15 @@ __weak void scale_vcores(void)
 {
 }
 
-void prcm_init()
+void setup_early_clocks(void)
 {
+	setup_clocks_for_console();
 	enable_basic_clocks();
+	timer_init();
+}
+
+void prcm_init(void)
+{
 	scale_vcores();
 	setup_dplls();
-	timer_init();
 }

+ 6 - 0
arch/arm/cpu/armv7/am33xx/clock_ti814x.c

@@ -386,6 +386,12 @@ void setup_clocks_for_console(void)
 	while (readl(&cmalwon->uart0clkctrl) != PRCM_MOD_EN)
 		;
 }
+
+void setup_early_clocks(void)
+{
+	setup_clocks_for_console();
+}
+
 /*
  * Configure the PLL/PRCM for necessary peripherals
  */

+ 5 - 0
arch/arm/cpu/armv7/am33xx/clock_ti816x.c

@@ -429,6 +429,11 @@ void setup_clocks_for_console(void)
 		;
 }
 
+void setup_early_clocks(void)
+{
+	setup_clocks_for_console();
+}
+
 void prcm_init(void)
 {
 	/* Enable the control */

+ 1 - 0
arch/arm/include/asm/arch-am33xx/sys_proto.h

@@ -19,6 +19,7 @@ u32 get_sysboot_value(void);
 extern struct ctrl_stat *cstat;
 u32 get_device_type(void);
 void save_omap_boot_params(void);
+void setup_early_clocks(void);
 void setup_clocks_for_console(void);
 void mpu_pll_config_val(int mpull_m);
 void ddr_pll_config(unsigned int ddrpll_M);