From fcac34d01d823489cbb846ca9afc9218b0de75f2 Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Sun, 27 Jan 2019 13:21:06 +0100 Subject: [PATCH] lantiq: dts: drop superfluous unit address The cpu temperature driver has the register offset hardcode and doesn't need a reg. The mdio bus node is only used as a well known name and doesn't need a reg or unit address. syscon-reboot doesn't have a unit address or a reg either. The unit name collides with reset-controller@10 anyway. Signed-off-by: Mathias Kresin --- .../files/arch/mips/boot/dts/ARV7519RW22.dts | 3 +-- .../files/arch/mips/boot/dts/ASL56026.dts | 3 +-- .../files/arch/mips/boot/dts/BTHOMEHUBV5A.dts | 3 +-- .../lantiq/files/arch/mips/boot/dts/DM200.dts | 3 +-- .../files/arch/mips/boot/dts/EASY80920.dtsi | 3 +-- .../arch/mips/boot/dts/FRITZ3370-REV2.dtsi | 3 +-- .../files/arch/mips/boot/dts/FRITZ7312.dts | 1 - .../files/arch/mips/boot/dts/FRITZ736X.dtsi | 3 +-- .../files/arch/mips/boot/dts/FRITZ7412.dts | 3 +-- .../files/arch/mips/boot/dts/P2812HNUFX.dtsi | 3 +-- .../files/arch/mips/boot/dts/TDW89X0.dtsi | 3 +-- .../files/arch/mips/boot/dts/VG3503J.dts | 3 +-- .../files/arch/mips/boot/dts/VGV7510KW22.dtsi | 3 +-- .../files/arch/mips/boot/dts/VGV7519.dtsi | 3 +-- .../files/arch/mips/boot/dts/VR200.dtsi | 3 +-- .../files/arch/mips/boot/dts/WBMR300.dts | 3 +-- .../files/arch/mips/boot/dts/amazonse.dtsi | 17 ++++++++--------- .../lantiq/files/arch/mips/boot/dts/ar9.dtsi | 17 ++++++++--------- .../files/arch/mips/boot/dts/danube.dtsi | 17 ++++++++--------- .../lantiq/files/arch/mips/boot/dts/vr9.dtsi | 19 +++++++++---------- 20 files changed, 48 insertions(+), 68 deletions(-) diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts index deb7efa608..5540cbd1e3 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ARV7519RW22.dts @@ -138,11 +138,10 @@ }; }; - mdio@0 { + mdio { #address-cells = <1>; #size-cells = <0>; compatible = "lantiq,xrx200-mdio"; - reg = <0>; phy0: ethernet-phy@0 { reg = <0x0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ASL56026.dts b/target/linux/lantiq/files/arch/mips/boot/dts/ASL56026.dts index 84fab0e998..f24cb06061 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ASL56026.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ASL56026.dts @@ -96,11 +96,10 @@ }; }; - mdio@0 { + mdio { #address-cells = <1>; #size-cells = <0>; compatible = "lantiq,xrx200-mdio"; - reg = <0>; phy11: ethernet-phy@11 { reg = <0x11>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts index eacdc2f3c4..a717ca89d9 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/BTHOMEHUBV5A.dts @@ -158,11 +158,10 @@ }; }; - mdio@0 { + mdio { #address-cells = <1>; #size-cells = <0>; compatible = "lantiq,xrx200-mdio"; - reg = <0>; phy0: ethernet-phy@0 { reg = <0x0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts b/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts index 05e3010633..6546d396a6 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/DM200.dts @@ -104,11 +104,10 @@ }; }; - mdio@0 { + mdio { #address-cells = <1>; #size-cells = <0>; compatible = "lantiq,xrx200-mdio"; - reg = <0>; phy13: ethernet-phy@13 { reg = <0x13>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi index 51b9f885fe..691e2737dd 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/EASY80920.dtsi @@ -146,11 +146,10 @@ }; }; - mdio@0 { + mdio { #address-cells = <1>; #size-cells = <0>; compatible = "lantiq,xrx200-mdio"; - reg = <0>; phy0: ethernet-phy@0 { reg = <0x0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi index e5fd41e44f..72e39d742c 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ3370-REV2.dtsi @@ -155,11 +155,10 @@ }; }; - mdio@0 { + mdio { #address-cells = <1>; #size-cells = <0>; compatible = "lantiq,xrx200-mdio"; - reg = <0>; phy0: ethernet-phy@0 { reg = <0x0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7312.dts b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7312.dts index ecc4a13344..aa9ee8a890 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7312.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7312.dts @@ -122,7 +122,6 @@ mdio-bus { #address-cells = <1>; #size-cells = <0>; - reg = <0>; phy0: ethernet-phy@0 { reg = <0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ736X.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ736X.dtsi index c1ed9f19fc..82546a3572 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ736X.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ736X.dtsi @@ -113,11 +113,10 @@ }; }; - mdio@0 { + mdio { #address-cells = <1>; #size-cells = <0>; compatible = "lantiq,xrx200-mdio"; - reg = <0>; phy0: ethernet-phy@0 { reg = <0x00>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts index 7a6e5a0c5f..98d2992d3a 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/FRITZ7412.dts @@ -213,10 +213,9 @@ }; }; - mdio@0 { + mdio { #address-cells = <1>; #size-cells = <0>; - reg = <0>; compatible = "lantiq,xrx200-mdio"; phy11: ethernet-phy@11 { diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi index 5905568711..c51c6011ac 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/P2812HNUFX.dtsi @@ -153,11 +153,10 @@ }; }; - mdio@0 { + mdio { #address-cells = <1>; #size-cells = <0>; compatible = "lantiq,xrx200-mdio"; - reg = <0>; phy0: ethernet-phy@0 { reg = <0x0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi index 7fbf148e66..19c10b2b90 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/TDW89X0.dtsi @@ -140,11 +140,10 @@ }; }; - mdio@0 { + mdio { #address-cells = <1>; #size-cells = <0>; compatible = "lantiq,xrx200-mdio"; - reg = <0>; phy0: ethernet-phy@0 { reg = <0x0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts b/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts index 9ecac2cb67..cc3075ea36 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/VG3503J.dts @@ -80,11 +80,10 @@ }; }; - mdio@0 { + mdio { #address-cells = <1>; #size-cells = <0>; compatible = "lantiq,xrx200-mdio"; - reg = <0>; phy11: ethernet-phy@11 { reg = <0x11>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi index 3cdc54292f..f4ffa5c7e2 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7510KW22.dtsi @@ -149,11 +149,10 @@ }; }; - mdio@0 { + mdio { #address-cells = <1>; #size-cells = <0>; compatible = "lantiq,xrx200-mdio"; - reg = <0>; phy1: ethernet-phy@1 { reg = <0x1>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi index 3ca9bea58e..44ce2178cb 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/VGV7519.dtsi @@ -170,11 +170,10 @@ }; }; - mdio@0 { + mdio { #address-cells = <1>; #size-cells = <0>; compatible = "lantiq,xrx200-mdio"; - reg = <0>; phy0: ethernet-phy@0 { reg = <0x0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi index bf25d36a7c..2133f333a6 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/VR200.dtsi @@ -58,11 +58,10 @@ }; }; - mdio@0 { + mdio { #address-cells = <1>; #size-cells = <0>; compatible = "lantiq,xrx200-mdio"; - reg = <0>; phy0: ethernet-phy@0 { reg = <0x0>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts b/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts index 3ccc325b1f..bcee35fe97 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts +++ b/target/linux/lantiq/files/arch/mips/boot/dts/WBMR300.dts @@ -190,11 +190,10 @@ }; }; - mdio@0 { + mdio { #address-cells = <1>; #size-cells = <0>; compatible = "lantiq,xrx200-mdio"; - reg = <0>; phy11: ethernet-phy@11 { reg = <0x11>; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi index 1be842094b..53901753b9 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/amazonse.dtsi @@ -23,6 +23,14 @@ }; }; + reboot { + compatible = "syscon-reboot"; + + regmap = <&rcu0>; + offset = <0x10>; + mask = <0x40000000>; + }; + biu@1f800000 { #address-cells = <1>; #size-cells = <1>; @@ -96,15 +104,6 @@ reset-names = "ctrl"; #phy-cells = <0>; }; - - reboot@10 { - compatible = "syscon-reboot"; - reg = <0x10 4>; - - regmap = <&rcu0>; - offset = <0x10>; - mask = <0x40000000>; - }; }; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi index 637de57662..bb2b636452 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/ar9.dtsi @@ -23,6 +23,14 @@ }; }; + reboot { + compatible = "syscon-reboot"; + + regmap = <&rcu0>; + offset = <0x10>; + mask = <0x40000000>; + }; + biu@1f800000 { #address-cells = <1>; #size-cells = <1>; @@ -108,15 +116,6 @@ reset-names = "ctrl"; #phy-cells = <0>; }; - - reboot@10 { - compatible = "syscon-reboot"; - reg = <0x10 4>; - - regmap = <&rcu0>; - offset = <0x10>; - mask = <0x40000000>; - }; }; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi index ca89e949d1..bcb4cc2d4b 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/danube.dtsi @@ -23,6 +23,14 @@ }; }; + reboot { + compatible = "syscon-reboot"; + + regmap = <&rcu0>; + offset = <0x10>; + mask = <0x40000000>; + }; + biu@1f800000 { #address-cells = <1>; #size-cells = <1>; @@ -104,15 +112,6 @@ reset-names = "ctrl"; #phy-cells = <0>; }; - - reboot@10 { - compatible = "syscon-reboot"; - reg = <0x10 4>; - - regmap = <&rcu0>; - offset = <0x10>; - mask = <0x40000000>; - }; }; }; diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi index 6764082e9b..7867bcc88b 100644 --- a/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi +++ b/target/linux/lantiq/files/arch/mips/boot/dts/vr9.dtsi @@ -23,10 +23,18 @@ }; }; - cputemp@0 { + cputemp { compatible = "lantiq,cputemp"; }; + reboot { + compatible = "syscon-reboot"; + + regmap = <&rcu0>; + offset = <0x10>; + mask = <0xe0000000>; + }; + biu@1f800000 { #address-cells = <1>; #size-cells = <1>; @@ -147,15 +155,6 @@ reset-names = "phy", "ctrl"; #phy-cells = <0>; }; - - reboot@10 { - compatible = "syscon-reboot"; - reg = <0x10 4>; - - regmap = <&rcu0>; - offset = <0x10>; - mask = <0xe0000000>; - }; }; }; -- 2.30.2