diff options
| author | Arnd Bergmann | 2013-04-19 23:12:42 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2013-04-19 23:12:42 +0200 |
| commit | 22cf644e03419b4c3d002109b021c7482306f0bf (patch) | |
| tree | db426bcf5d4f7acfdbcaa5276b87d12cbb061fa1 /arch/arm/mach-s3c24xx/mach-mini2440.c | |
| parent | Linux 3.9-rc6 (diff) | |
| parent | ARM: exynos: restore mach/regs-clock.h for exynos5 (diff) | |
| download | kernel-qcow2-linux-22cf644e03419b4c3d002109b021c7482306f0bf.tar.gz kernel-qcow2-linux-22cf644e03419b4c3d002109b021c7482306f0bf.tar.xz kernel-qcow2-linux-22cf644e03419b4c3d002109b021c7482306f0bf.zip | |
Merge branch 'next/drivers' into late/multiplatform
Multiple parts of next/drivers are prerequisites for the final
exynos multiplatform changes, so let's pull in the entire branch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-mini2440.c')
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-mini2440.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-mini2440.c b/arch/arm/mach-s3c24xx/mach-mini2440.c index 2865e5919f2c..a83db46320bc 100644 --- a/arch/arm/mach-s3c24xx/mach-mini2440.c +++ b/arch/arm/mach-s3c24xx/mach-mini2440.c @@ -56,6 +56,7 @@ #include <plat/clock.h> #include <plat/devs.h> #include <plat/cpu.h> +#include <plat/samsung-time.h> #include <sound/s3c24xx_uda134x.h> @@ -525,6 +526,7 @@ static void __init mini2440_map_io(void) s3c24xx_init_io(mini2440_iodesc, ARRAY_SIZE(mini2440_iodesc)); s3c24xx_init_clocks(12000000); s3c24xx_init_uarts(mini2440_uartcfgs, ARRAY_SIZE(mini2440_uartcfgs)); + samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); } /* @@ -686,7 +688,7 @@ MACHINE_START(MINI2440, "MINI2440") .atag_offset = 0x100, .map_io = mini2440_map_io, .init_machine = mini2440_init, - .init_irq = s3c24xx_init_irq, - .init_time = s3c24xx_timer_init, + .init_irq = s3c2440_init_irq, + .init_time = samsung_timer_init, .restart = s3c244x_restart, MACHINE_END |