[PATCH v2 3/3] ARM: at91: remove unnecessary of_platform_default_populate calls
Rob Herring (Arm)
robh at kernel.org
Thu Nov 20 13:37:52 PST 2025
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.
Cc: Nicolas Ferre <nicolas.ferre at microchip.com>
Cc: Alexandre Belloni <alexandre.belloni at bootlin.com>
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Rob Herring (Arm) <robh at kernel.org>
---
v2:
- Dust off and rebase to 6.18-rc1
- Add new platforms added since v1
---
arch/arm/mach-at91/at91rm9200.c | 9 ---------
arch/arm/mach-at91/at91sam9.c | 9 ---------
arch/arm/mach-at91/sam9x60.c | 9 ---------
arch/arm/mach-at91/sam9x7.c | 9 ---------
arch/arm/mach-at91/sama5.c | 19 ++-----------------
arch/arm/mach-at91/sama7.c | 8 --------
6 files changed, 2 insertions(+), 61 deletions(-)
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c
index 2ac564eb8bbb..d15997fff5d7 100644
--- a/arch/arm/mach-at91/at91rm9200.c
+++ b/arch/arm/mach-at91/at91rm9200.c
@@ -7,18 +7,10 @@
* 2012 Joachim Eastwood <manabian at gmail.com>
*/
-#include <linux/of.h>
-#include <linux/of_platform.h>
-
#include <asm/mach/arch.h>
#include "generic.h"
-static void __init at91rm9200_dt_device_init(void)
-{
- of_platform_default_populate(NULL, NULL, NULL);
-}
-
static const char *const at91rm9200_dt_board_compat[] __initconst = {
"atmel,at91rm9200",
NULL
@@ -26,6 +18,5 @@ 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 cf07cba4ee5d..b9d2909d1b65 100644
--- a/arch/arm/mach-at91/at91sam9.c
+++ b/arch/arm/mach-at91/at91sam9.c
@@ -6,19 +6,11 @@
* 2011 Nicolas Ferre <nicolas.ferre at atmel.com>
*/
-#include <linux/of.h>
-#include <linux/of_platform.h>
-
#include <asm/mach/arch.h>
#include <asm/system_misc.h>
#include "generic.h"
-static void __init at91sam9_init(void)
-{
- of_platform_default_populate(NULL, NULL, NULL);
-}
-
static const char *const at91_dt_board_compat[] __initconst = {
"atmel,at91sam9",
NULL
@@ -27,6 +19,5 @@ 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 a31beaaeffcd..744bab2cbb92 100644
--- a/arch/arm/mach-at91/sam9x60.c
+++ b/arch/arm/mach-at91/sam9x60.c
@@ -7,19 +7,11 @@
* Author: Claudiu Beznea <claudiu.beznea at microchip.com>
*/
-#include <linux/of.h>
-#include <linux/of_platform.h>
-
#include <asm/mach/arch.h>
#include <asm/system_misc.h>
#include "generic.h"
-static void __init sam9x60_init(void)
-{
- of_platform_default_populate(NULL, NULL, NULL);
-}
-
static const char *const sam9x60_dt_board_compat[] __initconst = {
"microchip,sam9x60",
NULL
@@ -28,6 +20,5 @@ 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 0c73f7fefd4f..166c8625509d 100644
--- a/arch/arm/mach-at91/sam9x7.c
+++ b/arch/arm/mach-at91/sam9x7.c
@@ -7,18 +7,10 @@
* Author: Varshini Rajendran <varshini.rajendran at microchip.com>
*/
-#include <linux/of.h>
-#include <linux/of_platform.h>
-
#include <asm/mach/arch.h>
#include "generic.h"
-static void __init sam9x7_init(void)
-{
- of_platform_default_populate(NULL, NULL, NULL);
-}
-
static const char * const sam9x7_dt_board_compat[] __initconst = {
"microchip,sam9x7",
NULL
@@ -27,6 +19,5 @@ 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 efae697ce29c..e56022f00800 100644
--- a/arch/arm/mach-at91/sama5.c
+++ b/arch/arm/mach-at91/sama5.c
@@ -6,9 +6,6 @@
* 2013 Ludovic Desroches <ludovic.desroches at atmel.com>
*/
-#include <linux/of.h>
-#include <linux/of_platform.h>
-
#include <asm/hardware/cache-l2x0.h>
#include <asm/mach/arch.h>
#include <asm/mach/map.h>
@@ -30,11 +27,6 @@ static void __init sama5_secure_cache_init(void)
outer_cache.write_sec = sama5_l2c310_write_sec;
}
-static void __init sama5_dt_device_init(void)
-{
- of_platform_default_populate(NULL, NULL, NULL);
-}
-
static const char *const sama5_dt_board_compat[] __initconst = {
"atmel,sama5",
NULL
@@ -43,7 +35,6 @@ 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
@@ -54,17 +45,11 @@ 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
-static void __init sama5d2_init(void)
-{
- of_platform_default_populate(NULL, NULL, NULL);
- sama5d2_pm_init();
-}
-
static const char *const sama5d2_compat[] __initconst = {
"atmel,sama5d2",
NULL
@@ -72,8 +57,8 @@ static const char *const sama5d2_compat[] __initconst = {
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 3e28727f2a8e..f56828d61199 100644
--- a/arch/arm/mach-at91/sama7.c
+++ b/arch/arm/mach-at91/sama7.c
@@ -6,18 +6,11 @@
*
*/
-#include <linux/of.h>
-#include <linux/of_platform.h>
-
#include <asm/mach/arch.h>
#include <asm/system_misc.h>
#include "generic.h"
-static void __init sama7_dt_device_init(void)
-{
- of_platform_default_populate(NULL, NULL, NULL);
-
static const char *const sama7_dt_board_compat[] __initconst = {
"microchip,sama7",
NULL
@@ -26,7 +19,6 @@ 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
--
2.51.0
More information about the linux-mtd
mailing list