Skip to content

Commit 0b0f7e6

Browse files
robherringclaudiubeznea
authored andcommitted
ARM: at91: remove unnecessary of_platform_default_populate calls
The DT core will call of_platform_default_populate, so it is not necessary for machine specific code to call it unless there are custom match entries, auxdata or parent device. Neither of those apply here, so remove the call. 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-3-594013ff2965@kernel.org Signed-off-by: Claudiu Beznea <claudiu.beznea@tuxon.dev>
1 parent ef45b85 commit 0b0f7e6

6 files changed

Lines changed: 0 additions & 61 deletions

File tree

arch/arm/mach-at91/at91rm9200.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,16 @@
77
* 2012 Joachim Eastwood <manabian@gmail.com>
88
*/
99

10-
#include <linux/of.h>
11-
#include <linux/of_platform.h>
12-
1310
#include <asm/mach/arch.h>
1411

1512
#include "generic.h"
1613

17-
static void __init at91rm9200_dt_device_init(void)
18-
{
19-
of_platform_default_populate(NULL, NULL, NULL);
20-
}
21-
2214
static const char *const at91rm9200_dt_board_compat[] __initconst = {
2315
"atmel,at91rm9200",
2416
NULL
2517
};
2618

2719
DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200")
2820
.init_late = at91rm9200_pm_init,
29-
.init_machine = at91rm9200_dt_device_init,
3021
.dt_compat = at91rm9200_dt_board_compat,
3122
MACHINE_END

arch/arm/mach-at91/at91sam9.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,11 @@
66
* 2011 Nicolas Ferre <nicolas.ferre@atmel.com>
77
*/
88

9-
#include <linux/of.h>
10-
#include <linux/of_platform.h>
11-
129
#include <asm/mach/arch.h>
1310
#include <asm/system_misc.h>
1411

1512
#include "generic.h"
1613

17-
static void __init at91sam9_init(void)
18-
{
19-
of_platform_default_populate(NULL, NULL, NULL);
20-
}
21-
2214
static const char *const at91_dt_board_compat[] __initconst = {
2315
"atmel,at91sam9",
2416
NULL
@@ -27,6 +19,5 @@ static const char *const at91_dt_board_compat[] __initconst = {
2719
DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM9")
2820
/* Maintainer: Atmel */
2921
.init_late = at91sam9_pm_init,
30-
.init_machine = at91sam9_init,
3122
.dt_compat = at91_dt_board_compat,
3223
MACHINE_END

arch/arm/mach-at91/sam9x60.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,11 @@
77
* Author: Claudiu Beznea <claudiu.beznea@microchip.com>
88
*/
99

10-
#include <linux/of.h>
11-
#include <linux/of_platform.h>
12-
1310
#include <asm/mach/arch.h>
1411
#include <asm/system_misc.h>
1512

1613
#include "generic.h"
1714

18-
static void __init sam9x60_init(void)
19-
{
20-
of_platform_default_populate(NULL, NULL, NULL);
21-
}
22-
2315
static const char *const sam9x60_dt_board_compat[] __initconst = {
2416
"microchip,sam9x60",
2517
NULL
@@ -28,6 +20,5 @@ static const char *const sam9x60_dt_board_compat[] __initconst = {
2820
DT_MACHINE_START(sam9x60_dt, "Microchip SAM9X60")
2921
/* Maintainer: Microchip */
3022
.init_late = sam9x60_pm_init,
31-
.init_machine = sam9x60_init,
3223
.dt_compat = sam9x60_dt_board_compat,
3324
MACHINE_END

arch/arm/mach-at91/sam9x7.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,10 @@
77
* Author: Varshini Rajendran <varshini.rajendran@microchip.com>
88
*/
99

10-
#include <linux/of.h>
11-
#include <linux/of_platform.h>
12-
1310
#include <asm/mach/arch.h>
1411

1512
#include "generic.h"
1613

17-
static void __init sam9x7_init(void)
18-
{
19-
of_platform_default_populate(NULL, NULL, NULL);
20-
}
21-
2214
static const char * const sam9x7_dt_board_compat[] __initconst = {
2315
"microchip,sam9x7",
2416
NULL
@@ -27,6 +19,5 @@ static const char * const sam9x7_dt_board_compat[] __initconst = {
2719
DT_MACHINE_START(sam9x7_dt, "Microchip SAM9X7")
2820
/* Maintainer: Microchip */
2921
.init_late = sam9x7_pm_init,
30-
.init_machine = sam9x7_init,
3122
.dt_compat = sam9x7_dt_board_compat,
3223
MACHINE_END

arch/arm/mach-at91/sama5.c

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
* 2013 Ludovic Desroches <ludovic.desroches@atmel.com>
77
*/
88

9-
#include <linux/of.h>
10-
#include <linux/of_platform.h>
11-
129
#include <asm/hardware/cache-l2x0.h>
1310
#include <asm/mach/arch.h>
1411
#include <asm/mach/map.h>
@@ -30,11 +27,6 @@ static void __init sama5_secure_cache_init(void)
3027
outer_cache.write_sec = sama5_l2c310_write_sec;
3128
}
3229

33-
static void __init sama5_dt_device_init(void)
34-
{
35-
of_platform_default_populate(NULL, NULL, NULL);
36-
}
37-
3830
static const char *const sama5_dt_board_compat[] __initconst = {
3931
"atmel,sama5",
4032
NULL
@@ -43,7 +35,6 @@ static const char *const sama5_dt_board_compat[] __initconst = {
4335
DT_MACHINE_START(sama5_dt, "Atmel SAMA5")
4436
/* Maintainer: Atmel */
4537
.init_late = sama5_pm_init,
46-
.init_machine = sama5_dt_device_init,
4738
.dt_compat = sama5_dt_board_compat,
4839
MACHINE_END
4940

@@ -54,25 +45,18 @@ static const char *const sama5_alt_dt_board_compat[] __initconst = {
5445

5546
DT_MACHINE_START(sama5_alt_dt, "Atmel SAMA5")
5647
/* Maintainer: Atmel */
57-
.init_machine = sama5_dt_device_init,
5848
.init_late = sama5_pm_init,
5949
.dt_compat = sama5_alt_dt_board_compat,
6050
.l2c_aux_mask = ~0UL,
6151
MACHINE_END
6252

63-
static void __init sama5d2_init(void)
64-
{
65-
of_platform_default_populate(NULL, NULL, NULL);
66-
}
67-
6853
static const char *const sama5d2_compat[] __initconst = {
6954
"atmel,sama5d2",
7055
NULL
7156
};
7257

7358
DT_MACHINE_START(sama5d2, "Atmel SAMA5")
7459
/* Maintainer: Atmel */
75-
.init_machine = sama5d2_init,
7660
.init_early = sama5_secure_cache_init,
7761
.init_late = sama5d2_pm_init,
7862
.dt_compat = sama5d2_compat,

arch/arm/mach-at91/sama7.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,11 @@
66
*
77
*/
88

9-
#include <linux/of.h>
10-
#include <linux/of_platform.h>
11-
129
#include <asm/mach/arch.h>
1310
#include <asm/system_misc.h>
1411

1512
#include "generic.h"
1613

17-
static void __init sama7_dt_device_init(void)
18-
{
19-
of_platform_default_populate(NULL, NULL, NULL);
20-
}
21-
2214
static const char *const sama7_dt_board_compat[] __initconst = {
2315
"microchip,sama7",
2416
NULL
@@ -27,7 +19,6 @@ static const char *const sama7_dt_board_compat[] __initconst = {
2719
DT_MACHINE_START(sama7_dt, "Microchip SAMA7")
2820
/* Maintainer: Microchip */
2921
.init_late = sama7_pm_init,
30-
.init_machine = sama7_dt_device_init,
3122
.dt_compat = sama7_dt_board_compat,
3223
MACHINE_END
3324

0 commit comments

Comments
 (0)