On 01/18/2013 09:32 AM, Santosh Shilimkar wrote:
> OMAP5 clockdata has different sys clock clock node name. Fix the timer code
> to take care of it.
>
> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@xxxxxx>
> ---
> arch/arm/mach-omap2/timer.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
> index 691aa67..a0a1b14 100644
> --- a/arch/arm/mach-omap2/timer.c
> +++ b/arch/arm/mach-omap2/timer.c
> @@ -62,6 +62,7 @@
> #define OMAP2_MPU_SOURCE "sys_ck"
> #define OMAP3_MPU_SOURCE OMAP2_MPU_SOURCE
> #define OMAP4_MPU_SOURCE "sys_clkin_ck"
> +#define OMAP5_MPU_SOURCE "sys_clkin"
I would like to remove this definitions and in fact posted a patch today
to do that [1] ;-)
> #define OMAP2_32K_SOURCE "func_32k_ck"
> #define OMAP3_32K_SOURCE "omap_32k_fck"
> #define OMAP4_32K_SOURCE "sys_32k_ck"
> @@ -498,7 +499,7 @@ static void __init realtime_counter_init(void)
> pr_err("%s: ioremap failed\n", __func__);
> return;
> }
> - sys_clk = clk_get(NULL, "sys_clkin_ck");
> + sys_clk = clk_get(NULL, OMAP5_MPU_SOURCE);
> if (IS_ERR(sys_clk)) {
> pr_err("%s: failed to get system clock handle\n", __func__);
> iounmap(base);
> @@ -638,7 +639,7 @@ OMAP_SYS_TIMER(4, local);
>
> #ifdef CONFIG_SOC_OMAP5
> OMAP_SYS_32K_TIMER_INIT(5, 1, OMAP4_32K_SOURCE, "ti,timer-alwon",
> - 2, OMAP4_MPU_SOURCE);
> + 2, OMAP5_MPU_SOURCE);
I am hoping we can remove this completely for omap5 and use the same
function defined for omap2 [2].
Care to try your series on top of mine [3] on omap5?
Cheers
Jon
[1] http://www.spinics.net/lists/arm-kernel/msg221263.html
[2] http://www.spinics.net/lists/arm-kernel/msg221264.html
[3] http://www.spinics.net/lists/arm-kernel/msg221260.html
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
