aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c24xx/mach-n30.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-s3c24xx/mach-n30.c')
-rw-r--r--arch/arm/mach-s3c24xx/mach-n30.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c24xx/mach-n30.c b/arch/arm/mach-s3c24xx/mach-n30.c
index 8017c0fc1729..73a690f431e6 100644
--- a/arch/arm/mach-s3c24xx/mach-n30.c
+++ b/arch/arm/mach-s3c24xx/mach-n30.c
@@ -49,6 +49,7 @@
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 <linux/platform_data/usb-s3c2410_udc.h> 51#include <linux/platform_data/usb-s3c2410_udc.h>
52#include <plat/samsung-time.h>
52 53
53#include "common.h" 54#include "common.h"
54 55
@@ -535,6 +536,7 @@ static void __init n30_map_io(void)
535 n30_hwinit(); 536 n30_hwinit();
536 s3c24xx_init_clocks(0); 537 s3c24xx_init_clocks(0);
537 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);
538} 540}
539 541
540/* 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 */
@@ -588,7 +590,7 @@ MACHINE_START(N30, "Acer-N30")
588 Ben Dooks <ben-linux@fluff.org> 590 Ben Dooks <ben-linux@fluff.org>
589 */ 591 */
590 .atag_offset = 0x100, 592 .atag_offset = 0x100,
591 .init_time = s3c24xx_timer_init, 593 .init_time = samsung_timer_init,
592 .init_machine = n30_init, 594 .init_machine = n30_init,
593 .init_irq = s3c24xx_init_irq, 595 .init_irq = s3c24xx_init_irq,
594 .map_io = n30_map_io, 596 .map_io = n30_map_io,
@@ -599,7 +601,7 @@ MACHINE_START(N35, "Acer-N35")
599 /* Maintainer: Christer Weinigel <christer@weinigel.se> 601 /* Maintainer: Christer Weinigel <christer@weinigel.se>
600 */ 602 */
601 .atag_offset = 0x100, 603 .atag_offset = 0x100,
602 .init_time = s3c24xx_timer_init, 604 .init_time = samsung_timer_init,
603 .init_machine = n30_init, 605 .init_machine = n30_init,
604 .init_irq = s3c24xx_init_irq, 606 .init_irq = s3c24xx_init_irq,
605 .map_io = n30_map_io, 607 .map_io = n30_map_io,