[PATCH v5 07/10] ARM: at91: time: move the system timer driver to drivers/clocksource

[Daniel Lezcano]

On 03/12/2015 01:07 PM, Alexandre Belloni wrote:
> 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: Alexandre Belloni <alexandre.belloni at free-electrons.com>
> Acked-by: Boris Brezillon <boris.brezillon at free-electrons.com>

It would have make more sense to remove the mach headers first and then 
move the code in the clocksource directory, but anyway ... :)

Acked-by: Daniel Lezcano <daniel.lezcano at linaro.org>

> ---
>   arch/arm/mach-at91/Kconfig                                            | 1 +
>   arch/arm/mach-at91/Makefile                                           | 2 +-
>   drivers/clocksource/Kconfig                                           | 4 ++++
>   drivers/clocksource/Makefile                                          | 1 +
>   .../at91rm9200_time.c => drivers/clocksource/timer-atmel-st.c         | 0
>   5 files changed, 7 insertions(+), 1 deletion(-)
>   rename arch/arm/mach-at91/at91rm9200_time.c => drivers/clocksource/timer-atmel-st.c (100%)
>
> diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
> index c74a44324e5b..dabce086fa47 100644
> --- a/arch/arm/mach-at91/Kconfig
> +++ b/arch/arm/mach-at91/Kconfig
> @@ -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
> diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
> index 827fdbcce1c7..963c29169242 100644
> --- a/arch/arm/mach-at91/Makefile
> +++ b/arch/arm/mach-at91/Makefile
> @@ -7,7 +7,7 @@ obj-y		:= setup.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
>
> diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
> index 1c2506f68122..6c45f504baff 100644
> --- a/drivers/clocksource/Kconfig
> +++ b/drivers/clocksource/Kconfig
> @@ -138,6 +138,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
> diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
> index 752d5c70b0ef..5b85f6adb258 100644
> --- a/drivers/clocksource/Makefile
> +++ b/drivers/clocksource/Makefile
> @@ -1,5 +1,6 @@
>   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
> diff --git a/arch/arm/mach-at91/at91rm9200_time.c b/drivers/clocksource/timer-atmel-st.c
> similarity index 100%
> rename from arch/arm/mach-at91/at91rm9200_time.c
> rename to drivers/clocksource/timer-atmel-st.c
>


-- 
  <http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro:  <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog