diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2025-09-23 23:04:23 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2025-09-23 23:04:25 +0200 |
| commit | 1cdfe53d5798cbad2a1e67a108e8b3a4ef08edfb (patch) | |
| tree | 3d2f8fce14184f8986e5248b7133c59c753156b1 /arch/arm/mach-at91/pm.c | |
| parent | 9685b2975972640a98f682462ea0741757c13294 (diff) | |
| parent | 747436750bc0ef73be32391bd5d0d7dcd185da7f (diff) | |
Merge tag 'at91-soc-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/arm
Microchip arm-soc updates for v6.18
This update includes:
- low priority fixes to the PM code, in relation to recent addition of
sam9x75 or sama7d65 SoCs
- removal of the 2.5V regulator for low power modes since this is
no longer supported
* tag 'at91-soc-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
ARM: at91: pm: Remove 2.5V regulator
ARM: at91: pm: save and restore ACR during PLL disable/enable
ARM: at91: pm: fix MCKx restore routine
ARM: at91: pm: fix .uhp_udp_mask specification for current SoCs
Link: https://lore.kernel.org/r/20250916150328.27015-1-nicolas.ferre@microchip.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-at91/pm.c')
| -rw-r--r-- | arch/arm/mach-at91/pm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c index 3aa20038ad93..35058b99069c 100644 --- a/arch/arm/mach-at91/pm.c +++ b/arch/arm/mach-at91/pm.c @@ -1364,7 +1364,7 @@ static const struct pmc_info pmc_infos[] __initconst = { .version = AT91_PMC_V1, }, { - .uhp_udp_mask = AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP, + .uhp_udp_mask = AT91SAM926x_PMC_UHP, .mckr = 0x28, .version = AT91_PMC_V2, }, |