diff options
author | Thomas Abraham <thomas.ab@samsung.com> | 2010-01-18 06:30:16 +0100 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-01-18 07:28:37 +0100 |
commit | b8792dbff6ed93c5a77f71917d4a0c5efa12eee1 (patch) | |
tree | 4c72869f4868043b559d2f8dc38151faf3adc9f0 | |
parent | ARM: S5PC1XX: Register pd0 and hd0 clocks, remove unecessary dummy_enable (diff) | |
download | linux-b8792dbff6ed93c5a77f71917d4a0c5efa12eee1.tar.xz linux-b8792dbff6ed93c5a77f71917d4a0c5efa12eee1.zip |
ARM: SAMSUNG: Add check to ensure that clksrc_clk does have multiple clock sources
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.
Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
-rw-r--r-- | arch/arm/plat-samsung/clock-clksrc.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/arch/arm/plat-samsung/clock-clksrc.c b/arch/arm/plat-samsung/clock-clksrc.c index 33c633a8be8d..98c6b8859f49 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; + u32 clksrc; - if (clk->reg_src.reg) - clksrc = __raw_readl(clk->reg_src.reg); + 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; |