From: Martin Blumenstingl Date: Tue, 11 Jul 2017 22:22:22 +0000 (+0200) Subject: ARM: dts: meson8b: use the existing wdt node to override the compatible X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2eca2a161ae163c3c4bc3f6dda6339c9f8bc71bd;p=linux.git 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 Signed-off-by: Kevin Hilman --- diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi index 65b36c944b45f..8fce13844b0cc 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"; +};