Hi Sascha,
Can you drop this patch from your tree? This patch is not complete
even for mxs platform/arch code, and will conflict with my mxs
clk-prepare series.
--
Regards,
Shawn
On Fri, Nov 11, 2011 at 06:50:33PM +0800, Richard Zhao wrote:
> Signed-off-by: Richard Zhao <richard.zhao@xxxxxxxxxx>
> ---
> arch/arm/mach-mxs/system.c | 2 +-
> arch/arm/mach-mxs/timer.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-mxs/system.c b/arch/arm/mach-mxs/system.c
> index 20ec3bd..9760a12 100644
> --- a/arch/arm/mach-mxs/system.c
> +++ b/arch/arm/mach-mxs/system.c
> @@ -66,7 +66,7 @@ static int __init mxs_arch_reset_init(void)
>
> clk = clk_get_sys("rtc", NULL);
> if (!IS_ERR(clk))
> - clk_enable(clk);
> + clk_prepare_enable(clk);
>
> return 0;
> }
> diff --git a/arch/arm/mach-mxs/timer.c b/arch/arm/mach-mxs/timer.c
> index cace0d2..564a632 100644
> --- a/arch/arm/mach-mxs/timer.c
> +++ b/arch/arm/mach-mxs/timer.c
> @@ -245,7 +245,7 @@ static int __init mxs_clocksource_init(struct clk *timer_clk)
>
> void __init mxs_timer_init(struct clk *timer_clk, int irq)
> {
> - clk_enable(timer_clk);
> + clk_prepare_enable(timer_clk);
>
> /*
> * Initialize timers to a known state
> --
> 1.7.5.4
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
