summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xarch/arm/plat-mxc/Makefile4
-rw-r--r--arch/arm/plat-mxc/pit.c6
2 files changed, 9 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/Makefile b/arch/arm/plat-mxc/Makefile
index e2abb624f9d1..238788df23da 100755
--- a/arch/arm/plat-mxc/Makefile
+++ b/arch/arm/plat-mxc/Makefile
@@ -3,12 +3,14 @@
#
# Common support
-obj-y := clock.o time.o devices.o cpu.o system.o irq-common.o usb_common.o usb_wakeup.o
+#obj-y := clock.o time.o devices.o cpu.o system.o irq-common.o usb_common.o usb_wakeup.o
+obj-y := clock.o devices.o cpu.o system.o irq-common.o usb_common.o usb_wakeup.o
ifdef CONFIG_ARCH_MVF
obj-y += gpio-mvf.o
else
obj-y += gpio.o
+obj-y += time.o
endif
# MX51 uses the TZIC interrupt controller, older platforms use AVIC
diff --git a/arch/arm/plat-mxc/pit.c b/arch/arm/plat-mxc/pit.c
index ba71bda51c06..e82cca9d06ea 100644
--- a/arch/arm/plat-mxc/pit.c
+++ b/arch/arm/plat-mxc/pit.c
@@ -90,6 +90,12 @@ static cycle_t pit_read_clk(struct clocksource *cs);
static DEFINE_CLOCK_DATA(cd);
static void __iomem *sched_clock_reg;
+unsigned long long notrace sched_clock(void)
+{
+ cycle_t cyc = sched_clock_reg ? ((u32)~0
+ - __raw_readl(sched_clock_reg)) : 0;
+ return cyc_to_sched_clock(&cd, cyc, (u32)~0);
+}
static void notrace mvf_update_sched_clock(void)
{