From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ben Dooks <ben-linux@fluff.org>
Subject: Re: [PATCH] ARM: SAMSUNG: Add check to ensure that clksrc_clk does
	have multiple clock sources
Date: Mon, 18 Jan 2010 03:21:33 +0000
Message-ID: <20100118032133.GJ10014@trinity.fluff.org>
References: <1263782404-30534-1-git-send-email-thomas.ab@samsung.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <linux-samsung-soc-owner@vger.kernel.org>
Received: from trinity.fluff.org ([89.16.178.74]:50820 "EHLO trinity.fluff.org"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1752974Ab0ARDVg (ORCPT
	<rfc822;linux-samsung-soc@vger.kernel.org>);
	Sun, 17 Jan 2010 22:21:36 -0500
Content-Disposition: inline
In-Reply-To: <1263782404-30534-1-git-send-email-thomas.ab@samsung.com>
Sender: linux-samsung-soc-owner@vger.kernel.org
List-Id: linux-samsung-soc@vger.kernel.org
To: Thomas Abraham <thomas.ab@samsung.com>
Cc: linux-samsung-soc@vger.kernel.org, ben-linux@fluff.org

On Mon, Jan 18, 2010 at 11:40:04AM +0900, Thomas Abraham wrote:
> This patch adds a additional check in s3c_set_clksrc function to ensure
> that the clksrc_clk does have a choice of multiple clock sources. In addition
> to this, a check is added to ensure that a parent is assigned to the clksrc_clk 
> in case it does not have a choice of parent clocks.

'This patch' is redudnant in this case, so how about Add an additional check...

I assume as we're not getting a pile of s3c6410 reports that this isn't
an urgent fix and that we can add this to the next-samsung series.
 
> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
> ---
>  arch/arm/plat-samsung/clock-clksrc.c |   13 +++++++++----
>  1 files changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/plat-samsung/clock-clksrc.c b/arch/arm/plat-samsung/clock-clksrc.c
> index 33c633a..835921d 100644
> --- a/arch/arm/plat-samsung/clock-clksrc.c
> +++ b/arch/arm/plat-samsung/clock-clksrc.c
> @@ -129,11 +129,16 @@ void __init_or_cpufreq s3c_set_clksrc(struct clksrc_clk *clk, bool announce)
>  {
>  	struct clksrc_sources *srcs = clk->sources;
>  	u32 mask = bit_mask(clk->reg_src.shift, clk->reg_src.size);
> -	u32 clksrc = 0;
> -
> -	if (clk->reg_src.reg)
> -		clksrc = __raw_readl(clk->reg_src.reg);
> +	u32 clksrc;
>  
> +	if (!clk->reg_src.reg) {
> +		if (!clk->clk.parent)
> +		       printk(KERN_ERR "%s: no parent clock specified\n",
> +				clk->clk.name);
> + 		return;		
> +	}
> +	
> +	clksrc = __raw_readl(clk->reg_src.reg);
>  	clksrc &= mask;
>  	clksrc >>= clk->reg_src.shift;
>  
> -- 
> 1.6.3.3
> 

 
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.