github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-26 16:12:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Microchip AT91 SoC updates for v6.20

Browse Source 
This update includes:
 - drop the use of of_platform_default_populate() from the
   machine specific code, as it is already handled by the DT core
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYKAB0WIQTsZ8eserC1pmhwqDmejrg/N2X7/QUCaXSQZwAKCRCejrg/N2X7
 /TjtAPsHUI7hPm8xBuoK0edLsbGCUIFIsIqQOJF+cmSMEVPR0QD9E5Y20x+C4yfL
 vouBeu20N2MJj8iCU8RR/c9fqWyqZwQ=
 =DFnK
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAml7IqgACgkQmmx57+YA
 GNkvxQ/+Jadabu0F1An2VSkozPXOQTcK4GFHibHWbvc5Isu2lp8UQYz5SSgswZhb
 JI1uU7+dAgnK/rEZcNBqahkn/u1oU1wQz7E7hEbvcF/+NwcHm3bkEHVKqi3oHlwC
 x/8f6+Xrja6pbFHVrlMHIwK+dS6BBwsGfVTuYkjNGouDcvOd59BAFxQ6OF71W0S6
 47f74CMWAixR3LH/pL2lHIVVgKjlWpQWYzBa2/2WeCN2ooAaP8ygpi9sLLTbwCAq
 RNBlaOlo/wrJP4vk77iVVVXQyVI/+PDzHKaLnYIl4fRrxjUPh1aH33WJhN//0Ja2
 x7w6llZBj/UembUZyxLLCbAdHszdS4OZ++3rsmLhTDHCm+P1Pz3HmRS5jPMa/K5C
 GScJmk8bwHVhY3JTJpYLHZXrTKzZrZ6StP/pBlvKvepgzhSn2YTgTTDLT/54YpvL
 RmilvlJHiiaRHD+vlulV2uYaOHh9y45n4xIrvsfBf6FXr5jGIa2kwaFBVVnx+3r0
 JHtZBiiYDYqCwnSh8bUS0k5Ey5lwy+Xi/PwmyGYUwV/f/RxC4Gtb0bKAA2VKzx5i
 SRMB9unnlOIPFwto1SuMjuB06Yh0kgNYzX30QL/7Y/h+tBIs8OeSYAKzazeZgYTE
 fWI2x2tdrsFlcewzrRowUaz8KGcvAeMj7Or17yPcurMjN+6sKBo=
 =LuV6
 -----END PGP SIGNATURE-----

Merge tag 'at91-soc-6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/arm

Microchip AT91 SoC updates for v6.20

This update includes:
- drop the use of of_platform_default_populate() from the
  machine specific code, as it is already handled by the DT core

* tag 'at91-soc-6.20' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  ARM: at91: remove unnecessary of_platform_default_populate calls
  ARM: at91: Move PM init functions to .init_late hook

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2026-01-29 10:03:43 +01:00
commit 0294324427
6 changed files with 8 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arch/arm/mach-at91/at91rm9200.c
View File

@ -7,26 +7,16 @@
* 2012 Joachim Eastwood <manabian@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);
at91rm9200_pm_init();
}
static const char *const at91rm9200_dt_board_compat[] __initconst = {
"atmel,at91rm9200",
NULL
};
DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200")
.init_machine = at91rm9200_dt_device_init,
.init_late = at91rm9200_pm_init,
.dt_compat = at91rm9200_dt_board_compat,
MACHINE_END

12
arch/arm/mach-at91/at91sam9.c
View File

@ -6,21 +6,11 @@
* 2011 Nicolas Ferre <nicolas.ferre@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);
at91sam9_pm_init();
}
static const char *const at91_dt_board_compat[] __initconst = {
"atmel,at91sam9",
NULL
@ -28,6 +18,6 @@ static const char *const at91_dt_board_compat[] __initconst = {
DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM9")
/* Maintainer: Atmel */
.init_machine = at91sam9_init,
.init_late = at91sam9_pm_init,
.dt_compat = at91_dt_board_compat,
MACHINE_END

12
arch/arm/mach-at91/sam9x60.c
View File

@ -7,21 +7,11 @@
* Author: Claudiu Beznea <claudiu.beznea@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);
sam9x60_pm_init();
}
static const char *const sam9x60_dt_board_compat[] __initconst = {
"microchip,sam9x60",
NULL
@ -29,6 +19,6 @@ static const char *const sam9x60_dt_board_compat[] __initconst = {
DT_MACHINE_START(sam9x60_dt, "Microchip SAM9X60")
/* Maintainer: Microchip */
.init_machine = sam9x60_init,
.init_late = sam9x60_pm_init,
.dt_compat = sam9x60_dt_board_compat,
MACHINE_END

12
arch/arm/mach-at91/sam9x7.c
View File

@ -7,20 +7,10 @@
* Author: Varshini Rajendran <varshini.rajendran@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);
sam9x7_pm_init();
}
static const char * const sam9x7_dt_board_compat[] __initconst = {
"microchip,sam9x7",
NULL
@ -28,6 +18,6 @@ static const char * const sam9x7_dt_board_compat[] __initconst = {
DT_MACHINE_START(sam9x7_dt, "Microchip SAM9X7")
/* Maintainer: Microchip */
.init_machine = sam9x7_init,
.init_late = sam9x7_pm_init,
.dt_compat = sam9x7_dt_board_compat,
MACHINE_END

21
arch/arm/mach-at91/sama5.c
View File

@ -6,9 +6,6 @@
* 2013 Ludovic Desroches <ludovic.desroches@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,12 +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);
sama5_pm_init();
}
static const char *const sama5_dt_board_compat[] __initconst = {
"atmel,sama5",
NULL
@ -43,7 +34,7 @@ static const char *const sama5_dt_board_compat[] __initconst = {
DT_MACHINE_START(sama5_dt, "Atmel SAMA5")
/* Maintainer: Atmel */
.init_machine = sama5_dt_device_init,
.init_late = sama5_pm_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

11
arch/arm/mach-at91/sama7.c
View File

@ -6,20 +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);
sama7_pm_init();
}
static const char *const sama7_dt_board_compat[] __initconst = {
"microchip,sama7",
NULL
@ -27,7 +18,7 @@ static const char *const sama7_dt_board_compat[] __initconst = {
DT_MACHINE_START(sama7_dt, "Microchip SAMA7")
/* Maintainer: Microchip */
.init_machine = sama7_dt_device_init,
.init_late = sama7_pm_init,
.dt_compat = sama7_dt_board_compat,
MACHINE_END