Commit 7359036d authored by Ben Dooks's avatar Ben Dooks Committed by Russell King

[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: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 13011d08
...@@ -367,6 +367,8 @@ static int s3c24xx_clkout_setparent(struct clk *clk, struct clk *parent) ...@@ -367,6 +367,8 @@ static int s3c24xx_clkout_setparent(struct clk *clk, struct clk *parent)
source = S3C2410_MISCCR_CLK0_UPLL; source = S3C2410_MISCCR_CLK0_UPLL;
else if (parent == &clk_f) else if (parent == &clk_f)
source = S3C2410_MISCCR_CLK0_FCLK; source = S3C2410_MISCCR_CLK0_FCLK;
else if (parent == &clk_h)
source = S3C2410_MISCCR_CLK0_HCLK;
else if (parent == &clk_p) else if (parent == &clk_p)
source = S3C2410_MISCCR_CLK0_PCLK; source = S3C2410_MISCCR_CLK0_PCLK;
else if (clk == &s3c24xx_clkout0 && parent == &s3c24xx_dclk0) else if (clk == &s3c24xx_clkout0 && parent == &s3c24xx_dclk0)
...@@ -376,6 +378,8 @@ static int s3c24xx_clkout_setparent(struct clk *clk, struct clk *parent) ...@@ -376,6 +378,8 @@ static int s3c24xx_clkout_setparent(struct clk *clk, struct clk *parent)
else else
return -EINVAL; return -EINVAL;
clk->parent = parent;
if (clk == &s3c24xx_dclk0) if (clk == &s3c24xx_dclk0)
mask = S3C2410_MISCCR_CLK0_MASK; mask = S3C2410_MISCCR_CLK0_MASK;
else { else {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment