diff options
| author | Ben Dooks <ben-linux@fluff.org> | 2006-04-09 22:21:10 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-04-09 22:21:10 +0100 |
| commit | 7359036d5cdb86d14cfeb06d0e5a1d68f85cf8b7 (patch) | |
| tree | 0aa7b2592a39865656b1157af170d28dda98af1d /arch/arm | |
| parent | 13011d08346d9d649119cc6ef519209c6f33f1e8 (diff) | |
| download | linux-3.10-7359036d5cdb86d14cfeb06d0e5a1d68f85cf8b7.tar.gz linux-3.10-7359036d5cdb86d14cfeb06d0e5a1d68f85cf8b7.tar.bz2 linux-3.10-7359036d5cdb86d14cfeb06d0e5a1d68f85cf8b7.zip | |
[ARM] 3469/1: S3C24XX: clkout missing hclk selector
Patch from Ben Dooks
The clkout0/1 output parent code is missing the
HCLK option, and does not set clk->parent field
after updating the clock field
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-s3c2410/clock.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/clock.c b/arch/arm/mach-s3c2410/clock.c index b7f85e6d6b7..6de713ad319 100644 --- a/arch/arm/mach-s3c2410/clock.c +++ b/arch/arm/mach-s3c2410/clock.c @@ -367,6 +367,8 @@ static int s3c24xx_clkout_setparent(struct clk *clk, struct clk *parent) source = S3C2410_MISCCR_CLK0_UPLL; else if (parent == &clk_f) source = S3C2410_MISCCR_CLK0_FCLK; + else if (parent == &clk_h) + source = S3C2410_MISCCR_CLK0_HCLK; else if (parent == &clk_p) source = S3C2410_MISCCR_CLK0_PCLK; else if (clk == &s3c24xx_clkout0 && parent == &s3c24xx_dclk0) @@ -376,6 +378,8 @@ static int s3c24xx_clkout_setparent(struct clk *clk, struct clk *parent) else return -EINVAL; + clk->parent = parent; + if (clk == &s3c24xx_dclk0) mask = S3C2410_MISCCR_CLK0_MASK; else { |