netdev - Re: [PATCH V3 10/14] ARM: mxs: add clk_prepare/clk

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <20111220021532.GA2995@S2101-09.ap.freescale.net>
Date:	Tue, 20 Dec 2011 10:15:33 +0800
From:	Shawn Guo <shawn.guo@...escale.com>
To:	Richard Zhao <richard.zhao@...aro.org>,
	Sascha Hauer <s.hauer@...gutronix.de>
CC:	<linux-arm-kernel@...ts.infradead.org>,
	<linux-i2c@...r.kernel.org>, <linux-mmc@...r.kernel.org>,
	<netdev@...r.kernel.org>, <linux-serial@...r.kernel.org>,
	<linux@....linux.org.uk>, <amit.kucheria@...onical.com>,
	<kernel@...gutronix.de>, <ben-linux@...ff.org>, <cjb@...top.org>,
	<alan@...ux.intel.com>, <eric.miao@...aro.org>
Subject: Re: [PATCH V3 10/14] ARM: mxs: add clk_prepare/clk_unprepare

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@...aro.org>
> ---
>  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 netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html