From: Rob Herring (Arm) Date: Mon, 5 Jan 2026 21:06:44 +0000 (-0600) Subject: ARM: at91: Move PM init functions to .init_late hook X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef45b853ed8c3a904eaeeccea02b8c2c49891955;p=thirdparty%2Fkernel%2Flinux.git 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 Tested-by: Alexandre Belloni Signed-off-by: Rob Herring (Arm) Link: https://lore.kernel.org/r/20260105-at91-probe-v3-2-594013ff2965@kernel.org Signed-off-by: Claudiu Beznea --- diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c index 4f81862116192..2ac564eb8bbbb 100644 --- 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 7e572189a5eb6..cf07cba4ee5d6 100644 --- 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 d8c739d254582..a31beaaeffcd4 100644 --- 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 e1ff30b5b09b2..0c73f7fefd4fb 100644 --- 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 bf2b5c6a18c6a..576654cba82d2 100644 --- 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 bd43733ede188..8bf57a020f1cc 100644 --- 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