diff options
author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 01:44:51 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 01:44:51 -0400 |
commit | 43d2548bb2ef7e6d753f91468a746784041e522d (patch) | |
tree | 77d13fcd48fd998393abb825ec36e2b732684a73 /arch/arm/mach-s3c2412/clock.c | |
parent | 585583d95c5660973bc0cf64add517b040acd8a4 (diff) | |
parent | 85082fd7cbe3173198aac0eb5e85ab1edcc6352c (diff) |
Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build
Manual fixup of:
arch/powerpc/Kconfig
Diffstat (limited to 'arch/arm/mach-s3c2412/clock.c')
-rw-r--r-- | arch/arm/mach-s3c2412/clock.c | 13 |
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 = { | |||
631 | .bit = S3C2412_CLKSRC_USBCLK_HCLK, | 631 | .bit = S3C2412_CLKSRC_USBCLK_HCLK, |
632 | .src_0 = &clk_usysclk, | 632 | .src_0 = &clk_usysclk, |
633 | .src_1 = &clk_h, | 633 | .src_1 = &clk_h, |
634 | /* here we assume OM[4] select xtal */ | ||
635 | }, { | ||
636 | .clk = &clk_erefclk, | ||
637 | .bit = S3C2412_CLKSRC_EREFCLK_EXTCLK, | ||
638 | .src_0 = &clk_xtal, | ||
639 | .src_1 = &clk_ext, | ||
640 | }, { | ||
641 | .clk = &clk_urefclk, | ||
642 | .bit = S3C2412_CLKSRC_UREFCLK_EXTCLK, | ||
643 | .src_0 = &clk_xtal, | ||
644 | .src_1 = &clk_ext, | ||
634 | }, | 645 | }, |
635 | }; | 646 | }; |
636 | 647 | ||
@@ -666,8 +677,6 @@ static void __init s3c2412_clk_initparents(void) | |||
666 | static struct clk *clks[] __initdata = { | 677 | static struct clk *clks[] __initdata = { |
667 | &clk_ext, | 678 | &clk_ext, |
668 | &clk_usb_bus, | 679 | &clk_usb_bus, |
669 | &clk_erefclk, | ||
670 | &clk_urefclk, | ||
671 | &clk_mrefclk, | 680 | &clk_mrefclk, |
672 | &clk_armclk, | 681 | &clk_armclk, |
673 | }; | 682 | }; |