aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c24xx/mach-rx1950.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-rx1950.c')
-rw-r--r--arch/arm/mach-s3c24xx/mach-rx1950.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-rx1950.c b/arch/arm/mach-s3c24xx/mach-rx1950.c
index afb784e934c8..219454c93db4 100644
--- a/arch/arm/mach-s3c24xx/mach-rx1950.c
+++ b/arch/arm/mach-s3c24xx/mach-rx1950.c
@@ -710,6 +710,7 @@ static struct i2c_board_info rx1950_i2c_devices[] = {
710}; 710};
711 711
712static struct platform_device *rx1950_devices[] __initdata = { 712static struct platform_device *rx1950_devices[] __initdata = {
713 &s3c2410_device_dclk,
713 &s3c_device_lcd, 714 &s3c_device_lcd,
714 &s3c_device_wdt, 715 &s3c_device_wdt,
715 &s3c_device_i2c0, 716 &s3c_device_i2c0,
@@ -728,17 +729,21 @@ static struct platform_device *rx1950_devices[] __initdata = {
728 &rx1950_leds, 729 &rx1950_leds,
729}; 730};
730 731
732#ifdef CONFIG_SAMSUNG_CLOCK
731static struct clk *rx1950_clocks[] __initdata = { 733static struct clk *rx1950_clocks[] __initdata = {
732 &s3c24xx_clkout0, 734 &s3c24xx_clkout0,
733 &s3c24xx_clkout1, 735 &s3c24xx_clkout1,
734}; 736};
737#endif
735 738
736static void __init rx1950_map_io(void) 739static void __init rx1950_map_io(void)
737{ 740{
741#ifdef CONFIG_SAMSUNG_CLOCK
738 s3c24xx_clkout0.parent = &clk_h; 742 s3c24xx_clkout0.parent = &clk_h;
739 s3c24xx_clkout1.parent = &clk_f; 743 s3c24xx_clkout1.parent = &clk_f;
740 744
741 s3c24xx_register_clocks(rx1950_clocks, ARRAY_SIZE(rx1950_clocks)); 745 s3c24xx_register_clocks(rx1950_clocks, ARRAY_SIZE(rx1950_clocks));
746#endif
742 747
743 s3c24xx_init_io(rx1950_iodesc, ARRAY_SIZE(rx1950_iodesc)); 748 s3c24xx_init_io(rx1950_iodesc, ARRAY_SIZE(rx1950_iodesc));
744 s3c24xx_init_clocks(16934000); 749 s3c24xx_init_clocks(16934000);