From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
Arnd Bergmann <arnd@arndb.de>,
Boris Brezillon <boris.brezillon@free-electrons.com>,
Bo Shen <voice.shen@atmel.com>,
Wenyou Yang <Wenyou.Yang@atmel.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
Alexandre Belloni <alexandre.belloni@free-electrons.com>
Subject: [PATCH 13/17] ARM: at91: rework initialization for sam9 based boards
Date: Thu, 15 Jan 2015 22:58:16 +0100 [thread overview]
Message-ID: <1421359100-8930-14-git-send-email-alexandre.belloni@free-electrons.com> (raw)
In-Reply-To: <1421359100-8930-1-git-send-email-alexandre.belloni@free-electrons.com>
Remove useless .map_io and .init_early by moving at91_dt_initialize() to
sam9*_dt_device_init(). Also rename board-dt-sam9.c to at91sam9.c
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
arch/arm/mach-at91/Makefile | 4 +---
arch/arm/mach-at91/{board-dt-sam9.c => at91sam9.c} | 16 ++--------------
2 files changed, 3 insertions(+), 17 deletions(-)
rename arch/arm/mach-at91/{board-dt-sam9.c => at91sam9.c} (76%)
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index 76d6d869bf4e..27b503defe80 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -8,12 +8,10 @@ obj-$(CONFIG_SOC_AT91SAM9) += sam9_smc.o
# CPU-specific support
obj-$(CONFIG_SOC_AT91RM9200) += at91rm9200.o at91rm9200_time.o
+obj-$(CONFIG_SOC_AT91SAM9) += at91sam9.o
obj-$(CONFIG_SOC_SAMA5D3) += sama5d3.o
obj-$(CONFIG_SOC_SAMA5D4) += sama5d4.o
-# AT91SAM board with device-tree
-obj-$(CONFIG_SOC_AT91SAM9) += board-dt-sam9.o
-
# Power Management
obj-$(CONFIG_PM) += pm.o
obj-$(CONFIG_AT91_SLOW_CLOCK) += pm_slowclock.o
diff --git a/arch/arm/mach-at91/board-dt-sam9.c b/arch/arm/mach-at91/at91sam9.c
similarity index 76%
rename from arch/arm/mach-at91/board-dt-sam9.c
rename to arch/arm/mach-at91/at91sam9.c
index 6f90201dbd47..8b890644d6f0 100644
--- a/arch/arm/mach-at91/board-dt-sam9.c
+++ b/arch/arm/mach-at91/at91sam9.c
@@ -7,20 +7,10 @@
* Licensed under GPLv2 or later.
*/
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/gpio.h>
#include <linux/of.h>
-#include <linux/of_irq.h>
#include <linux/of_platform.h>
-#include <linux/clk-provider.h>
-#include <asm/setup.h>
-#include <asm/irq.h>
#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-#include <asm/mach/irq.h>
#include <asm/system_misc.h>
#include "generic.h"
@@ -29,6 +19,7 @@ static void __init sam9_dt_device_init(void)
{
arm_pm_idle = at91sam9_idle;
at91_sam9260_pm_init();
+ at91_dt_initialize();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
@@ -40,8 +31,6 @@ static const char *at91_dt_board_compat[] __initdata = {
DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM (Device Tree)")
/* Maintainer: Atmel */
- .map_io = at91_map_io,
- .init_early = at91_dt_initialize,
.init_machine = sam9_dt_device_init,
.dt_compat = at91_dt_board_compat,
MACHINE_END
@@ -50,6 +39,7 @@ static void __init sam9g45_dt_device_init(void)
{
arm_pm_idle = at91sam9_idle;
at91_sam9g45_pm_init();
+ at91_dt_initialize();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
@@ -61,8 +51,6 @@ static const char *at91_9g45_board_compat[] __initconst = {
DT_MACHINE_START(at91sam9g45_dt, "Atmel AT91SAM9G45")
/* Maintainer: Atmel */
- .map_io = at91_map_io,
- .init_early = at91_dt_initialize,
.init_machine = sam9g45_dt_device_init,
.dt_compat = at91_9g45_board_compat,
MACHINE_END
--
2.1.0
next prev parent reply other threads:[~2015-01-15 22:00 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-15 21:58 [PATCH 00/17] AT91 cleanup for 3.20 #3 Alexandre Belloni
2015-01-15 21:58 ` [PATCH 01/17] ARM: at91: merge at91rm9200 files Alexandre Belloni
2015-01-15 21:58 ` [PATCH 02/17] ARM: at91: move sama5 specific code into per-soc files Alexandre Belloni
2015-01-15 21:58 ` [PATCH 03/17] ARM: at91:remove unused mach/system_rev.h Alexandre Belloni
2015-01-15 21:58 ` [PATCH 04/17] ARM: at91: fix sam9n12 and sam9x5 arm_pm_idle Alexandre Belloni
2015-01-15 21:58 ` [PATCH 05/17] ARM: at91: sam9: set arm_pm_idle from sam9_dt_device_init Alexandre Belloni
2015-01-15 21:58 ` [PATCH 06/17] ARM: at91: remove unused at91_ioremap_matrix and header Alexandre Belloni
2015-01-15 21:58 ` [PATCH 07/17] ARM: at91: remove unused _matrix.h headers Alexandre Belloni
2015-01-15 21:58 ` [PATCH 08/17] ARM: at91: stop using HAVE_AT91_DBGUx Alexandre Belloni
2015-01-20 10:34 ` Nicolas Ferre
2015-01-20 15:12 ` Alexandre Belloni
2015-01-15 21:58 ` [PATCH 09/17] ARM: at91: pm: remove warning to remove SOC_AT91SAM9263 usage Alexandre Belloni
2015-01-15 21:58 ` [PATCH 10/17] ARM: at91: merge SOC_AT91SAM9xxx Alexandre Belloni
2015-01-22 10:22 ` Nicolas Ferre
2015-01-22 16:36 ` Alexandre Belloni
2015-01-26 17:49 ` [PATCH v2] " Nicolas Ferre
2015-01-15 21:58 ` [PATCH 11/17] ARM: at91: remove at91_boot_soc Alexandre Belloni
2015-01-26 18:08 ` [PATCH v2] ARM: at91: at91rm9200: set idle and restart from rm9200_dt_device_init() Nicolas Ferre
2015-01-26 19:01 ` Alexandre Belloni
2015-01-15 21:58 ` [PATCH 12/17] ARM: at91: rework initialization for rm9200 based boards Alexandre Belloni
2015-01-15 21:58 ` Alexandre Belloni [this message]
2015-01-15 21:58 ` [PATCH 14/17] ARM: at91: rework initialization for sama5 " Alexandre Belloni
2015-01-15 21:58 ` [PATCH 15/17] ARM: at91: remove old setup Alexandre Belloni
2015-01-21 16:29 ` Nicolas Ferre
2015-01-21 20:40 ` Alexandre Belloni
2015-01-15 21:58 ` [PATCH 16/17] ARM: at91: mark const init data with __initconst instead of __initdata Alexandre Belloni
2015-01-15 21:58 ` [PATCH 17/17] ARM: at91: remove at91_dt_initialize Alexandre Belloni
2015-01-22 10:31 ` [PATCH 00/17] AT91 cleanup for 3.20 #3 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=1421359100-8930-14-git-send-email-alexandre.belloni@free-electrons.com \
--to=alexandre.belloni@free-electrons.com \
--cc=Wenyou.Yang@atmel.com \
--cc=arnd@arndb.de \
--cc=boris.brezillon@free-electrons.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nicolas.ferre@atmel.com \
--cc=plagnioj@jcrosoft.com \
--cc=voice.shen@atmel.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®