From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Boris Brezillon <boris.brezillon@free-electrons.com>,
Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Arnd Bergmann <arnd@arndb.de>,
Alexandre Belloni <alexandre.belloni@free-electrons.com>
Subject: [PATCH v2 4/8] ARM: at91: pm: prepare for multiplatform
Date: Thu, 15 Jan 2015 15:59:27 +0100 [thread overview]
Message-ID: <1421333971-7581-5-git-send-email-alexandre.belloni@free-electrons.com> (raw)
In-Reply-To: <1421333971-7581-1-git-send-email-alexandre.belloni@free-electrons.com>
Split at91_pm_init() in three variants that are called by the respective SoCs
.init_machine. This allows to remove the of_machine_is_compatible() calls and
move at91_pm_init() out of arch_initcall() which is required for multiplatform.
Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
arch/arm/mach-at91/board-dt-rm9200.c | 11 ++++++++
arch/arm/mach-at91/board-dt-sam9.c | 27 ++++++++++++++++++++
arch/arm/mach-at91/board-dt-sama5.c | 1 +
arch/arm/mach-at91/generic.h | 12 +++++++++
arch/arm/mach-at91/pm.c | 49 ++++++++++++++++++++----------------
5 files changed, 79 insertions(+), 21 deletions(-)
diff --git a/arch/arm/mach-at91/board-dt-rm9200.c b/arch/arm/mach-at91/board-dt-rm9200.c
index a15ab6f8de00..5f82a65153e1 100644
--- a/arch/arm/mach-at91/board-dt-rm9200.c
+++ b/arch/arm/mach-at91/board-dt-rm9200.c
@@ -14,6 +14,7 @@
#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>
@@ -30,6 +31,15 @@ static void __init at91rm9200_dt_timer_init(void)
at91rm9200_timer_init();
}
+static void __init rm9200_dt_device_init(void)
+{
+ at91_rm9200_pm_init();
+
+ of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+}
+
+
+
static const char *at91rm9200_dt_board_compat[] __initdata = {
"atmel,at91rm9200",
NULL
@@ -39,5 +49,6 @@ DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200 (Device Tree)")
.init_time = at91rm9200_dt_timer_init,
.map_io = at91_map_io,
.init_early = at91_dt_initialize,
+ .init_machine = rm9200_dt_device_init,
.dt_compat = at91rm9200_dt_board_compat,
MACHINE_END
diff --git a/arch/arm/mach-at91/board-dt-sam9.c b/arch/arm/mach-at91/board-dt-sam9.c
index f99246aa9b38..0fe1ced608c5 100644
--- a/arch/arm/mach-at91/board-dt-sam9.c
+++ b/arch/arm/mach-at91/board-dt-sam9.c
@@ -13,6 +13,7 @@
#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>
@@ -23,6 +24,12 @@
#include "generic.h"
+static void __init sam9_dt_device_init(void)
+{
+ at91_sam9260_pm_init();
+ of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+}
+
static const char *at91_dt_board_compat[] __initdata = {
"atmel,at91sam9",
NULL
@@ -32,5 +39,25 @@ 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
+
+static void __init sam9g45_dt_device_init(void)
+{
+ at91_sam9g45_pm_init();
+ of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+}
+
+static const char *at91_9g45_board_compat[] __initconst = {
+ "atmel,at91sam9g45",
+ NULL
+};
+
+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
diff --git a/arch/arm/mach-at91/board-dt-sama5.c b/arch/arm/mach-at91/board-dt-sama5.c
index 8fb9ef5333f1..44d372a22a29 100644
--- a/arch/arm/mach-at91/board-dt-sama5.c
+++ b/arch/arm/mach-at91/board-dt-sama5.c
@@ -28,6 +28,7 @@
static void __init sama5_dt_device_init(void)
{
+ at91_sam9260_pm_init();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
diff --git a/arch/arm/mach-at91/generic.h b/arch/arm/mach-at91/generic.h
index 54f3837a0a4d..fae7a703813c 100644
--- a/arch/arm/mach-at91/generic.h
+++ b/arch/arm/mach-at91/generic.h
@@ -31,4 +31,16 @@ extern void at91sam9_idle(void);
/* Matrix */
extern void at91_ioremap_matrix(u32 base_addr);
+
+
+#ifdef CONFIG_PM
+extern void __init at91_rm9200_pm_init(void);
+extern void __init at91_sam9260_pm_init(void);
+extern void __init at91_sam9g45_pm_init(void);
+#else
+void __init at91_rm9200_pm_init(void) { }
+void __init at91_sam9260_pm_init(void) { }
+void __init at91_sam9g45_pm_init(void) { }
+#endif
+
#endif /* _AT91_GENERIC_H */
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 71cc845263dc..778f11132b31 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -266,7 +266,7 @@ put_node:
#endif
-static int __init at91_pm_init(void)
+static void __init at91_pm_init(void)
{
#ifdef CONFIG_AT91_SLOW_CLOCK
at91_pm_sram_init();
@@ -274,29 +274,36 @@ static int __init at91_pm_init(void)
pr_info("AT91: Power Management%s\n", (slow_clock ? " (with slow clock mode)" : ""));
- at91_pm_data.memctrl = AT91_MEMCTRL_SDRAMC;
- at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP;
-
- if (of_machine_is_compatible("atmel,at91rm9200")) {
- /*
- * AT91RM9200 SDRAM low-power mode cannot be used with
- * self-refresh.
- */
- at91_ramc_write(0, AT91RM9200_SDRAMC_LPR, 0);
-
- at91_pm_data.uhp_udp_mask = AT91RM9200_PMC_UHP |
- AT91RM9200_PMC_UDP;
- at91_pm_data.memctrl = AT91_MEMCTRL_MC;
- } else if (of_machine_is_compatible("atmel,at91sam9g45")) {
- at91_pm_data.uhp_udp_mask = AT91RM9200_PMC_UHP;
- at91_pm_data.memctrl = AT91_MEMCTRL_DDRSDR;
- }
-
if (at91_cpuidle_device.dev.platform_data)
platform_device_register(&at91_cpuidle_device);
suspend_set_ops(&at91_pm_ops);
+}
- return 0;
+void __init at91_rm9200_pm_init(void)
+{
+ /*
+ * AT91RM9200 SDRAM low-power mode cannot be used with self-refresh.
+ */
+ at91_ramc_write(0, AT91RM9200_SDRAMC_LPR, 0);
+
+ at91_pm_data.uhp_udp_mask = AT91RM9200_PMC_UHP | AT91RM9200_PMC_UDP;
+ at91_pm_data.memctrl = AT91_MEMCTRL_MC;
+
+ at91_pm_init();
+}
+
+void __init at91_sam9260_pm_init(void)
+{
+ at91_pm_data.memctrl = AT91_MEMCTRL_SDRAMC;
+ at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP;
+ return at91_pm_init();
}
-arch_initcall(at91_pm_init);
+
+void __init at91_sam9g45_pm_init(void)
+{
+ at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP;
+ at91_pm_data.memctrl = AT91_MEMCTRL_DDRSDR;
+ return at91_pm_init();
+}
+
--
2.1.0
next prev parent reply other threads:[~2015-01-15 15:01 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-15 14:59 [PATCH v2 0/8] AT91 cleanup for 3.20 #2 Alexandre Belloni
2015-01-15 14:59 ` [PATCH v2 1/8] ARM: at91: pm: rework cpu detection Alexandre Belloni
2015-01-16 2:44 ` Yang, Wenyou
2015-01-16 10:26 ` Alexandre Belloni
2015-01-15 14:59 ` [PATCH v2 2/8] ARM: at91: pm: use the mmio-sram pool to access SRAM Alexandre Belloni
2015-01-15 14:59 ` [PATCH v2 3/8] ARM: at91: pm: add UDP and UHP checks to newer SoCs Alexandre Belloni
2015-01-15 14:59 ` Alexandre Belloni [this message]
2015-01-22 16:03 ` [PATCH] ARM: at91: fix PM initialization for " Nicolas Ferre
2015-01-22 16:07 ` [PATCH v2] " Nicolas Ferre
2015-01-23 7:50 ` Jean-Christophe PLAGNIOL-VILLARD
2015-01-23 10:11 ` Alexandre Belloni
2015-01-15 14:59 ` [PATCH v2 5/8] ARM: at91: remove useless map_io Alexandre Belloni
2015-01-15 14:59 ` [PATCH v2 6/8] ARM: at91: sama5d4: remove useless call to at91_init_sram Alexandre Belloni
2015-01-15 14:59 ` [PATCH v2 7/8] ARM: at91: remove unused at91_init_sram Alexandre Belloni
2015-01-15 14:59 ` [PATCH v2 8/8] ARM: at91: move at91rm9200_idle() to clk/at91/pmc.c Alexandre Belloni
2015-01-16 17:11 ` [PATCH v2 0/8] AT91 cleanup for 3.20 #2 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=1421333971-7581-5-git-send-email-alexandre.belloni@free-electrons.com \
--to=alexandre.belloni@free-electrons.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 \
/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®