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+YAGNkFAmrOSTwACgkQmmx57+YA
 GNn9yA/8C7ttYVFkDxnnENeljwoEBZPY8aMgy39kqIO4b4V+EvQF8XvtL1czpeCs
 tSCxGJ2bOweJc0DLqeok2AwRkthxBTRZ+lWmUD9XwFA0bVtbNHicc4e4sj3KXRny
 YgXo9NQ/fXd6YKyBl1XJr+ExDzJZ4X8t5JEJ8nx84GMptl/rmI8pPAJegzl54KU8
 7cA18nXt6TLh8q836Jmm4fRri/oO4hxTaeVeBvS+CeAt513Wa+2GH1nSBgOsWAVP
 t4jcg28631WI5X82ubeqyYGmRg3HJW8dP8IzbE8SOoCVX4gREkzQSqDF/WHRPbdx
 e8nm0JY6LYxZeR6xgzf93ECF1ZQDjbHod3Xbf2dts1O8/CHf2oP/pZzfyJp1u9lY
 sN7OZQEUVhM1wZswQgNZrFyW4yWRdYozT2aWmoD01eOpdePPHjRRxMfm3gZBvoH3
 7MJouvZu8cnu3AScagrSoop+Pb2rgugX4z3lgMJuToKWXjiJgczsFSbyOsNtykYx
 TOrLOVwTJ5RN/eA9uNMJLYiwBnRtNynmOio1qPw/l2+HaDi+cnn8gtxiqmEq96xY
 zXsx3qViKfq19FdDtB7fUlYY6ut+0efb90bO4sVEm2Z8H9iU5/buJ8sJG71pDFcK
 KYf2b2xORMMCk9kLpCEco1Hyl199f57UNSMB1FtNJThA2CjrV4M=
 =npmh
 -----END PGP SIGNATURE-----

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

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

# -----BEGIN PGP SIGNATURE-----
#
# iHUEABYKAB0WIQTsZ8eserC1pmhwqDmejrg/N2X7/QUCasf/xwAKCRCejrg/N2X7
# /b8EAP9CXM18J/eV6Evhyg9FN0z0ol1+PNNPCc7WvzNytfELKQD/Y/qaqWmRKIoh
# 0ART3i3D7843g9xrPci5djL0eGK17Aw=
# =Cpyo
# -----END PGP SIGNATURE-----
# gpg: Signature made Do 08 Okt 2026 22:40:39 CEST
# gpg:                using EDDSA key EC67C7AC7AB0B5A66870A8399E8EB83F3765FBFD
# gpg: Can't check signature: No public key

* 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__
This commit is contained in:
Arnd Bergmann 2026-10-13 17:07:40 +02:00
commit 6b2aacd265
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);