diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-06-21 15:15:10 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-06-21 15:15:14 +0200 |
| commit | ee44484c12edcf9ad81c816d383f28b63c712fdb (patch) | |
| tree | 2e0f6259daf3a2b4e00ee408baf5fd69c49700ae /arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | |
| parent | d8ece8b832276756d32c310fdd76835f8046071a (diff) | |
| parent | 33c01ff3b1003aea11288f2bf7924ada5b5b8327 (diff) | |
Merge tag 'at91-dt-6.5-2' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/dt
AT91 DT for 6.5 #2
It contains:
- generic names for shutdown controller nodes
- enablement of DT overlay support for some AT91 boards
- fix reset and SPI CS for lan966x-kontron-kswitch-d10-mmt based boards
- addition of PHY interrupts for lan966x-kontron-kswitch-d10-mmt-8g
board
* tag 'at91-dt-6.5-2' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
ARM: dts: lan966x: kontron-d10: add PHY interrupts
ARM: dts: lan966x: kontron-d10: fix SPI CS
ARM: dts: lan966x: kontron-d10: fix board reset
ARM: dts: at91: Enable device-tree overlay support for AT91 boards
ARM: dts: at91: use generic name for shutdown controller
Link: https://lore.kernel.org/r/20230621093853.1575312-1-claudiu.beznea@microchip.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/at91-sama5d27_som1_ek.dts')
| -rw-r--r-- | arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts index 52ddd0571f1c..d0a6dbd377df 100644 --- a/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts +++ b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts @@ -139,7 +139,7 @@ }; }; - shdwc@f8048010 { + poweroff@f8048010 { debounce-delay-us = <976>; atmel,wakeup-rtc-timer; |