diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2025-03-19 21:43:35 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2025-03-19 21:43:40 +0100 |
| commit | 3ef47a0436219359a0838d74bb353caa6aad3fc0 (patch) | |
| tree | f738ccb56a551304b1ed3d9d20d99904a30dff7e /arch/arm/boot/dts/microchip/animeo_ip.dts | |
| parent | fc7136e149e96c1563bccb51f7c30f6974749ec2 (diff) | |
| parent | 6aafec3d215f59e8c4b00d0c2a97988ed5edbb2a (diff) | |
Merge tag 'at91-dt-6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into soc/dt
Microchip AT91 device tree updates for v6.15
This update includes:
- more controllers enabled for SAMA7D65 SoC (DMA, reset controller,
shutdown controller, RTC, watchdog)
- power monitor device enabled for SAMA7D65 Curiosity board
- device tree cleanups
* tag 'at91-dt-6.15' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
ARM: dts: microchip: sama7g5: add ADC hw trigger edge type
ARM: dts: microchip: sama7d65: Add watchdog for sama7d65
ARM: dts: microchip: sama7d65: Enable shutdown controller
ARM: dts: microchip: sama7d65: Add SFRBU support to sama7d65
ARM: dts: microchip: sama7d65: Add RTC support for sama7d65
ARM: dts: microchip: sama7d65: Add Shutdown controller support
ARM: dts: microchip: sama7d65: Add Reset Controller to sama7d65 SoC
ARM: dts: microchip: fix faulty ohci/ehci node names
ARM: dts: microchip: usb_a9263: fix wrong vendor
ARM: dts: microchip: sama7d65: Enable DMAs
ARM: dts: microchip: sama7d65: Add DMAs to sama7d65 SoC
ARM: dts: microchip: sama7d65: Add chipID for sama7d65
ARM: dts: microchip: sama7d65_curiosity: Add power monitor support
ARM: dts: microchip: sama7d65: Add flexcom 10 node
ARM: dts: at91: usb_a9g20_lpw: use proper mmc node name
ARM: dts: at91: calao_usb: fix button nodes
ARM: dts: at91: use correct vendor name for Calao boards
ARM: dts: at91: calao_usb: remove heartbeat for User LEDs
ARM: dts: at91: calao_usb: fix wrong polarity for LED
Link: https://lore.kernel.org/r/20250312173755.975074-1-claudiu.beznea@tuxon.dev
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/microchip/animeo_ip.dts')
| -rw-r--r-- | arch/arm/boot/dts/microchip/animeo_ip.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/microchip/animeo_ip.dts b/arch/arm/boot/dts/microchip/animeo_ip.dts index 7f527622d3f2..c11f4f7dac94 100644 --- a/arch/arm/boot/dts/microchip/animeo_ip.dts +++ b/arch/arm/boot/dts/microchip/animeo_ip.dts @@ -136,7 +136,7 @@ }; }; - usb0: ohci@500000 { + usb0: usb@500000 { num-ports = <2>; atmel,vbus-gpio = <&pioB 15 GPIO_ACTIVE_LOW>; status = "okay"; |