Commit d5c52922 authored by Matthieu Castet's avatar Matthieu Castet Committed by Ben Dooks

[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: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarMatthieu Castet <matthieu.castet@parrot.com>
parent 9c3871ca
...@@ -631,6 +631,17 @@ static struct clk_init clks_src[] __initdata = { ...@@ -631,6 +631,17 @@ static struct clk_init clks_src[] __initdata = {
.bit = S3C2412_CLKSRC_USBCLK_HCLK, .bit = S3C2412_CLKSRC_USBCLK_HCLK,
.src_0 = &clk_usysclk, .src_0 = &clk_usysclk,
.src_1 = &clk_h, .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) ...@@ -666,8 +677,6 @@ static void __init s3c2412_clk_initparents(void)
static struct clk *clks[] __initdata = { static struct clk *clks[] __initdata = {
&clk_ext, &clk_ext,
&clk_usb_bus, &clk_usb_bus,
&clk_erefclk,
&clk_urefclk,
&clk_mrefclk, &clk_mrefclk,
&clk_armclk, &clk_armclk,
}; };
......
...@@ -189,6 +189,8 @@ s3c2410_get_pll(unsigned int pllval, unsigned int baseclk) ...@@ -189,6 +189,8 @@ s3c2410_get_pll(unsigned int pllval, unsigned int baseclk)
#define S3C2412_CLKSRC_I2SCLK_MPLL (1<<9) #define S3C2412_CLKSRC_I2SCLK_MPLL (1<<9)
#define S3C2412_CLKSRC_USBCLK_HCLK (1<<10) #define S3C2412_CLKSRC_USBCLK_HCLK (1<<10)
#define S3C2412_CLKSRC_CAMCLK_HCLK (1<<11) #define S3C2412_CLKSRC_CAMCLK_HCLK (1<<11)
#define S3C2412_CLKSRC_UREFCLK_EXTCLK (1<<12)
#define S3C2412_CLKSRC_EREFCLK_EXTCLK (1<<14)
#endif /* CONFIG_CPU_S3C2412 | CONFIG_CPU_S3C2413 */ #endif /* CONFIG_CPU_S3C2412 | CONFIG_CPU_S3C2413 */
......
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