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

Commit b53cdd03 authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Nicolas Ferre
Browse files

ARM: at91: time: move the system timer driver to drivers/clocksource 



Import at91rm9200_time.c from mach-at91 as timer-atmel-st.c. Further cleanup is
required to get rid of the mach-at91 headers.

Signed-off-by: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Acked-by: default avatarBoris Brezillon <boris.brezillon@free-electrons.com>
Acked-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent bbfc97e1

arch/arm/mach-at91/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ if SOC_SAM_V4_V5 
config SOC_AT91RM9200

	bool "AT91RM9200"

	select ATMEL_AIC_IRQ

	select ATMEL_ST

	select COMMON_CLK_AT91

	select CPU_ARM920T

	select GENERIC_CLOCKEVENTS

arch/arm/mach-at91/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ obj-y := soc.o 
obj-$(CONFIG_SOC_AT91SAM9)	+= sam9_smc.o



# CPU-specific support

obj-$(CONFIG_SOC_AT91RM9200)	+= at91rm9200.o at91rm9200_time.o

obj-$(CONFIG_SOC_AT91RM9200)	+= at91rm9200.o

obj-$(CONFIG_SOC_AT91SAM9)	+= at91sam9.o

obj-$(CONFIG_SOC_SAMA5)		+= sama5.o

drivers/clocksource/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -143,6 +143,10 @@ config ATMEL_PIT 
	select CLKSRC_OF if OF

	def_bool SOC_AT91SAM9 || SOC_SAMA5



config ATMEL_ST

	bool

	select CLKSRC_OF



config CLKSRC_METAG_GENERIC

	def_bool y if METAG

	help

drivers/clocksource/Makefile

+1 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_CLKSRC_OF)	+= clksrc-of.o

obj-$(CONFIG_ATMEL_PIT)		+= timer-atmel-pit.o

obj-$(CONFIG_ATMEL_ST)		+= timer-atmel-st.o

obj-$(CONFIG_ATMEL_TCB_CLKSRC)	+= tcb_clksrc.o

obj-$(CONFIG_X86_PM_TIMER)	+= acpi_pm.o

obj-$(CONFIG_SCx200HR_TIMER)	+= scx200_hrt.o