diff options
| author | Martin Blumenstingl <martin.blumenstingl@googlemail.com> | 2017-07-12 00:22:22 +0200 |
|---|---|---|
| committer | Kevin Hilman <khilman@baylibre.com> | 2017-07-28 09:47:09 -0700 |
| commit | 2eca2a161ae163c3c4bc3f6dda6339c9f8bc71bd (patch) | |
| tree | 402170e6dfd262a34c9d3202c13ab4ab4a75be88 /arch/arm/boot/dts/meson8b.dtsi | |
| parent | 43d91c587fc07da5e007d8e0c9cfa1371dab0a11 (diff) | |
ARM: dts: meson8b: use the existing wdt node to override the compatible
Meson8b has to define it's own compatible string for the watchdog. This
patch removes the duplicate resource (register region and interrupt)
definition from meson8b.dtsi and simply re-uses these values from
meson.dtsi (as the register offset, size and interrupt are identical).
This is purely cosmetic and does not change any functionality.
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Diffstat (limited to 'arch/arm/boot/dts/meson8b.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/meson8b.dtsi | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi index 65b36c944b45..8fce13844b0c 100644 --- a/arch/arm/boot/dts/meson8b.dtsi +++ b/arch/arm/boot/dts/meson8b.dtsi @@ -136,12 +136,6 @@ status = "disabled"; }; - wdt: watchdog@9900 { - compatible = "amlogic,meson8b-wdt"; - reg = <0x9900 0x8>; - interrupts = <0 0 1>; - }; - pinctrl_cbus: pinctrl@9880 { compatible = "amlogic,meson8b-cbus-pinctrl"; reg = <0x9880 0x10>; @@ -236,3 +230,7 @@ clock-names = "usb_general", "usb"; resets = <&reset RESET_USB_OTG>; }; + +&wdt { + compatible = "amlogic,meson8b-wdt"; +}; |