ARM: at91: sam9: set arm_pm_idle from sam9_dt_device_init

As all sam9 SoCs are setting arm_pm_idle to at91sam9_idle(), do it from
sam9_dt_device_init().

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Suggested-by: Arnd Bergmann <arnd@arndb.de>
[nicolas.ferre@atmel.com: adapt patch to newer series]
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

diff --git a/arch/arm/mach-at91/at91sam9260.c b/arch/arm/mach-at91/at91sam9260.c
index ab9841c..37b7ce4 100644 (file)
--- a/arch/arm/mach-at91/at91sam9260.c
+++ b/arch/arm/mach-at91/at91sam9260.c
@@ -22,11 +22,5 @@
  *  AT91SAM9260 processor initialization
  * -------------------------------------------------------------------- */
 
-static void __init at91sam9260_initialize(void)
-{
-       arm_pm_idle = at91sam9_idle;
-}
-
 AT91_SOC_START(at91sam9260)
-       .init = at91sam9260_initialize,
 AT91_SOC_END

diff --git a/arch/arm/mach-at91/at91sam9261.c b/arch/arm/mach-at91/at91sam9261.c
index 2029096..aebbf76 100644 (file)
--- a/arch/arm/mach-at91/at91sam9261.c
+++ b/arch/arm/mach-at91/at91sam9261.c
@@ -21,11 +21,5 @@
  *  AT91SAM9261 processor initialization
  * -------------------------------------------------------------------- */
 
-static void __init at91sam9261_initialize(void)
-{
-       arm_pm_idle = at91sam9_idle;
-}
-
 AT91_SOC_START(at91sam9261)
-       .init = at91sam9261_initialize,
 AT91_SOC_END

diff --git a/arch/arm/mach-at91/at91sam9263.c b/arch/arm/mach-at91/at91sam9263.c
index 1fe672a..dca2945 100644 (file)
--- a/arch/arm/mach-at91/at91sam9263.c
+++ b/arch/arm/mach-at91/at91sam9263.c
@@ -20,11 +20,5 @@
  *  AT91SAM9263 processor initialization
  * -------------------------------------------------------------------- */
 
-static void __init at91sam9263_initialize(void)
-{
-       arm_pm_idle = at91sam9_idle;
-}
-
 AT91_SOC_START(at91sam9263)
-       .init = at91sam9263_initialize,
 AT91_SOC_END

diff --git a/arch/arm/mach-at91/at91sam9g45.c b/arch/arm/mach-at91/at91sam9g45.c
index d0493df..4957a9e 100644 (file)
--- a/arch/arm/mach-at91/at91sam9g45.c
+++ b/arch/arm/mach-at91/at91sam9g45.c
@@ -19,11 +19,6 @@
 /* --------------------------------------------------------------------
  *  AT91SAM9G45 processor initialization
  * -------------------------------------------------------------------- */
-static void __init at91sam9g45_initialize(void)
-{
-       arm_pm_idle = at91sam9_idle;
-}
 
 AT91_SOC_START(at91sam9g45)
-       .init = at91sam9g45_initialize,
 AT91_SOC_END

diff --git a/arch/arm/mach-at91/at91sam9n12.c b/arch/arm/mach-at91/at91sam9n12.c
index 276b8f0..b5ea69a 100644 (file)
--- a/arch/arm/mach-at91/at91sam9n12.c
+++ b/arch/arm/mach-at91/at91sam9n12.c
@@ -15,11 +15,6 @@
 /* --------------------------------------------------------------------
  *  AT91SAM9N12 processor initialization
  * -------------------------------------------------------------------- */
-static void __init at91sam9n12_initialize(void)
-{
-       arm_pm_idle = at91sam9_idle;
-}
 
 AT91_SOC_START(at91sam9n12)
-       .init = at91sam9n12_initialize,
 AT91_SOC_END

diff --git a/arch/arm/mach-at91/at91sam9rl.c b/arch/arm/mach-at91/at91sam9rl.c
index 33acae3..6cb40e4 100644 (file)
--- a/arch/arm/mach-at91/at91sam9rl.c
+++ b/arch/arm/mach-at91/at91sam9rl.c
@@ -21,11 +21,5 @@
  *  AT91SAM9RL processor initialization
  * -------------------------------------------------------------------- */
 
-static void __init at91sam9rl_initialize(void)
-{
-       arm_pm_idle = at91sam9_idle;
-}
-
 AT91_SOC_START(at91sam9rl)
-       .init = at91sam9rl_initialize,
 AT91_SOC_END

diff --git a/arch/arm/mach-at91/at91sam9x5.c b/arch/arm/mach-at91/at91sam9x5.c
index 7b6fb1b..7b60a52 100644 (file)
--- a/arch/arm/mach-at91/at91sam9x5.c
+++ b/arch/arm/mach-at91/at91sam9x5.c
@@ -16,11 +16,5 @@
  *  AT91SAM9x5 processor initialization
  * -------------------------------------------------------------------- */
 
-static void __init at91sam9x5_initialize(void)
-{
-       arm_pm_idle = at91sam9_idle;
-}
-
 AT91_SOC_START(at91sam9x5)
-       .init = at91sam9x5_initialize,
 AT91_SOC_END

diff --git a/arch/arm/mach-at91/board-dt-sam9.c b/arch/arm/mach-at91/board-dt-sam9.c
index a648d09..8391b95 100644 (file)
--- a/arch/arm/mach-at91/board-dt-sam9.c
+++ b/arch/arm/mach-at91/board-dt-sam9.c
@@ -16,6 +16,7 @@
 #include <linux/of_platform.h>
 #include <linux/clk-provider.h>
 
+#include <asm/system_misc.h>
 #include <asm/setup.h>
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
@@ -26,7 +27,9 @@
 
 static void __init sam9_dt_device_init(void)
 {
+       arm_pm_idle = at91sam9_idle;
        at91_sam9260_pm_init();
+
        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
@@ -45,7 +48,9 @@ MACHINE_END
 
 static void __init sam9g45_dt_device_init(void)
 {
+       arm_pm_idle = at91sam9_idle;
        at91_sam9g45_pm_init();
+
        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
@@ -64,7 +69,9 @@ MACHINE_END
 
 static void __init sam9x5_dt_device_init(void)
 {
+       arm_pm_idle = at91sam9_idle;
        at91_sam9x5_pm_init();
+
        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }