Skip to contentSkip to conversation

ARM: dts: meson8b: use the existing wdt node to override the compatible

PATCH New Martin Blumenstingl 2 participants 2 messages Jul 11, 2017 – Jul 28, 2017

Subsystems (2)
lore
Share & tools
lore

Martin Blumenstingl

author reviewer
#0 lore raw

PATCH 1/1 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.

---
 arch/arm/boot/dts/meson8b.dtsi | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)
arch/arm/boot/dts/meson8b.dtsi +4 -6
index 65b36c944b45..8fce13844b0c 100644
@@ -136,12 +136,6 @@
 		status = "disabled";
 	};
 
-	wdt: watchdog at 9900 {
-		compatible = "amlogic,meson8b-wdt";
-		reg = <0x9900 0x8>;
-		interrupts = <0 0 1>;
-	};
-
 	pinctrl_cbus: pinctrl at 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";
+};
Signature · 1 line
2.13.2
maintainer Applied
#1 lore raw

PATCH 1/1 ARM: dts: meson8b: use the existing wdt node to override the compatible

Quoted 8 lines · Martin Blumenstingl

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.

Applied to v4.14/dt,

Thanks,

Kevin