Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bea5af41 authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: imx: move timer driver into drivers/clocksource 



After the cleanup on imx timer driver, now it's ready to be moved into
drivers/clocksource/.  Let's do it.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 2321f246

arch/arm/mach-imx/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ menuconfig ARCH_MXC 
	bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7

	select ARCH_REQUIRE_GPIOLIB

	select ARM_CPU_SUSPEND if PM

	select CLKSRC_MMIO

	select CLKSRC_IMX_GPT

	select GENERIC_IRQ_CHIP

	select PINCTRL

	select PM_OPP if PM

arch/arm/mach-imx/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-y := time.o cpu.o system.o irq-common.o

obj-y := cpu.o system.o irq-common.o



obj-$(CONFIG_SOC_IMX1) += mm-imx1.o

obj-$(CONFIG_SOC_IMX21) += mm-imx21.o

drivers/clocksource/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -258,4 +258,10 @@ config CLKSRC_PXA 
	help

	  This enables OST0 support available on PXA and SA-11x0

	  platforms.



config CLKSRC_IMX_GPT

	bool "Clocksource using i.MX GPT" if COMPILE_TEST

	depends on ARM && CLKDEV_LOOKUP

	select CLKSRC_MMIO



endmenu

drivers/clocksource/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -51,4 +51,5 @@ obj-$(CONFIG_ARCH_KEYSTONE) += timer-keystone.o 
obj-$(CONFIG_ARCH_INTEGRATOR_AP)	+= timer-integrator-ap.o

obj-$(CONFIG_CLKSRC_VERSATILE)		+= versatile.o

obj-$(CONFIG_CLKSRC_MIPS_GIC)		+= mips-gic-timer.o

obj-$(CONFIG_CLKSRC_IMX_GPT)		+= timer-imx-gpt.o

obj-$(CONFIG_ASM9260_TIMER)		+= asm9260_timer.o