Commit af04aa85 authored by Keerthy's avatar Keerthy Committed by Tony Lindgren
Browse files

ARM: OMAP: Move dmtimer driver out of plat-omap to drivers under clocksource 



Move the dmtimer driver out of plat-omap to clocksource.
So that non-omap devices also could use this.

No Code changes done to the driver file only renamed to timer-ti-dm.c.
Also removed the config dependencies for OMAP_DM_TIMER.

Signed-off-by: default avatarKeerthy <j-keerthy@ti.com>
Reviewed-by: default avatarSebastian Reichel <sebastian.reichel@collabora.co.uk>
Tested-by: default avatarLadislav Michl <ladis@linux-mips.org>
[tony@atomide.com: add select omap_dm_timer for omap16xx]
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent f7bda9ee

arch/arm/mach-omap1/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ config ARCH_OMAP16XX 
	bool "OMAP16xx Based System"

	select ARCH_OMAP_OTG

	select CPU_ARM926T

	select OMAP_DM_TIMER



config OMAP_MUX

	bool "OMAP multiplexing support"

arch/arm/plat-omap/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -106,12 +106,6 @@ config OMAP3_L2_AUX_SECURE_SERVICE_SET_ID 
	help

	  PPA routine service ID for setting L2 auxiliary control register.



config OMAP_DM_TIMER

	bool "Use dual-mode timer"

	depends on ARCH_OMAP16XX || ARCH_OMAP2PLUS

	help

	 Select this option if you want to use OMAP Dual-Mode timers.



config OMAP_SERIAL_WAKE

	bool "Enable wake-up events for serial ports"

	depends on ARCH_OMAP1 && OMAP_MUX

arch/arm/plat-omap/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -9,5 +9,4 @@ obj-y := sram.o dma.o counter_32k.o 


# omap_device support (OMAP2+ only at the moment)



obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o

obj-$(CONFIG_OMAP_DEBUG_LEDS) += debug-leds.o

drivers/clocksource/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -21,6 +21,9 @@ config CLKEVT_I8253 
config I8253_LOCK

	bool



config OMAP_DM_TIMER

	bool



config CLKBLD_I8253

	def_bool y if CLKSRC_I8253 || CLKEVT_I8253 || I8253_LOCK

drivers/clocksource/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ obj-$(CONFIG_EM_TIMER_STI) += em_sti.o 
obj-$(CONFIG_CLKBLD_I8253)	+= i8253.o

obj-$(CONFIG_CLKSRC_MMIO)	+= mmio.o

obj-$(CONFIG_DIGICOLOR_TIMER)	+= timer-digicolor.o

obj-$(CONFIG_OMAP_DM_TIMER)	+= timer-ti-dm.o

obj-$(CONFIG_DW_APB_TIMER)	+= dw_apb_timer.o

obj-$(CONFIG_DW_APB_TIMER_OF)	+= dw_apb_timer_of.o

obj-$(CONFIG_FTTMR010_TIMER)	+= timer-fttmr010.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE