ARM: at91: Move PM init functions to .init_late hook

Move the AT91 PM init functions to .init_late hook to ensure driver
dependencies have probed.

Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Tested-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Link: https://lore.kernel.org/r/20260105-at91-probe-v3-2-594013ff2965@kernel.org
Signed-off-by: Claudiu Beznea <claudiu.beznea@tuxon.dev>

diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
index 4f81862116192da7425d50685a9d21fa7ffc6556..2ac564eb8bbbb535c7fa57ca0f411cd96daf3982 100644 (file)
--- a/arch/arm/mach-at91/at91rm9200.c
+++ b/arch/arm/mach-at91/at91rm9200.c
@@ -17,8 +17,6 @@
 static void __init at91rm9200_dt_device_init(void)
 {
        of_platform_default_populate(NULL, NULL, NULL);
-
-       at91rm9200_pm_init();
 }
 
 static const char *const at91rm9200_dt_board_compat[] __initconst = {
@@ -27,6 +25,7 @@ static const char *const at91rm9200_dt_board_compat[] __initconst = {
 };
 
 DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200")
+       .init_late      = at91rm9200_pm_init,
        .init_machine   = at91rm9200_dt_device_init,
        .dt_compat      = at91rm9200_dt_board_compat,
 MACHINE_END

diff --git a/arch/arm/mach-at91/at91sam9.c b/arch/arm/mach-at91/at91sam9.c
index 7e572189a5eb6a2f65aaa36ad601a57f2e5bb7f9..cf07cba4ee5d604df7820dbe5aba51ac7ac5512f 100644 (file)
--- a/arch/arm/mach-at91/at91sam9.c
+++ b/arch/arm/mach-at91/at91sam9.c
@@ -17,8 +17,6 @@
 static void __init at91sam9_init(void)
 {
        of_platform_default_populate(NULL, NULL, NULL);
-
-       at91sam9_pm_init();
 }
 
 static const char *const at91_dt_board_compat[] __initconst = {
@@ -28,6 +26,7 @@ static const char *const at91_dt_board_compat[] __initconst = {
 
 DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM9")
        /* Maintainer: Atmel */
+       .init_late      = at91sam9_pm_init,
        .init_machine   = at91sam9_init,
        .dt_compat      = at91_dt_board_compat,
 MACHINE_END

diff --git a/arch/arm/mach-at91/sam9x60.c b/arch/arm/mach-at91/sam9x60.c
index d8c739d254582ad43e6146d440d0cb54dce78d21..a31beaaeffcd498e00705266eba7faae4ff9a071 100644 (file)
--- a/arch/arm/mach-at91/sam9x60.c
+++ b/arch/arm/mach-at91/sam9x60.c
@@ -18,8 +18,6 @@
 static void __init sam9x60_init(void)
 {
        of_platform_default_populate(NULL, NULL, NULL);
-
-       sam9x60_pm_init();
 }
 
 static const char *const sam9x60_dt_board_compat[] __initconst = {
@@ -29,6 +27,7 @@ static const char *const sam9x60_dt_board_compat[] __initconst = {
 
 DT_MACHINE_START(sam9x60_dt, "Microchip SAM9X60")
        /* Maintainer: Microchip */
+       .init_late      = sam9x60_pm_init,
        .init_machine   = sam9x60_init,
        .dt_compat      = sam9x60_dt_board_compat,
 MACHINE_END

diff --git a/arch/arm/mach-at91/sam9x7.c b/arch/arm/mach-at91/sam9x7.c
index e1ff30b5b09b203e5e5dc1bcc1840ea4895ffe9a..0c73f7fefd4fb115e64fd627d7be2b364124c3af 100644 (file)
--- a/arch/arm/mach-at91/sam9x7.c
+++ b/arch/arm/mach-at91/sam9x7.c
@@ -17,8 +17,6 @@
 static void __init sam9x7_init(void)
 {
        of_platform_default_populate(NULL, NULL, NULL);
-
-       sam9x7_pm_init();
 }
 
 static const char * const sam9x7_dt_board_compat[] __initconst = {
@@ -28,6 +26,7 @@ static const char * const sam9x7_dt_board_compat[] __initconst = {
 
 DT_MACHINE_START(sam9x7_dt, "Microchip SAM9X7")
        /* Maintainer: Microchip */
+       .init_late      = sam9x7_pm_init,
        .init_machine   = sam9x7_init,
        .dt_compat      = sam9x7_dt_board_compat,
 MACHINE_END

diff --git a/arch/arm/mach-at91/sama5.c b/arch/arm/mach-at91/sama5.c
index bf2b5c6a18c6a60df7f4ae2d8a247f0b7b5c9827..576654cba82d2fff74b0879f8dfe4f101186acd5 100644 (file)
--- a/arch/arm/mach-at91/sama5.c
+++ b/arch/arm/mach-at91/sama5.c
@@ -33,7 +33,6 @@ static void __init sama5_secure_cache_init(void)
 static void __init sama5_dt_device_init(void)
 {
        of_platform_default_populate(NULL, NULL, NULL);
-       sama5_pm_init();
 }
 
 static const char *const sama5_dt_board_compat[] __initconst = {
@@ -43,6 +42,7 @@ static const char *const sama5_dt_board_compat[] __initconst = {
 
 DT_MACHINE_START(sama5_dt, "Atmel SAMA5")
        /* Maintainer: Atmel */
+       .init_late      = sama5_pm_init,
        .init_machine   = sama5_dt_device_init,
        .dt_compat      = sama5_dt_board_compat,
 MACHINE_END
@@ -55,6 +55,7 @@ static const char *const sama5_alt_dt_board_compat[] __initconst = {
 DT_MACHINE_START(sama5_alt_dt, "Atmel SAMA5")
        /* Maintainer: Atmel */
        .init_machine   = sama5_dt_device_init,
+       .init_late      = sama5_pm_init,
        .dt_compat      = sama5_alt_dt_board_compat,
        .l2c_aux_mask   = ~0UL,
 MACHINE_END
@@ -62,7 +63,6 @@ MACHINE_END
 static void __init sama5d2_init(void)
 {
        of_platform_default_populate(NULL, NULL, NULL);
-       sama5d2_pm_init();
 }
 
 static const char *const sama5d2_compat[] __initconst = {
@@ -74,6 +74,7 @@ DT_MACHINE_START(sama5d2, "Atmel SAMA5")
        /* Maintainer: Atmel */
        .init_machine   = sama5d2_init,
        .init_early     = sama5_secure_cache_init,
+       .init_late      = sama5d2_pm_init,
        .dt_compat      = sama5d2_compat,
        .l2c_aux_mask   = ~0UL,
 MACHINE_END

diff --git a/arch/arm/mach-at91/sama7.c b/arch/arm/mach-at91/sama7.c
index bd43733ede188b7cf7fc4f59d53246aa4b0f1042..8bf57a020f1cc68895c4e047b5cd28bd57c059d9 100644 (file)
--- a/arch/arm/mach-at91/sama7.c
+++ b/arch/arm/mach-at91/sama7.c
@@ -17,7 +17,6 @@
 static void __init sama7_dt_device_init(void)
 {
        of_platform_default_populate(NULL, NULL, NULL);
-       sama7_pm_init();
 }
 
 static const char *const sama7_dt_board_compat[] __initconst = {
@@ -27,6 +26,7 @@ static const char *const sama7_dt_board_compat[] __initconst = {
 
 DT_MACHINE_START(sama7_dt, "Microchip SAMA7")
        /* Maintainer: Microchip */
+       .init_late      = sama7_pm_init,
        .init_machine   = sama7_dt_device_init,
        .dt_compat      = sama7_dt_board_compat,
 MACHINE_END