diff options
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-n30.c')
| -rw-r--r-- | arch/arm/mach-s3c24xx/mach-n30.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-n30.c b/arch/arm/mach-s3c24xx/mach-n30.c index d9d04b240295..73a690f431e6 100644 --- a/arch/arm/mach-s3c24xx/mach-n30.c +++ b/arch/arm/mach-s3c24xx/mach-n30.c | |||
| @@ -48,8 +48,8 @@ | |||
| 48 | #include <plat/cpu.h> | 48 | #include <plat/cpu.h> |
| 49 | #include <plat/devs.h> | 49 | #include <plat/devs.h> |
| 50 | #include <linux/platform_data/mmc-s3cmci.h> | 50 | #include <linux/platform_data/mmc-s3cmci.h> |
| 51 | #include <plat/s3c2410.h> | ||
| 52 | #include <linux/platform_data/usb-s3c2410_udc.h> | 51 | #include <linux/platform_data/usb-s3c2410_udc.h> |
| 52 | #include <plat/samsung-time.h> | ||
| 53 | 53 | ||
| 54 | #include "common.h" | 54 | #include "common.h" |
| 55 | 55 | ||
| @@ -536,6 +536,7 @@ static void __init n30_map_io(void) | |||
| 536 | n30_hwinit(); | 536 | n30_hwinit(); |
| 537 | s3c24xx_init_clocks(0); | 537 | s3c24xx_init_clocks(0); |
| 538 | s3c24xx_init_uarts(n30_uartcfgs, ARRAY_SIZE(n30_uartcfgs)); | 538 | s3c24xx_init_uarts(n30_uartcfgs, ARRAY_SIZE(n30_uartcfgs)); |
| 539 | samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4); | ||
| 539 | } | 540 | } |
| 540 | 541 | ||
| 541 | /* GPB3 is the line that controls the pull-up for the USB D+ line */ | 542 | /* GPB3 is the line that controls the pull-up for the USB D+ line */ |
| @@ -589,7 +590,7 @@ MACHINE_START(N30, "Acer-N30") | |||
| 589 | Ben Dooks <ben-linux@fluff.org> | 590 | Ben Dooks <ben-linux@fluff.org> |
| 590 | */ | 591 | */ |
| 591 | .atag_offset = 0x100, | 592 | .atag_offset = 0x100, |
| 592 | .init_time = s3c24xx_timer_init, | 593 | .init_time = samsung_timer_init, |
| 593 | .init_machine = n30_init, | 594 | .init_machine = n30_init, |
| 594 | .init_irq = s3c24xx_init_irq, | 595 | .init_irq = s3c24xx_init_irq, |
| 595 | .map_io = n30_map_io, | 596 | .map_io = n30_map_io, |
| @@ -600,7 +601,7 @@ MACHINE_START(N35, "Acer-N35") | |||
| 600 | /* Maintainer: Christer Weinigel <christer@weinigel.se> | 601 | /* Maintainer: Christer Weinigel <christer@weinigel.se> |
| 601 | */ | 602 | */ |
| 602 | .atag_offset = 0x100, | 603 | .atag_offset = 0x100, |
| 603 | .init_time = s3c24xx_timer_init, | 604 | .init_time = samsung_timer_init, |
| 604 | .init_machine = n30_init, | 605 | .init_machine = n30_init, |
| 605 | .init_irq = s3c24xx_init_irq, | 606 | .init_irq = s3c24xx_init_irq, |
| 606 | .map_io = n30_map_io, | 607 | .map_io = n30_map_io, |
