ARM: at91: pm: prepare for multiplatform

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>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

diff --git a/arch/arm/mach-at91/board-dt-rm9200.c b/arch/arm/mach-at91/board-dt-rm9200.c
index a15ab6f8de00efb3fbdf76505c36cf170114343e..5f82a65153e197c80a1072da2dc92b6d8de9ae47 100644 (file)
--- 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 f99246aa9b38c60c6fc3aed9ead01dbee1d6c996..0fe1ced608c58257a29301dac9152cca88c83c3a 100644 (file)
--- 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 8fb9ef5333f17648d8a28aaa0385badc9c0ed65a..44d372a22a29d29ba0dbb0cafda7270545c4feca 100644 (file)
--- 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 54f3837a0a4d923b1e1e1d04f06bc9e68149ba04..fae7a703813ca7d84a8ab344760fd314e7a30883 100644 (file)
--- 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 71cc845263dce7ee35a39a17e425e9ed50b3f627..81f2f12d3cc1546d669d66c2451fca01ae4123b2 100644 (file)
--- 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,35 @@ 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();
+}
+
+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();
 }
-arch_initcall(at91_pm_init);