diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-10-08 21:19:21 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-10-08 21:19:21 +0200 |
| commit | ee48874d4aa50d9c4921b44a38dc33110b90638b (patch) | |
| tree | 6cc7f4d2de006f5f44110f805fb92db975b4637b /arch/arm | |
| parent | 4394a0014597bd53e2d9bbc69d091e3fbde7d00c (diff) | |
| parent | d4ac2cfea724d3874ce3f1f624bcd40e78b1a9d4 (diff) | |
| download | blackbird-op-linux-ee48874d4aa50d9c4921b44a38dc33110b90638b.tar.gz blackbird-op-linux-ee48874d4aa50d9c4921b44a38dc33110b90638b.zip | |
Merge tag 'meson-wdt-dt-3.18' of https://github.com/carlocaione/linux-meson into next/dt
Merge "Meson6 WDT support" from Carlo Caione:
This patch adds the support for the Meson6 watchdog in the DTSI
* tag 'meson-wdt-dt-3.18' of https://github.com/carlocaione/linux-meson:
ARM: DTS: meson: update DTSI to add watchdog node
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/meson.dtsi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/meson.dtsi b/arch/arm/boot/dts/meson.dtsi index 55feb14a333d..e6539ea5a711 100644 --- a/arch/arm/boot/dts/meson.dtsi +++ b/arch/arm/boot/dts/meson.dtsi @@ -70,6 +70,11 @@ #size-cells = <1>; ranges; + wdt: watchdog@c1109900 { + compatible = "amlogic,meson6-wdt"; + reg = <0xc1109900 0x8>; + }; + uart_AO: serial@c81004c0 { compatible = "amlogic,meson-uart"; reg = <0xc81004c0 0x14>; |
