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 06/14] AT91: dt: Remove init_time definitions
Date: Tue, 1 Jul 2014 11:33:19 +0200 [thread overview]
Message-ID: <1404207208-14513-7-git-send-email-maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <1404207208-14513-1-git-send-email-maxime.ripard@free-electrons.com>
The current AT91 DT boards have a completely generic init_time definition.
Remove them from the machine declaration.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
arch/arm/mach-at91/board-dt-sam9.c | 11 -----------
arch/arm/mach-at91/board-dt-sama5.c | 10 ----------
2 files changed, 21 deletions(-)
diff --git a/arch/arm/mach-at91/board-dt-sam9.c b/arch/arm/mach-at91/board-dt-sam9.c
index a9fcdadfd929..3f80ceb3f444 100644
--- a/arch/arm/mach-at91/board-dt-sam9.c
+++ b/arch/arm/mach-at91/board-dt-sam9.c
@@ -14,7 +14,6 @@
#include <linux/of.h>
#include <linux/of_irq.h>
#include <linux/clk-provider.h>
-#include <linux/clocksource.h>
#include <asm/setup.h>
#include <asm/irq.h>
@@ -26,15 +25,6 @@
#include "board.h"
#include "generic.h"
-
-static void __init sam9_dt_timer_init(void)
-{
-#if defined(CONFIG_COMMON_CLK)
- of_clk_init(NULL);
-#endif
- clocksource_of_init();
-}
-
static const struct of_device_id irq_of_match[] __initconst = {
{ .compatible = "atmel,at91rm9200-aic", .data = at91_aic_of_init },
@@ -53,7 +43,6 @@ static const char *at91_dt_board_compat[] __initdata = {
DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM (Device Tree)")
/* Maintainer: Atmel */
- .init_time = sam9_dt_timer_init,
.map_io = at91_map_io,
.handle_irq = at91_aic_handle_irq,
.init_early = at91_dt_initialize,
diff --git a/arch/arm/mach-at91/board-dt-sama5.c b/arch/arm/mach-at91/board-dt-sama5.c
index c07dd2395f36..030f4b65f449 100644
--- a/arch/arm/mach-at91/board-dt-sama5.c
+++ b/arch/arm/mach-at91/board-dt-sama5.c
@@ -17,7 +17,6 @@
#include <linux/of_platform.h>
#include <linux/phy.h>
#include <linux/clk-provider.h>
-#include <linux/clocksource.h>
#include <asm/setup.h>
#include <asm/irq.h>
@@ -28,14 +27,6 @@
#include "at91_aic.h"
#include "generic.h"
-static void __init sama5_dt_timer_init(void)
-{
-#if defined(CONFIG_COMMON_CLK)
- of_clk_init(NULL);
-#endif
- clocksource_of_init();
-}
-
static const struct of_device_id irq_of_match[] __initconst = {
{ .compatible = "atmel,sama5d3-aic", .data = at91_aic5_of_init },
@@ -81,7 +72,6 @@ static const char *sama5_dt_board_compat[] __initdata = {
DT_MACHINE_START(sama5_dt, "Atmel SAMA5 (Device Tree)")
/* Maintainer: Atmel */
- .init_time = sama5_dt_timer_init,
.map_io = at91_map_io,
.handle_irq = at91_aic5_handle_irq,
.init_early = at91_dt_initialize,
--
2.0.0
next prev parent reply other threads:[~2014-07-01 9:35 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 to drivers/clocksource 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 ` Maxime Ripard [this message]
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 ` [PATCH v2 14/14] AT91: PIT: Move the driver to drivers/clocksource Maxime Ripard
2014-07-01 9:52 ` [PATCH v2 00/14] AT91: PIT: Cleanups and move " 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-7-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®