github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Microchip AT91 SoC updates for v7.4

Browse Source 
This update includes:
 - replace __ASSEMBLY__ with __ASSEMBLER__ to avoid confusion
 - use of_machine_device_match() instead of open-coding it
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYKAB0WIQTsZ8eserC1pmhwqDmejrg/N2X7/QUCasf/xwAKCRCejrg/N2X7
 /b8EAP9CXM18J/eV6Evhyg9FN0z0ol1+PNNPCc7WvzNytfELKQD/Y/qaqWmRKIoh
 0ART3i3D7843g9xrPci5djL0eGK17Aw=
 =Cpyo
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmrOU4gACgkQmmx57+YA
 GNkFKhAAvUO8BMnrV+HKG74d16GocjdAzKjdzA/qcboBF/wcWx1Nit3wLeLQzjGR
 3j1mG58pq1ca8TJxbaRn8vAhS5LpWYAqXnteEIAV4LpLMpCx2UEYH8+fCDoXRNUe
 xRBQxDcavQBShFmoeCItwCVDeDUDBZEvZE9Jhkiw/1hOeO67sDcfeHmEO2nRPnBq
 uB2iza9SsUGcAjuF8ayDhOR610BCDhv4RF6a82swipra4tFbjY6tTj0zACCDBh0C
 oavdUs43Nt/06uURPdOwKKDNOfws7ng2NQMjGBkLrRhKJiKa3pmSGBXafY/A72eQ
 s22fEia0ff28D0Pg5Ppicu7T4N9Fa7khnXsjZJeT6O/SE5E8KSFojimb4A1Yvvl/
 lfztBcv3yZVFPy+1PidqCtLhjjXIC9O6CEuwpS4mgQBVo2mZw8okCEGFdcIpvNcj
 /eyokxIJyBgSI0qiqSGev+dkE8XH4JIYz5/U0YgVXfCo6meDvBKs3TkvMVKbGKW1
 rovN2OaJb+pH4Yv45qVXOpRtzCjZm6BfP39dhAqncItykA3SOYbzFcZTiEyEeYbw
 3jiG8V37QuxLtqLt3qHwaQCL2bNsnPBoxheQdIPiexIc2sOK2x3dMiG7lbIjFG61
 6I0T35VvnAI14IUDbBNeVNSonc094FYtIK4IsdA0RjqFRSWcP7M=
 =Ogp2
 -----END PGP SIGNATURE-----

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

Microchip AT91 SoC updates for v7.4

This update includes:
- replace __ASSEMBLY__ with __ASSEMBLER__ to avoid confusion
- use of_machine_device_match() instead of open-coding it

* tag 'at91-soc-7.4' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
  soc: atmel: Convert to of_machine_device_match()
  ARM: at91: Replace __ASSEMBLY__ with __ASSEMBLER__

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2026-10-13 17:18:32 +02:00
commit dfd4ce487c
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-at91/pm.h
View File

@ -25,7 +25,7 @@
#define AT91_PM_ULP1 0x03
#define AT91_PM_BACKUP 0x04
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLER__
struct at91_pm_data {
void __iomem *pmc;
void __iomem *ramc[2];

4
drivers/soc/atmel/soc.c
View File

@ -404,9 +404,7 @@ static const struct of_device_id at91_soc_allowed_list[] __initconst = {
static int __init atmel_soc_device_init(void)
{
struct device_node *np __free(device_node) = of_find_node_by_path("/");
if (!of_match_node(at91_soc_allowed_list, np))
if (!of_machine_device_match(at91_soc_allowed_list))
return 0;
at91_soc_init(socs);