Hi Ben,
On Mon, Jan 18, 2010 at 12:21 PM, Ben Dooks <ben-linux@xxxxxxxxx> wrote:
> 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...
Ok. I will remove 'This patch' phrase from the description and resend the patch.
>
> 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.
It is fine to add this to next-samsung. This patch is required for
V210 patch series.
>
>> Signed-off-by: Thomas Abraham <thomas.ab@xxxxxxxxxxx>
>> ---
>> 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.
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
