diff options
author | Kukjin Kim | 2014-05-25 22:20:25 +0200 |
---|---|---|
committer | Kukjin Kim | 2014-05-25 22:20:25 +0200 |
commit | 985326c9f65a4c1a3b5ab875e6ce0c97c39449ec (patch) | |
tree | ad32fb4216bea6dd39d0f05d246f354e1dc00bcc /arch/arm/mach-s3c24xx/mach-rx1950.c | |
parent | ARM: EXYNOS: Add MCPM call-back functions (diff) | |
parent | clk: exynos5420: Add 5800 specific clocks (diff) | |
download | kernel-qcow2-linux-985326c9f65a4c1a3b5ab875e6ce0c97c39449ec.tar.gz kernel-qcow2-linux-985326c9f65a4c1a3b5ab875e6ce0c97c39449ec.tar.xz kernel-qcow2-linux-985326c9f65a4c1a3b5ab875e6ce0c97c39449ec.zip |
Merge branch 'v3.16-next/clk-samsung' into v3.16-next/cpuidle-exynos
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-rx1950.c')
-rw-r--r-- | arch/arm/mach-s3c24xx/mach-rx1950.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-rx1950.c b/arch/arm/mach-s3c24xx/mach-rx1950.c index afb784e934c8..e2c6541909c1 100644 --- a/arch/arm/mach-s3c24xx/mach-rx1950.c +++ b/arch/arm/mach-s3c24xx/mach-rx1950.c @@ -54,7 +54,6 @@ #include <mach/regs-lcd.h> #include <mach/gpio-samsung.h> -#include <plat/clock.h> #include <plat/cpu.h> #include <plat/devs.h> #include <plat/pm.h> @@ -710,6 +709,7 @@ static struct i2c_board_info rx1950_i2c_devices[] = { }; static struct platform_device *rx1950_devices[] __initdata = { + &s3c2410_device_dclk, &s3c_device_lcd, &s3c_device_wdt, &s3c_device_i2c0, @@ -728,20 +728,9 @@ static struct platform_device *rx1950_devices[] __initdata = { &rx1950_leds, }; -static struct clk *rx1950_clocks[] __initdata = { - &s3c24xx_clkout0, - &s3c24xx_clkout1, -}; - static void __init rx1950_map_io(void) { - s3c24xx_clkout0.parent = &clk_h; - s3c24xx_clkout1.parent = &clk_f; - - s3c24xx_register_clocks(rx1950_clocks, ARRAY_SIZE(rx1950_clocks)); - s3c24xx_init_io(rx1950_iodesc, ARRAY_SIZE(rx1950_iodesc)); - s3c24xx_init_clocks(16934000); s3c24xx_init_uarts(rx1950_uartcfgs, ARRAY_SIZE(rx1950_uartcfgs)); samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); @@ -754,6 +743,12 @@ static void __init rx1950_map_io(void) s3c_pm_init(); } +static void __init rx1950_init_time(void) +{ + s3c2442_init_clocks(16934000); + samsung_timer_init(); +} + static void __init rx1950_init_machine(void) { int i; @@ -816,6 +811,6 @@ MACHINE_START(RX1950, "HP iPAQ RX1950") .reserve = rx1950_reserve, .init_irq = s3c2442_init_irq, .init_machine = rx1950_init_machine, - .init_time = samsung_timer_init, + .init_time = rx1950_init_time, .restart = s3c244x_restart, MACHINE_END |