Skip to content

Commit ef45b85

Browse files
robherringclaudiubeznea
authored andcommitted
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>
1 parent 8f0b4cc commit ef45b85

6 files changed

Lines changed: 8 additions & 11 deletions

File tree

arch/arm/mach-at91/at91rm9200.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
static void __init at91rm9200_dt_device_init(void)
1818
{
1919
of_platform_default_populate(NULL, NULL, NULL);
20-
21-
at91rm9200_pm_init();
2220
}
2321

2422
static const char *const at91rm9200_dt_board_compat[] __initconst = {
@@ -27,6 +25,7 @@ static const char *const at91rm9200_dt_board_compat[] __initconst = {
2725
};
2826

2927
DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200")
28+
.init_late = at91rm9200_pm_init,
3029
.init_machine = at91rm9200_dt_device_init,
3130
.dt_compat = at91rm9200_dt_board_compat,
3231
MACHINE_END

arch/arm/mach-at91/at91sam9.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
static void __init at91sam9_init(void)
1818
{
1919
of_platform_default_populate(NULL, NULL, NULL);
20-
21-
at91sam9_pm_init();
2220
}
2321

2422
static const char *const at91_dt_board_compat[] __initconst = {
@@ -28,6 +26,7 @@ static const char *const at91_dt_board_compat[] __initconst = {
2826

2927
DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM9")
3028
/* Maintainer: Atmel */
29+
.init_late = at91sam9_pm_init,
3130
.init_machine = at91sam9_init,
3231
.dt_compat = at91_dt_board_compat,
3332
MACHINE_END

arch/arm/mach-at91/sam9x60.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
static void __init sam9x60_init(void)
1919
{
2020
of_platform_default_populate(NULL, NULL, NULL);
21-
22-
sam9x60_pm_init();
2321
}
2422

2523
static const char *const sam9x60_dt_board_compat[] __initconst = {
@@ -29,6 +27,7 @@ static const char *const sam9x60_dt_board_compat[] __initconst = {
2927

3028
DT_MACHINE_START(sam9x60_dt, "Microchip SAM9X60")
3129
/* Maintainer: Microchip */
30+
.init_late = sam9x60_pm_init,
3231
.init_machine = sam9x60_init,
3332
.dt_compat = sam9x60_dt_board_compat,
3433
MACHINE_END

arch/arm/mach-at91/sam9x7.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
static void __init sam9x7_init(void)
1818
{
1919
of_platform_default_populate(NULL, NULL, NULL);
20-
21-
sam9x7_pm_init();
2220
}
2321

2422
static const char * const sam9x7_dt_board_compat[] __initconst = {
@@ -28,6 +26,7 @@ static const char * const sam9x7_dt_board_compat[] __initconst = {
2826

2927
DT_MACHINE_START(sam9x7_dt, "Microchip SAM9X7")
3028
/* Maintainer: Microchip */
29+
.init_late = sam9x7_pm_init,
3130
.init_machine = sam9x7_init,
3231
.dt_compat = sam9x7_dt_board_compat,
3332
MACHINE_END

arch/arm/mach-at91/sama5.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ static void __init sama5_secure_cache_init(void)
3333
static void __init sama5_dt_device_init(void)
3434
{
3535
of_platform_default_populate(NULL, NULL, NULL);
36-
sama5_pm_init();
3736
}
3837

3938
static const char *const sama5_dt_board_compat[] __initconst = {
@@ -43,6 +42,7 @@ static const char *const sama5_dt_board_compat[] __initconst = {
4342

4443
DT_MACHINE_START(sama5_dt, "Atmel SAMA5")
4544
/* Maintainer: Atmel */
45+
.init_late = sama5_pm_init,
4646
.init_machine = sama5_dt_device_init,
4747
.dt_compat = sama5_dt_board_compat,
4848
MACHINE_END
@@ -55,14 +55,14 @@ static const char *const sama5_alt_dt_board_compat[] __initconst = {
5555
DT_MACHINE_START(sama5_alt_dt, "Atmel SAMA5")
5656
/* Maintainer: Atmel */
5757
.init_machine = sama5_dt_device_init,
58+
.init_late = sama5_pm_init,
5859
.dt_compat = sama5_alt_dt_board_compat,
5960
.l2c_aux_mask = ~0UL,
6061
MACHINE_END
6162

6263
static void __init sama5d2_init(void)
6364
{
6465
of_platform_default_populate(NULL, NULL, NULL);
65-
sama5d2_pm_init();
6666
}
6767

6868
static const char *const sama5d2_compat[] __initconst = {
@@ -74,6 +74,7 @@ DT_MACHINE_START(sama5d2, "Atmel SAMA5")
7474
/* Maintainer: Atmel */
7575
.init_machine = sama5d2_init,
7676
.init_early = sama5_secure_cache_init,
77+
.init_late = sama5d2_pm_init,
7778
.dt_compat = sama5d2_compat,
7879
.l2c_aux_mask = ~0UL,
7980
MACHINE_END

arch/arm/mach-at91/sama7.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
static void __init sama7_dt_device_init(void)
1818
{
1919
of_platform_default_populate(NULL, NULL, NULL);
20-
sama7_pm_init();
2120
}
2221

2322
static const char *const sama7_dt_board_compat[] __initconst = {
@@ -27,6 +26,7 @@ static const char *const sama7_dt_board_compat[] __initconst = {
2726

2827
DT_MACHINE_START(sama7_dt, "Microchip SAMA7")
2928
/* Maintainer: Microchip */
29+
.init_late = sama7_pm_init,
3030
.init_machine = sama7_dt_device_init,
3131
.dt_compat = sama7_dt_board_compat,
3232
MACHINE_END

0 commit comments

Comments
 (0)