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

Commit b052ff30 authored by Maxime Ripard's avatar Maxime Ripard Committed by Nicolas Ferre
Browse files

ARM: at91: PIT: Move the driver to drivers/clocksource 



Now that we don't depend on anyting in the mach-at91 directory, we can just
move the driver to where it belongs.

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

Conflicts:
	arch/arm/mach-at91/Kconfig
	arch/arm/mach-at91/Makefile
parent 7d80335e

arch/arm/mach-at91/Kconfig

+0 −6
Original line number Original line Diff line number Diff line
@@ -33,16 +33,11 @@ config OLD_IRQ_AT91 
	select MULTI_IRQ_HANDLER

	select MULTI_IRQ_HANDLER

	select SPARSE_IRQ

	select SPARSE_IRQ





config AT91_SAM9_TIME

	select CLKSRC_OF if OF

	bool



config HAVE_AT91_SMD

config HAVE_AT91_SMD

	bool

	bool





config SOC_AT91SAM9

config SOC_AT91SAM9

	bool

	bool

	select AT91_SAM9_TIME

	select ATMEL_AIC_IRQ if !OLD_IRQ_AT91

	select ATMEL_AIC_IRQ if !OLD_IRQ_AT91

	select CPU_ARM926T

	select CPU_ARM926T

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS
@@ -51,7 +46,6 @@ config SOC_AT91SAM9 




config SOC_SAMA5

config SOC_SAMA5

	bool

	bool

	select AT91_SAM9_TIME

	select ATMEL_AIC5_IRQ

	select ATMEL_AIC5_IRQ

	select CPU_V7

	select CPU_V7

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS

arch/arm/mach-at91/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -9,7 +9,6 @@ obj- := 




obj-$(CONFIG_OLD_IRQ_AT91)	+= irq.o

obj-$(CONFIG_OLD_IRQ_AT91)	+= irq.o

obj-$(CONFIG_OLD_CLK_AT91)	+= clock.o

obj-$(CONFIG_OLD_CLK_AT91)	+= clock.o

obj-$(CONFIG_AT91_SAM9_TIME)	+= at91sam926x_time.o

obj-$(CONFIG_SOC_AT91SAM9)	+= sam9_smc.o

obj-$(CONFIG_SOC_AT91SAM9)	+= sam9_smc.o





# CPU-specific support

# CPU-specific support

drivers/clocksource/Kconfig

+4 −0
Original line number Original line Diff line number Diff line
@@ -120,6 +120,10 @@ config CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK 
	help

	help

	 Use ARM global timer clock source as sched_clock

	 Use ARM global timer clock source as sched_clock





config ATMEL_PIT

	select CLKSRC_OF if OF

	def_bool SOC_AT91SAM9 || SOC_SAMA5



config CLKSRC_METAG_GENERIC

config CLKSRC_METAG_GENERIC

	def_bool y if METAG

	def_bool y if METAG

	help

	help

drivers/clocksource/Makefile

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

obj-$(CONFIG_CLKSRC_OF)	+= clksrc-of.o

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

obj-$(CONFIG_ATMEL_TCB_CLKSRC)	+= tcb_clksrc.o

obj-$(CONFIG_ATMEL_TCB_CLKSRC)	+= tcb_clksrc.o

obj-$(CONFIG_X86_PM_TIMER)	+= acpi_pm.o

obj-$(CONFIG_X86_PM_TIMER)	+= acpi_pm.o

obj-$(CONFIG_SCx200HR_TIMER)	+= scx200_hrt.o

obj-$(CONFIG_SCx200HR_TIMER)	+= scx200_hrt.o