From a4a28df47dcd88571cb46af314c03684220bb6dd Mon Sep 17 00:00:00 2001 From: Daniel Schultz Date: Mon, 25 Jan 2016 08:44:13 +0100 Subject: arm: am33xx: Move function to read from Master OSC Move the function to read the Master OSC speed from the SYSBOOT Configuration Pin for reuse. Signed-off-by: Daniel Schultz Signed-off-by: Teresa Remmet Signed-off-by: Sascha Hauer --- arch/arm/mach-omap/am33xx_clock.c | 27 ++++++++++++++++++++++++++ arch/arm/mach-omap/dmtimer.c | 20 +++---------------- arch/arm/mach-omap/include/mach/am33xx-clock.h | 1 + 3 files changed, 31 insertions(+), 17 deletions(-) (limited to 'arch/arm/mach-omap') diff --git a/arch/arm/mach-omap/am33xx_clock.c b/arch/arm/mach-omap/am33xx_clock.c index 6d8addef32..3ed1d52e09 100644 --- a/arch/arm/mach-omap/am33xx_clock.c +++ b/arch/arm/mach-omap/am33xx_clock.c @@ -318,3 +318,30 @@ void am33xx_pll_init(int mpupll_M, int osc, int ddrpll_M) /* Enable the required peripherals */ am33xx_enable_per_clocks(); } + +/* + * Return the OSC clock value from SYSBOOT pins in kHz. + */ +int am33xx_get_osc_clock(void) +{ + int osc; + u32 sysboot; + + sysboot = (readl(AM33XX_CTRL_STATUS) >> 22) & 3; + switch (sysboot) { + case 0: + osc = 19200; + break; + case 1: + osc = 24000; + break; + case 2: + osc = 25000; + break; + case 3: + osc = 26000; + break; + } + + return osc; +} diff --git a/arch/arm/mach-omap/dmtimer.c b/arch/arm/mach-omap/dmtimer.c index 56adda080a..e223b8cc8f 100644 --- a/arch/arm/mach-omap/dmtimer.c +++ b/arch/arm/mach-omap/dmtimer.c @@ -31,6 +31,7 @@ #include #include #include +#include #include @@ -82,24 +83,9 @@ static struct clocksource dmtimer_cs = { static int dmtimer_init(void) { u64 clk_speed; - int sysboot; - - sysboot = (readl(AM33XX_CTRL_STATUS) >> 22) & 3; - switch (sysboot) { - case 0: - clk_speed = 19200000; - break; - case 1: - clk_speed = 24000000; - break; - case 2: - clk_speed = 25000000; - break; - case 3: - clk_speed = 26000000; - break; - } + clk_speed = am33xx_get_osc_clock(); + clk_speed *= 1000; dmtimer_cs.mult = clocksource_hz2mult(clk_speed, dmtimer_cs.shift); /* Enable counter */ diff --git a/arch/arm/mach-omap/include/mach/am33xx-clock.h b/arch/arm/mach-omap/include/mach/am33xx-clock.h index 2d6a727e1c..b9dcebd9a5 100644 --- a/arch/arm/mach-omap/include/mach/am33xx-clock.h +++ b/arch/arm/mach-omap/include/mach/am33xx-clock.h @@ -185,5 +185,6 @@ void am33xx_pll_init(int mpupll_M, int osc, int ddrpll_M); void am33xx_enable_ddr_clocks(void); +int am33xx_get_osc_clock(void); #endif /* endif _AM33XX_CLOCKS_H_ */ -- cgit v1.2.3