mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: linux@maxim.org.za, Nicolas Ferre <nicolas.ferre@atmel.com>,
	Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
	Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Boris Brezillon <boris@free-electrons.com>,
	Alexandre Belloni <alexandre.belloni@free-electrons.com>,
	Thomas Petazzoni <thomas@free-electrons.com>,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org,
	Maxime Ripard <maxime.ripard@free-electrons.com>
Subject: [PATCH v2 14/14] AT91: PIT: Move the driver to drivers/clocksource
Date: Tue,  1 Jul 2014 11:33:27 +0200	[thread overview]
Message-ID: <1404207208-14513-15-git-send-email-maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <1404207208-14513-1-git-send-email-maxime.ripard@free-electrons.com>

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: Maxime Ripard <maxime.ripard@free-electrons.com>
---
 arch/arm/mach-at91/Kconfig                                          | 6 ------
 arch/arm/mach-at91/Makefile                                         | 1 -
 drivers/clocksource/Kconfig                                         | 4 ++++
 drivers/clocksource/Makefile                                        | 1 +
 .../at91sam926x_time.c => drivers/clocksource/timer-atmel-pit.c     | 0
 5 files changed, 5 insertions(+), 7 deletions(-)
 rename arch/arm/mach-at91/at91sam926x_time.c => drivers/clocksource/timer-atmel-pit.c (100%)

diff --git a/arch/arm/mach-at91/Kconfig b/arch/arm/mach-at91/Kconfig
index a64412a020d3..1cd2a269ebbf 100644
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
@@ -36,16 +36,11 @@ config AT91_SAM9G45_RESET
 	bool
 	default !ARCH_AT91X40
 
-config AT91_SAM9_TIME
-	select CLKSRC_OF if OF
-	bool
-
 config HAVE_AT91_SMD
 	bool
 
 config SOC_AT91SAM9
 	bool
-	select AT91_SAM9_TIME
 	select CPU_ARM926T
 	select GENERIC_CLOCKEVENTS
 	select MULTI_IRQ_HANDLER
@@ -53,7 +48,6 @@ config SOC_AT91SAM9
 
 config SOC_SAMA5
 	bool
-	select AT91_SAM9_TIME
 	select CPU_V7
 	select GENERIC_CLOCKEVENTS
 	select MULTI_IRQ_HANDLER
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index 78e9cec282f4..1a916ececbfd 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -10,7 +10,6 @@ obj-		:=
 obj-$(CONFIG_OLD_CLK_AT91)	+= clock.o
 obj-$(CONFIG_AT91_SAM9_ALT_RESET) += at91sam9_alt_reset.o
 obj-$(CONFIG_AT91_SAM9G45_RESET) += at91sam9g45_reset.o
-obj-$(CONFIG_AT91_SAM9_TIME)	+= at91sam926x_time.o
 obj-$(CONFIG_SOC_AT91SAM9)	+= sam9_smc.o
 
 # CPU-specific support
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 065131cbfcc0..3e6fbfe7af5b 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -118,6 +118,10 @@ config CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
 	help
 	 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
 	def_bool y if METAG
 	help
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile
index 800b1303c236..98cf44e4b55a 100644
--- a/drivers/clocksource/Makefile
+++ b/drivers/clocksource/Makefile
@@ -1,4 +1,5 @@
 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_X86_PM_TIMER)	+= acpi_pm.o
 obj-$(CONFIG_SCx200HR_TIMER)	+= scx200_hrt.o
diff --git a/arch/arm/mach-at91/at91sam926x_time.c b/drivers/clocksource/timer-atmel-pit.c
similarity index 100%
rename from arch/arm/mach-at91/at91sam926x_time.c
rename to drivers/clocksource/timer-atmel-pit.c
-- 
2.0.0


  parent reply	other threads:[~2014-07-01  9:36 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-01  9:33 [PATCH v2 00/14] AT91: PIT: Cleanups and move " Maxime Ripard
2014-07-01  9:33 ` [PATCH v2 01/14] AT91: PIT: Follow the general coding rules Maxime Ripard
2014-07-01  9:33 ` [PATCH v2 02/14] AT91: generic.h: Add include safe guards Maxime Ripard
2014-07-01  9:33 ` [PATCH v2 03/14] AT91: PIT: Use DIV_ROUND_CLOSEST to compute the cycles Maxime Ripard
2014-07-01  9:33 ` [PATCH v2 04/14] AT91: PIT: Use of_have_populated_dt instead of CONFIG_OF Maxime Ripard
2014-07-01  9:33 ` [PATCH v2 05/14] AT91: PIT: Rework probe functions Maxime Ripard
2014-07-01  9:33 ` [PATCH v2 06/14] AT91: dt: Remove init_time definitions Maxime Ripard
2014-07-01  9:33 ` [PATCH v2 07/14] AT91: PIT: Use consistent exit path in probe Maxime Ripard
2014-07-01  9:33 ` [PATCH v2 08/14] AT91: PIT: Use pr_fmt Maxime Ripard
2014-07-01  9:33 ` [PATCH v2 09/14] AT91: PIT: use request_irq instead of setup_irq Maxime Ripard
2014-07-01  9:33 ` [PATCH v2 10/14] AT91: PIT: (Almost) remove the global variables Maxime Ripard
2014-07-01  9:33 ` [PATCH v2 11/14] AT91: soc: Add init_time callback Maxime Ripard
2014-07-01  9:33 ` [PATCH v2 12/14] AT91: Convert the boards to the " Maxime Ripard
2014-07-01  9:33 ` [PATCH v2 13/14] AT91: PIT: Convert to an early_platform_device Maxime Ripard
2014-07-01  9:33 ` Maxime Ripard [this message]
2014-07-01  9:52 ` [PATCH v2 00/14] AT91: PIT: Cleanups and move to drivers/clocksource Boris BREZILLON
2014-07-01 16:01 ` Alexandre Belloni
2014-07-10  7:51 ` Maxime Ripard
2014-07-17  9:50   ` Maxime Ripard
2014-07-17 10:31     ` Daniel Lezcano
2014-07-17 13:45       ` Maxime Ripard
2014-07-21  9:14 ` Daniel Lezcano

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=1404207208-14513-15-git-send-email-maxime.ripard@free-electrons.com \
    --to=maxime.ripard@free-electrons.com \
    --cc=alexandre.belloni@free-electrons.com \
    --cc=boris@free-electrons.com \
    --cc=daniel.lezcano@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux@maxim.org.za \
    --cc=nicolas.ferre@atmel.com \
    --cc=plagnioj@jcrosoft.com \
    --cc=thomas@free-electrons.com \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®