From: Alexandre Belloni <alexandre.belloni@free-electrons.com> To: Nicolas Ferre <nicolas.ferre@atmel.com>, Daniel Lezcano <daniel.lezcano@linaro.org> Cc: Boris Brezillon <boris.brezillon@free-electrons.com>, Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>, Wim Van Sebroeck <wim@iguana.be>, Guenter Roeck <linux@roeck-us.net>, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-watchdog@vger.kernel.org, Alexandre Belloni <alexandre.belloni@free-electrons.com> Subject: [PATCH v5 07/10] ARM: at91: time: move the system timer driver to drivers/clocksource Date: Thu, 12 Mar 2015 13:07:31 +0100 [thread overview] Message-ID: <1426162054-9987-8-git-send-email-alexandre.belloni@free-electrons.com> (raw) In-Reply-To: <1426162054-9987-1-git-send-email-alexandre.belloni@free-electrons.com> 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/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 -- 2.1.0
WARNING: multiple messages have this Message-ID (diff)
From: alexandre.belloni@free-electrons.com (Alexandre Belloni) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v5 07/10] ARM: at91: time: move the system timer driver to drivers/clocksource Date: Thu, 12 Mar 2015 13:07:31 +0100 [thread overview] Message-ID: <1426162054-9987-8-git-send-email-alexandre.belloni@free-electrons.com> (raw) In-Reply-To: <1426162054-9987-1-git-send-email-alexandre.belloni@free-electrons.com> 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/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 -- 2.1.0
next prev parent reply other threads:[~2015-03-12 12:09 UTC|newest] Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top 2015-03-12 12:07 [PATCH v5 00/10] Atmel System Timer cleanups Alexandre Belloni 2015-03-12 12:07 ` Alexandre Belloni 2015-03-12 12:07 ` [PATCH v5 01/10] ARM: at91/dt: declare atmel,at91rm9200-st as a syscon Alexandre Belloni 2015-03-12 12:07 ` [PATCH v5 01/10] ARM: at91/dt: declare atmel, at91rm9200-st " Alexandre Belloni 2015-03-12 12:07 ` [PATCH v5 02/10] mfd: syscon: Add atmel system timer registers definition Alexandre Belloni 2015-03-12 12:07 ` Alexandre Belloni 2015-03-13 8:03 ` Lee Jones 2015-03-13 8:03 ` Lee Jones 2015-03-13 8:03 ` Lee Jones 2015-03-13 10:40 ` Alexandre Belloni 2015-03-13 10:40 ` Alexandre Belloni 2015-03-13 16:52 ` Nicolas Ferre 2015-03-13 16:52 ` Nicolas Ferre 2015-03-13 16:52 ` Nicolas Ferre 2015-03-16 8:17 ` Lee Jones 2015-03-16 8:17 ` Lee Jones 2015-03-16 8:17 ` Lee Jones 2015-03-12 12:07 ` [PATCH v5 03/10] watchdog: at91rm9200: use the system timer syscon Alexandre Belloni 2015-03-12 12:07 ` Alexandre Belloni 2015-03-12 16:19 ` Guenter Roeck 2015-03-12 16:19 ` Guenter Roeck 2015-03-12 12:07 ` [PATCH v5 04/10] watchdog: at91rm9200: implement restart handler Alexandre Belloni 2015-03-12 12:07 ` Alexandre Belloni 2015-03-12 16:22 ` Guenter Roeck 2015-03-12 16:22 ` Guenter Roeck 2015-03-12 12:07 ` [PATCH v5 05/10] ARM: at91: at91rm9200: remove deprecated arm_pm_restart Alexandre Belloni 2015-03-12 12:07 ` Alexandre Belloni 2015-03-12 12:07 ` [PATCH v5 06/10] ARM: at91: properly initialize timer Alexandre Belloni 2015-03-12 12:07 ` Alexandre Belloni 2015-03-12 12:07 ` Alexandre Belloni [this message] 2015-03-12 12:07 ` [PATCH v5 07/10] ARM: at91: time: move the system timer driver to drivers/clocksource Alexandre Belloni 2015-03-13 10:14 ` Daniel Lezcano 2015-03-13 10:14 ` Daniel Lezcano 2015-03-13 10:14 ` Daniel Lezcano 2015-03-12 12:07 ` [PATCH v5 08/10] clocksource: atmel-st: use syscon/regmap Alexandre Belloni 2015-03-12 12:07 ` Alexandre Belloni 2015-03-13 10:17 ` Daniel Lezcano 2015-03-13 10:17 ` Daniel Lezcano 2015-03-13 10:17 ` Daniel Lezcano 2015-03-12 12:07 ` [PATCH v5 09/10] clocksource: atmel-st: remove mach/hardware dependency Alexandre Belloni 2015-03-12 12:07 ` Alexandre Belloni 2015-03-13 10:21 ` Daniel Lezcano 2015-03-13 10:21 ` Daniel Lezcano 2015-03-13 10:21 ` Daniel Lezcano 2015-03-13 10:44 ` Alexandre Belloni 2015-03-13 10:44 ` Alexandre Belloni 2015-03-13 10:54 ` [PATCH v6 " Alexandre Belloni 2015-03-13 10:54 ` Alexandre Belloni 2015-03-12 12:07 ` [PATCH v5 10/10] ARM: at91: remove useless include Alexandre Belloni 2015-03-12 12:07 ` Alexandre Belloni 2015-03-13 10:22 ` Daniel Lezcano 2015-03-13 10:22 ` Daniel Lezcano 2015-03-13 10:22 ` Daniel Lezcano 2015-03-12 14:04 ` [PATCH v5 00/10] Atmel System Timer cleanups Nicolas Ferre 2015-03-12 14:04 ` Nicolas Ferre 2015-03-12 14:04 ` Nicolas Ferre 2015-03-13 10:23 ` Daniel Lezcano 2015-03-13 10:23 ` Daniel Lezcano 2015-03-13 10:23 ` Daniel Lezcano 2015-03-13 10:33 ` Alexandre Belloni 2015-03-13 10:33 ` Alexandre Belloni 2015-03-13 10:33 ` Daniel Lezcano 2015-03-13 10:33 ` Daniel Lezcano 2015-03-13 10:33 ` Daniel Lezcano 2015-03-13 16:36 ` Nicolas Ferre 2015-03-13 16:36 ` Nicolas Ferre 2015-03-13 16:36 ` Nicolas Ferre
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=1426162054-9987-8-git-send-email-alexandre.belloni@free-electrons.com \ --to=alexandre.belloni@free-electrons.com \ --cc=boris.brezillon@free-electrons.com \ --cc=daniel.lezcano@linaro.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-watchdog@vger.kernel.org \ --cc=linux@roeck-us.net \ --cc=nicolas.ferre@atmel.com \ --cc=plagnioj@jcrosoft.com \ --cc=wim@iguana.be \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.