arm64: dts: Remove leading 0x and 0s from bindings notation

PATCH Applied Mathieu Malaterre 6 participants 7 messages Dec 14, 2017 – Feb 22, 2018

Subsystems (5)

Device tree bindings Arm Qualcomm mailing list Arm MediaTek Arm Qualcomm support +1 more subsystems

lore

Share & tools

lore

Mathieu Malaterre

author

2017-12-14 16:53 UTC #0 lore raw

PATCH 1/1 arm64: dts: Remove leading 0x and 0s from bindings notation

Improve the DTS files by removing all the leading "0x" and zeros to fix the following dtc warnings:

Warning (unit_address_format): Node /XXX unit name should not have leading "0x"

and

Warning (unit_address_format): Node /XXX unit name should not have leading 0s

Converted using the following command:

find . -type f $ -iname *.dts -o -iname *.dtsi $ -exec sed -E -i -e "s/@0x([0-9a-fA-F\.]+)\s?\{/@\L\1 \{/g" -e "s/@0+([0-9a-fA-F\.]+)\s?\{/@\L\1 \{/g" {} +

For simplicity, two sed expressions were used to solve each warnings separately.

To make the regex expression more robust a few other issues were resolved, namely setting unit-address to lower case, and adding a whitespace before the the opening curly brace:

https://elinux.org/Device_Tree_Linux#Linux_conventions

This is a follow up to commit 4c9847b7375a ("dt-bindings: Remove leading 0x from bindings notation")

Reported-by David Daney <[email protected]>

Signed-off-by Mathieu Malaterre <[email protected]>

---
 arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 2 +-
 arch/arm64/boot/dts/mediatek/mt8173.dtsi       | 2 +-
 arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi   | 6 +++---
 arch/arm64/boot/dts/qcom/msm8996.dtsi          | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts +1 -1

index 3aee6123d161..3f5ff76109be 100644
@@ -51,7 +51,7 @@
 		#size-cells = <2>;
 		ranges;
 
-		ramoops@0x21f00000 {
+		ramoops@21f00000 {
 			compatible = "ramoops";
 			reg = <0x0 0x21f00000 0x0 0x00100000>;
 			record-size	= <0x00020000>;

arch/arm64/boot/dts/mediatek/mt8173.dtsi +1 -1

index 26396ef53bde..0446b122a6e2 100644
@@ -249,7 +249,7 @@
 			reg = <0 0x10005000 0 0x1000>;
 		};
 
-		pio: pinctrl@0x10005000 {
+		pio: pinctrl@10005000 {
 			compatible = "mediatek,mt8173-pinctrl";
 			reg = <0 0x1000b000 0 0x1000>;
 			mediatek,pctl-regmap = <&syscfg_pctl_a>;

arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi +3 -3

index 492a011f14f6..1c8f1b86472d 100644
@@ -140,16 +140,16 @@
 		};
 
 		agnoc@0 {
-			qcom,pcie@00600000 {
+			qcom,pcie@600000 {
 				perst-gpio = <&msmgpio 35 GPIO_ACTIVE_LOW>;
 			};
 
-			qcom,pcie@00608000 {
+			qcom,pcie@608000 {
 				status = "okay";
 				perst-gpio = <&msmgpio 130 GPIO_ACTIVE_LOW>;
 			};
 
-			qcom,pcie@00610000 {
+			qcom,pcie@610000 {
 				status = "okay";
 				perst-gpio = <&msmgpio 114 GPIO_ACTIVE_LOW>;
 			};

arch/arm64/boot/dts/qcom/msm8996.dtsi +3 -3

index 4b2afcc4fdf4..0a6f7952bbb1 100644
@@ -840,7 +840,7 @@
 			#size-cells = <1>;
 			ranges;
 
-			pcie0: qcom,pcie@00600000 {
+			pcie0: qcom,pcie@600000 {
 				compatible = "qcom,pcie-msm8996", "snps,dw-pcie";
 				status = "disabled";
 				power-domains = <&gcc PCIE0_GDSC>;

@@ -893,7 +893,7 @@
 
 			};
 
-			pcie1: qcom,pcie@00608000 {
+			pcie1: qcom,pcie@608000 {
 				compatible = "qcom,pcie-msm8996", "snps,dw-pcie";
 				power-domains = <&gcc PCIE1_GDSC>;
 				bus-range = <0x00 0xff>;

@@ -946,7 +946,7 @@
 						"bus_slave";
 			};
 
-			pcie2: qcom,pcie@00610000 {
+			pcie2: qcom,pcie@610000 {
 				compatible = "qcom,pcie-msm8996", "snps,dw-pcie";
 				power-domains = <&gcc PCIE2_GDSC>;
 				bus-range = <0x00 0xff>;

Signature · 1 line

2.11.0

Matthias Brugger

maintainer Acked-by on v1 1/1

2017-12-14 18:03 UTC #1 lore raw

On 12/14/2017 05:53 PM, Mathieu Malaterre wrote:
[...]

arch/arm64/boot/dts/mediatek/mt8173.dtsi line 255

Quoted 13 lines

arch/arm64/boot/dts/mediatek/mt8173.dtsi +1 -1

index 26396ef53bde..0446b122a6e2 100644
@@ -249,7 +249,7 @@
 			reg = <0 0x10005000 0 0x1000>;
 		};
 
-		pio: pinctrl at 0x10005000 {
+		pio: pinctrl at 10005000 {
 			compatible = "mediatek,mt8173-pinctrl";
 			reg = <0 0x1000b000 0 0x1000>;
 			mediatek,pctl-regmap = <&syscfg_pctl_a>;

Acked-by Matthias Brugger <[email protected]>

Joe Perches

2017-12-14 18:29 UTC #2 lore raw

Quoted 11 lines · Matthias Brugger

On 12/14/2017 05:53 PM, Mathieu Malaterre wrote:
[...]
Quoted 8 lines
arch/arm64/boot/dts/mediatek/mt8173.dtsi +0 -0
index 26396ef53bde..0446b122a6e2 100644
@@ -249,7 +249,7 @@
 			reg = <0 0x10005000 0 0x1000>;
 		};
 

Quoted 7 lines

arch/arm64/boot/dts/mediatek/mt8173.dtsi line 255
Quoted 5 lines
arch/arm64/boot/dts/mediatek/mt8173.dtsi +1 -1
-		pio: pinctrl at 0x10005000 {
+		pio: pinctrl at 10005000 {
 			compatible = "mediatek,mt8173-pinctrl";
 			reg = <0 0x1000b000 0 0x1000>;
 			mediatek,pctl-regmap = <&syscfg_pctl_a>;
Acked-by Matthias Brugger <[email protected]>

Should all of these be fixed?

$ git grep -P "^\s*\w+:\s*[\w\-]+ at 0[xX]" -- "*.dts*" | wc -l
69

Is this a pattern that should be added to checkpatch?

Rob Herring

2017-12-14 18:42 UTC #3 lore raw

Quoted 20 lines · Joe Perches

Quoted 11 lines · Matthias Brugger
On 12/14/2017 05:53 PM, Mathieu Malaterre wrote:
[...]
Quoted 8 lines
arch/arm64/boot/dts/mediatek/mt8173.dtsi +0 -0
index 26396ef53bde..0446b122a6e2 100644
@@ -249,7 +249,7 @@
                    reg = <0 0x10005000 0 0x1000>;
            };
 
Quoted 7 lines
arch/arm64/boot/dts/mediatek/mt8173.dtsi line 255
Quoted 5 lines
arch/arm64/boot/dts/mediatek/mt8173.dtsi +1 -1
-           pio: pinctrl at 0x10005000 {
+           pio: pinctrl at 10005000 {
                    compatible = "mediatek,mt8173-pinctrl";
                    reg = <0 0x1000b000 0 0x1000>;
                    mediatek,pctl-regmap = <&syscfg_pctl_a>;
Acked-by Matthias Brugger <[email protected]>

Quoted 4 lines

Should all of these be fixed?
$ git grep -P "^\s*\w+:\s*[\w\-]+ at 0[xX]" -- "*.dts*" | wc -l
69

Yes, there's patches for all arches.

Quoted 2 lines

Is this a pattern that should be added to checkpatch?

No, because dtc provides the warnings.

Rob

Andy Gross

Acked-by on v1 1/1

2017-12-20 06:49 UTC #4 lore raw

In reply to Mathieu Malaterre

Quoted 19 lines · Mathieu Malaterre

Improve the DTS files by removing all the leading "0x" and zeros to fix the following dtc warnings:
Warning (unit_address_format): Node /XXX unit name should not have leading "0x"
and
Warning (unit_address_format): Node /XXX unit name should not have leading 0s
Converted using the following command:
find . -type f $ -iname *.dts -o -iname *.dtsi $ -exec sed -E -i -e "s/@0x([0-9a-fA-F\.]+)\s?\{/@\L\1 \{/g" -e "s/@0+([0-9a-fA-F\.]+)\s?\{/@\L\1 \{/g" {} +
For simplicity, two sed expressions were used to solve each warnings separately.
To make the regex expression more robust a few other issues were resolved, namely setting unit-address to lower case, and adding a whitespace before the the opening curly brace:

Quoted 7 lines

https://elinux.org/Device_Tree_Linux#Linux_conventions
This is a follow up to commit 4c9847b7375a ("dt-bindings: Remove leading 0x from bindings notation")
Reported-by David Daney <[email protected]>
Suggested-by Rob Herring <[email protected]>
Signed-off-by Mathieu Malaterre <[email protected]>

Acked-by Andy Gross <[email protected]>

Rob Herring

2018-02-13 15:32 UTC #5 lore raw

In reply to Mathieu Malaterre

Quoted 26 lines · Mathieu Malaterre

Improve the DTS files by removing all the leading "0x" and zeros to fix the following dtc warnings:
Warning (unit_address_format): Node /XXX unit name should not have leading "0x"
and
Warning (unit_address_format): Node /XXX unit name should not have leading 0s
Converted using the following command:
find . -type f $ -iname *.dts -o -iname *.dtsi $ -exec sed -E -i -e "s/@0x([0-9a-fA-F\.]+)\s?\{/@\L\1 \{/g" -e "s/@0+([0-9a-fA-F\.]+)\s?\{/@\L\1 \{/g" {} +
For simplicity, two sed expressions were used to solve each warnings separately.
To make the regex expression more robust a few other issues were resolved, namely setting unit-address to lower case, and adding a whitespace before the the opening curly brace:
https://elinux.org/Device_Tree_Linux#Linux_conventions
This is a follow up to commit 4c9847b7375a ("dt-bindings: Remove leading 0x from bindings notation")
Reported-by David Daney <[email protected]>
Suggested-by Rob Herring <[email protected]>
Signed-off-by Mathieu Malaterre <[email protected]>

Quoted 6 lines

---
 arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 2 +-
 arch/arm64/boot/dts/mediatek/mt8173.dtsi       | 2 +-
 arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi   | 6 +++---
 arch/arm64/boot/dts/qcom/msm8996.dtsi          | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

Arnd, Olof, Looks like this got missed. Can you pick up for 4.16.

There's some arm32 ones too, but most of them need to be respun to mention upper to lower case fixes.

Rob

Arnd Bergmann

Applied

2018-02-22 16:38 UTC #6 lore raw

In reply to Mathieu Malaterre

Quoted 19 lines · Mathieu Malaterre

Improve the DTS files by removing all the leading "0x" and zeros to fix the following dtc warnings:
Warning (unit_address_format): Node /XXX unit name should not have leading "0x"
and
Warning (unit_address_format): Node /XXX unit name should not have leading 0s
Converted using the following command:
find . -type f $ -iname *.dts -o -iname *.dtsi $ -exec sed -E -i -e "s/@0x([0-9a-fA-F\.]+)\s?\{/@\L\1 \{/g" -e "s/@0+([0-9a-fA-F\.]+)\s?\{/@\L\1 \{/g" {} +
For simplicity, two sed expressions were used to solve each warnings separately.
To make the regex expression more robust a few other issues were resolved, namely setting unit-address to lower case, and adding a whitespace before the the opening curly brace:

Quoted 7 lines

https://elinux.org/Device_Tree_Linux#Linux_conventions
This is a follow up to commit 4c9847b7375a ("dt-bindings: Remove leading 0x from bindings notation")
Reported-by David Daney <[email protected]>
Suggested-by Rob Herring <[email protected]>
Signed-off-by Mathieu Malaterre <[email protected]>

Applied to fixes, thanks!

Arnd