LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: Alexandre Belloni <alexandre.belloni@free-electrons.com>,
	Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>,
	Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Lee Jones <lee.jones@linaro.org>,
	Wim Van Sebroeck <wim@iguana.be>,
	Guenter Roeck <linux@roeck-us.net>,
	Sebastian Reichel <sre@kernel.org>,
	Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>,
	linux-kernel@vger.kernel.org,
	linux-arm-kernel@lists.infradead.org,
	linux-watchdog@vger.kernel.org, linux-pm@vger.kernel.org
Subject: Re: [PATCH v4 6/9] ARM: at91: time: move the system timer driver to drivers/clocksource
Date: Fri, 06 Mar 2015 09:36:01 +0100	[thread overview]
Message-ID: <54F966F1.4090900@linaro.org> (raw)
In-Reply-To: <1425570594-13124-7-git-send-email-alexandre.belloni@free-electrons.com>

On 03/05/2015 04:49 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@free-electrons.com>
> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>
> ---
>   arch/arm/mach-at91/Makefile                                           | 2 +-
>   drivers/clocksource/Kconfig                                           | 4 ++++
>   drivers/clocksource/Makefile                                          | 1 +
>   .../at91rm9200_time.c => drivers/clocksource/timer-atmel-st.c         | 0
>   4 files changed, 6 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/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..d1d15985a4ec 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
> +	select CLKSRC_OF if OF
> +	def_bool SOC_AT91RM9200
> +

H Alexandre,

the global policy is to enable the timer from the platform Kconfig.

So it should be:

config ATMEL_ST
	bool
	select CLKSRC_OF if OF

and change the mach's Kconfig to select this driver for the 
corresponding platform.

>   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


  parent reply	other threads:[~2015-03-06  8:36 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-03-05 15:49 [PATCH v4 0/9] Atmel System Timer cleanups Alexandre Belloni
2015-03-05 15:49 ` [PATCH v4 1/9] ARM: at91/dt: declare atmel,at91rm9200-st as a syscon Alexandre Belloni
2015-03-05 15:49 ` [PATCH v4 2/9] mfd: syscon: Add atmel system timer registers definition Alexandre Belloni
2015-03-06 10:58   ` Lee Jones
2015-03-05 15:49 ` [PATCH v4 3/9] watchdog: at91rm9200: use the system timer syscon Alexandre Belloni
2015-03-09 15:33   ` [v4,3/9] " Guenter Roeck
2015-03-05 15:49 ` [PATCH v4 4/9] power: reset: Add AT91RM9200 reset driver Alexandre Belloni
2015-03-05 19:49   ` Paul Bolle
2015-03-05 20:34     ` Alexandre Belloni
2015-03-05 15:49 ` [PATCH v4 5/9] ARM: at91: at91rm9200: remove deprecated arm_pm_restart Alexandre Belloni
2015-03-05 15:49 ` [PATCH v4 6/9] ARM: at91: time: move the system timer driver to drivers/clocksource Alexandre Belloni
2015-03-05 19:41   ` Paul Bolle
2015-03-05 19:47     ` Alexandre Belloni
2015-03-06  8:36   ` Daniel Lezcano [this message]
2015-03-05 15:49 ` [PATCH v4 7/9] clocksource: atmel-st: properly initialize driver Alexandre Belloni
2015-03-06  8:38   ` Daniel Lezcano
2015-03-05 15:49 ` [PATCH v4 8/9] clocksource: atmel-st: use syscon/regmap Alexandre Belloni
2015-03-06  8:43   ` Daniel Lezcano
2015-03-06  8:47     ` Alexandre Belloni
2015-03-09 11:13       ` Daniel Lezcano
2015-03-05 15:49 ` [PATCH v4 9/9] ARM: at91: remove useless include Alexandre Belloni

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=54F966F1.4090900@linaro.org \
    --to=daniel.lezcano@linaro.org \
    --cc=alexandre.belloni@free-electrons.com \
    --cc=boris.brezillon@free-electrons.com \
    --cc=dbaryshkov@gmail.com \
    --cc=lee.jones@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=linux-watchdog@vger.kernel.org \
    --cc=linux@roeck-us.net \
    --cc=nicolas.ferre@atmel.com \
    --cc=plagnioj@jcrosoft.com \
    --cc=sre@kernel.org \
    --cc=tglx@linutronix.de \
    --cc=wim@iguana.be \
    --subject='Re: [PATCH v4 6/9] ARM: at91: time: move the system timer driver to drivers/clocksource' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).