]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
ARM: dts: meson8b: use the existing wdt node to override the compatible
authorMartin Blumenstingl <martin.blumenstingl@googlemail.com>
Tue, 11 Jul 2017 22:22:22 +0000 (00:22 +0200)
committerKevin Hilman <khilman@baylibre.com>
Fri, 28 Jul 2017 16:47:09 +0000 (09:47 -0700)
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>
arch/arm/boot/dts/meson8b.dtsi

index 65b36c944b45f2cfdef1b963a68c0d644dfe318c..8fce13844b0cc65b0789b241a5035308400eadd8 100644 (file)
                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>;
        clock-names = "usb_general", "usb";
        resets = <&reset RESET_USB_OTG>;
 };
+
+&wdt {
+       compatible = "amlogic,meson8b-wdt";
+};