Commit b915a125 authored by Ben Dooks's avatar Ben Dooks

[ARM] S3C: Move time.c to arch/arm/plat-s3c

Move time.c to arch/arm/plat-s3c
to be shared with the S3C64XX implementations.
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 6af0e929
...@@ -12,3 +12,4 @@ obj- := ...@@ -12,3 +12,4 @@ obj- :=
# Core support for all Samsung SoCs # Core support for all Samsung SoCs
obj-y += init.o obj-y += init.o
obj-y += time.o
...@@ -144,7 +144,7 @@ static struct irqaction s3c2410_timer_irq = { ...@@ -144,7 +144,7 @@ static struct irqaction s3c2410_timer_irq = {
machine_is_bast() || \ machine_is_bast() || \
machine_is_vr1000() || \ machine_is_vr1000() || \
machine_is_anubis() || \ machine_is_anubis() || \
machine_is_osiris() ) machine_is_osiris())
/* /*
* Set up timer interrupt, and return the current time in seconds. * Set up timer interrupt, and return the current time in seconds.
...@@ -216,7 +216,7 @@ static void s3c2410_timer_setup (void) ...@@ -216,7 +216,7 @@ static void s3c2410_timer_setup (void)
tcnt--; tcnt--;
printk("timer tcon=%08lx, tcnt %04lx, tcfg %08lx,%08lx, usec %08lx\n", printk(KERN_DEBUG "timer tcon=%08lx, tcnt %04lx, tcfg %08lx,%08lx, usec %08lx\n",
tcon, tcnt, tcfg0, tcfg1, timer_usec_ticks); tcon, tcnt, tcfg0, tcfg1, timer_usec_ticks);
/* check to see if timer is within 16bit range... */ /* check to see if timer is within 16bit range... */
...@@ -247,7 +247,7 @@ static void s3c2410_timer_setup (void) ...@@ -247,7 +247,7 @@ static void s3c2410_timer_setup (void)
__raw_writel(tcon, S3C2410_TCON); __raw_writel(tcon, S3C2410_TCON);
} }
static void __init s3c2410_timer_init (void) static void __init s3c2410_timer_init(void)
{ {
s3c2410_timer_setup(); s3c2410_timer_setup();
setup_irq(IRQ_TIMER4, &s3c2410_timer_irq); setup_irq(IRQ_TIMER4, &s3c2410_timer_irq);
......
...@@ -17,7 +17,6 @@ obj-y += irq.o ...@@ -17,7 +17,6 @@ obj-y += irq.o
obj-y += devs.o obj-y += devs.o
obj-y += gpio.o obj-y += gpio.o
obj-y += gpiolib.o obj-y += gpiolib.o
obj-y += time.o
obj-y += clock.o obj-y += clock.o
obj-y += pwm-clock.o obj-y += pwm-clock.o
obj-$(CONFIG_S3C24XX_DCLK) += clock-dclk.o obj-$(CONFIG_S3C24XX_DCLK) += clock-dclk.o
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment