summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s3c2412
diff options
context:
space:
mode:
authorMatthieu Castet <matthieu.castet@parrot.com>2008-07-03 11:24:45 +0100
committerBen Dooks <ben-linux@fluff.org>2008-07-03 16:51:30 +0100
commitd5c52922b618aa6ddd6b5ebebc8d0a5ec9a20f10 (patch)
tree11c0d1e2a1659cac4ae74d0bd95ee368744abab1 /arch/arm/mach-s3c2412
parent9c3871ca59884563e3f41669a330c9231952643b (diff)
downloadlinux-3.10-d5c52922b618aa6ddd6b5ebebc8d0a5ec9a20f10.tar.gz
linux-3.10-d5c52922b618aa6ddd6b5ebebc8d0a5ec9a20f10.tar.bz2
linux-3.10-d5c52922b618aa6ddd6b5ebebc8d0a5ec9a20f10.zip
[ARM] S3C2412: Correct parents for EREFCLK and UREFCLK
For s3c2412, set parent for clk_erefclk and clk_urefclk. This allow for example to use xtal or extclk for i2s clock. Signed-off-by: Ben Dooks <ben-linux@fluff.org> Signed-off-by: Matthieu Castet <matthieu.castet@parrot.com>
Diffstat (limited to 'arch/arm/mach-s3c2412')
-rw-r--r--arch/arm/mach-s3c2412/clock.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2412/clock.c b/arch/arm/mach-s3c2412/clock.c
index 2697a65ba72..1157b5a1626 100644
--- a/arch/arm/mach-s3c2412/clock.c
+++ b/arch/arm/mach-s3c2412/clock.c
@@ -631,6 +631,17 @@ static struct clk_init clks_src[] __initdata = {
.bit = S3C2412_CLKSRC_USBCLK_HCLK,
.src_0 = &clk_usysclk,
.src_1 = &clk_h,
+ /* here we assume OM[4] select xtal */
+ }, {
+ .clk = &clk_erefclk,
+ .bit = S3C2412_CLKSRC_EREFCLK_EXTCLK,
+ .src_0 = &clk_xtal,
+ .src_1 = &clk_ext,
+ }, {
+ .clk = &clk_urefclk,
+ .bit = S3C2412_CLKSRC_UREFCLK_EXTCLK,
+ .src_0 = &clk_xtal,
+ .src_1 = &clk_ext,
},
};
@@ -666,8 +677,6 @@ static void __init s3c2412_clk_initparents(void)
static struct clk *clks[] __initdata = {
&clk_ext,
&clk_usb_bus,
- &clk_erefclk,
- &clk_urefclk,
&clk_mrefclk,
&clk_armclk,
};