@@ -33,7 +33,6 @@ static void __init sama5_secure_cache_init(void)
3333static void __init sama5_dt_device_init (void )
3434{
3535 of_platform_default_populate (NULL , NULL , NULL );
36- sama5_pm_init ();
3736}
3837
3938static const char * const sama5_dt_board_compat [] __initconst = {
@@ -43,6 +42,7 @@ static const char *const sama5_dt_board_compat[] __initconst = {
4342
4443DT_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 ,
4848MACHINE_END
@@ -55,14 +55,14 @@ static const char *const sama5_alt_dt_board_compat[] __initconst = {
5555DT_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 ,
6061MACHINE_END
6162
6263static void __init sama5d2_init (void )
6364{
6465 of_platform_default_populate (NULL , NULL , NULL );
65- sama5d2_pm_init ();
6666}
6767
6868static 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 ,
7980MACHINE_END
0 commit comments