diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2022-07-06 14:42:46 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2022-07-06 14:42:46 +0300 |
| commit | 5b98b4021e1ca272e5a70ec58ee20e07e25f41f2 (patch) | |
| tree | 4fa5e6ae9a4fc6fdac4b4139c9904e2ea9ceff1f /arch/arm/boot/dts/sam9x60.dtsi | |
| parent | 11303e4e4c0e62ea3fb08d4922297fa71fa04222 (diff) | |
| parent | 4dd1a613e464e9036d5163fc8ec5f7dc6e394b53 (diff) | |
| download | linux-5b98b4021e1ca272e5a70ec58ee20e07e25f41f2.tar.xz | |
Merge tag 'at91-dt-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/dt
AT91 DT for v5.20
It contains:
- compilation warning fixes for SAMA5D2
- updates for all AT91 device tree to use generic name for reset
controller
- reset controller node for SAMA7G5
- MCAN1 and UDPHS nodes for LAN966 SoCs
- Flexcom3 bindings were updated for lan966x-pcb8291.dts board to cope
with reality
* tag 'at91-dt-5.20' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux:
ARM: dts: lan966x: Add UDPHS support
dt-bindings: usb: atmel: Add Microchip LAN9662 compatible string
ARM: dts: lan966x: Cleanup flexcom3 usart pinctrl settings.
ARM: dts: lan966x: Add mcan1 node.
ARM: dts: at91: sama7g5: add reset-controller node
ARM: dts: at91: use generic name for reset controller
ARM: dts: at91: sama5d2: fix compilation warning
ARM: dts: at91: sama5d2: fix compilation warning
Link: https://lore.kernel.org/r/20220705084637.818216-1-claudiu.beznea@microchip.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/sam9x60.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/sam9x60.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sam9x60.dtsi b/arch/arm/boot/dts/sam9x60.dtsi index a0e21022dbc5..d3f60f6a456d 100644 --- a/arch/arm/boot/dts/sam9x60.dtsi +++ b/arch/arm/boot/dts/sam9x60.dtsi @@ -667,7 +667,7 @@ clock-names = "td_slck", "md_slck", "main_xtal"; }; - reset_controller: rstc@fffffe00 { + reset_controller: reset-controller@fffffe00 { compatible = "microchip,sam9x60-rstc"; reg = <0xfffffe00 0x10>; clocks = <&clk32k 0>; |