Commit b9f122cc authored by Alexandre Belloni's avatar Alexandre Belloni Committed by Nicolas Ferre

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: default avatarAlexandre Belloni <alexandre.belloni@free-electrons.com>
Suggested-by: default avatarArnd Bergmann <arnd@arndb.de>
[nicolas.ferre@atmel.com: adapt patch to newer series]
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 4fe604c8
...@@ -22,11 +22,5 @@ ...@@ -22,11 +22,5 @@
* AT91SAM9260 processor initialization * AT91SAM9260 processor initialization
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
static void __init at91sam9260_initialize(void)
{
arm_pm_idle = at91sam9_idle;
}
AT91_SOC_START(at91sam9260) AT91_SOC_START(at91sam9260)
.init = at91sam9260_initialize,
AT91_SOC_END AT91_SOC_END
...@@ -21,11 +21,5 @@ ...@@ -21,11 +21,5 @@
* AT91SAM9261 processor initialization * AT91SAM9261 processor initialization
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
static void __init at91sam9261_initialize(void)
{
arm_pm_idle = at91sam9_idle;
}
AT91_SOC_START(at91sam9261) AT91_SOC_START(at91sam9261)
.init = at91sam9261_initialize,
AT91_SOC_END AT91_SOC_END
...@@ -20,11 +20,5 @@ ...@@ -20,11 +20,5 @@
* AT91SAM9263 processor initialization * AT91SAM9263 processor initialization
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
static void __init at91sam9263_initialize(void)
{
arm_pm_idle = at91sam9_idle;
}
AT91_SOC_START(at91sam9263) AT91_SOC_START(at91sam9263)
.init = at91sam9263_initialize,
AT91_SOC_END AT91_SOC_END
...@@ -19,11 +19,6 @@ ...@@ -19,11 +19,6 @@
/* -------------------------------------------------------------------- /* --------------------------------------------------------------------
* AT91SAM9G45 processor initialization * AT91SAM9G45 processor initialization
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
static void __init at91sam9g45_initialize(void)
{
arm_pm_idle = at91sam9_idle;
}
AT91_SOC_START(at91sam9g45) AT91_SOC_START(at91sam9g45)
.init = at91sam9g45_initialize,
AT91_SOC_END AT91_SOC_END
...@@ -15,11 +15,6 @@ ...@@ -15,11 +15,6 @@
/* -------------------------------------------------------------------- /* --------------------------------------------------------------------
* AT91SAM9N12 processor initialization * AT91SAM9N12 processor initialization
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
static void __init at91sam9n12_initialize(void)
{
arm_pm_idle = at91sam9_idle;
}
AT91_SOC_START(at91sam9n12) AT91_SOC_START(at91sam9n12)
.init = at91sam9n12_initialize,
AT91_SOC_END AT91_SOC_END
...@@ -21,11 +21,5 @@ ...@@ -21,11 +21,5 @@
* AT91SAM9RL processor initialization * AT91SAM9RL processor initialization
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
static void __init at91sam9rl_initialize(void)
{
arm_pm_idle = at91sam9_idle;
}
AT91_SOC_START(at91sam9rl) AT91_SOC_START(at91sam9rl)
.init = at91sam9rl_initialize,
AT91_SOC_END AT91_SOC_END
...@@ -16,11 +16,5 @@ ...@@ -16,11 +16,5 @@
* AT91SAM9x5 processor initialization * AT91SAM9x5 processor initialization
* -------------------------------------------------------------------- */ * -------------------------------------------------------------------- */
static void __init at91sam9x5_initialize(void)
{
arm_pm_idle = at91sam9_idle;
}
AT91_SOC_START(at91sam9x5) AT91_SOC_START(at91sam9x5)
.init = at91sam9x5_initialize,
AT91_SOC_END AT91_SOC_END
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include <linux/of_platform.h> #include <linux/of_platform.h>
#include <linux/clk-provider.h> #include <linux/clk-provider.h>
#include <asm/system_misc.h>
#include <asm/setup.h> #include <asm/setup.h>
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/mach/arch.h> #include <asm/mach/arch.h>
...@@ -26,7 +27,9 @@ ...@@ -26,7 +27,9 @@
static void __init sam9_dt_device_init(void) static void __init sam9_dt_device_init(void)
{ {
arm_pm_idle = at91sam9_idle;
at91_sam9260_pm_init(); at91_sam9260_pm_init();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
} }
...@@ -45,7 +48,9 @@ MACHINE_END ...@@ -45,7 +48,9 @@ MACHINE_END
static void __init sam9g45_dt_device_init(void) static void __init sam9g45_dt_device_init(void)
{ {
arm_pm_idle = at91sam9_idle;
at91_sam9g45_pm_init(); at91_sam9g45_pm_init();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
} }
...@@ -64,7 +69,9 @@ MACHINE_END ...@@ -64,7 +69,9 @@ MACHINE_END
static void __init sam9x5_dt_device_init(void) static void __init sam9x5_dt_device_init(void)
{ {
arm_pm_idle = at91sam9_idle;
at91_sam9x5_pm_init(); at91_sam9x5_pm_init();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment