diff options
-rw-r--r-- | arch/arm/mach-s3c2412/clock.c | 13 | ||||
-rw-r--r-- | include/asm-arm/arch-s3c2410/regs-clock.h | 2 |
2 files changed, 13 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c2412/clock.c b/arch/arm/mach-s3c2412/clock.c index 2697a65ba727..1157b5a16263 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 | }; |
diff --git a/include/asm-arm/arch-s3c2410/regs-clock.h b/include/asm-arm/arch-s3c2410/regs-clock.h index ecae9e7f5e45..37661358b42b 100644 --- a/include/asm-arm/arch-s3c2410/regs-clock.h +++ b/include/asm-arm/arch-s3c2410/regs-clock.h | |||
@@ -189,6 +189,8 @@ s3c2410_get_pll(unsigned int pllval, unsigned int baseclk) | |||
189 | #define S3C2412_CLKSRC_I2SCLK_MPLL (1<<9) | 189 | #define S3C2412_CLKSRC_I2SCLK_MPLL (1<<9) |
190 | #define S3C2412_CLKSRC_USBCLK_HCLK (1<<10) | 190 | #define S3C2412_CLKSRC_USBCLK_HCLK (1<<10) |
191 | #define S3C2412_CLKSRC_CAMCLK_HCLK (1<<11) | 191 | #define S3C2412_CLKSRC_CAMCLK_HCLK (1<<11) |
192 | #define S3C2412_CLKSRC_UREFCLK_EXTCLK (1<<12) | ||
193 | #define S3C2412_CLKSRC_EREFCLK_EXTCLK (1<<14) | ||
192 | 194 | ||
193 | #endif /* CONFIG_CPU_S3C2412 | CONFIG_CPU_S3C2413 */ | 195 | #endif /* CONFIG_CPU_S3C2412 | CONFIG_CPU_S3C2413 */ |
194 | 196 | ||