diff options
author | Mathieu Malaterre <malat@debian.org> | 2017-12-14 11:53:52 -0500 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2018-02-22 11:37:53 -0500 |
commit | 9977a8c3497a8f7f7f951994f298a8e4d961234f (patch) | |
tree | eb989500ac8259dd029e25f5d2cd1f8d105886b6 | |
parent | 713bb31c501369492224e8d416c513b6ff71685e (diff) |
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 <ddaney@caviumnetworks.com>
Suggested-by: Rob Herring <robh@kernel.org>
Signed-off-by: Mathieu Malaterre <malat@debian.org>
Acked-by: Matthias Brugger <matthias.bgg@gmail.com>
Acked-by: Andy Gross <andy.gross@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 2 | ||||
-rw-r--r-- | arch/arm64/boot/dts/mediatek/mt8173.dtsi | 2 | ||||
-rw-r--r-- | arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 6 | ||||
-rw-r--r-- | arch/arm64/boot/dts/qcom/msm8996.dtsi | 6 |
4 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts index e94fa1a53192..047641fe294c 100644 --- a/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts +++ b/arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | |||
@@ -51,7 +51,7 @@ | |||
51 | #size-cells = <2>; | 51 | #size-cells = <2>; |
52 | ranges; | 52 | ranges; |
53 | 53 | ||
54 | ramoops@0x21f00000 { | 54 | ramoops@21f00000 { |
55 | compatible = "ramoops"; | 55 | compatible = "ramoops"; |
56 | reg = <0x0 0x21f00000 0x0 0x00100000>; | 56 | reg = <0x0 0x21f00000 0x0 0x00100000>; |
57 | record-size = <0x00020000>; | 57 | record-size = <0x00020000>; |
diff --git a/arch/arm64/boot/dts/mediatek/mt8173.dtsi b/arch/arm64/boot/dts/mediatek/mt8173.dtsi index 9fbe4705ee88..94597e33c806 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173.dtsi | |||
@@ -341,7 +341,7 @@ | |||
341 | reg = <0 0x10005000 0 0x1000>; | 341 | reg = <0 0x10005000 0 0x1000>; |
342 | }; | 342 | }; |
343 | 343 | ||
344 | pio: pinctrl@0x10005000 { | 344 | pio: pinctrl@10005000 { |
345 | compatible = "mediatek,mt8173-pinctrl"; | 345 | compatible = "mediatek,mt8173-pinctrl"; |
346 | reg = <0 0x1000b000 0 0x1000>; | 346 | reg = <0 0x1000b000 0 0x1000>; |
347 | mediatek,pctl-regmap = <&syscfg_pctl_a>; | 347 | mediatek,pctl-regmap = <&syscfg_pctl_a>; |
diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi index 492a011f14f6..1c8f1b86472d 100644 --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | |||
@@ -140,16 +140,16 @@ | |||
140 | }; | 140 | }; |
141 | 141 | ||
142 | agnoc@0 { | 142 | agnoc@0 { |
143 | qcom,pcie@00600000 { | 143 | qcom,pcie@600000 { |
144 | perst-gpio = <&msmgpio 35 GPIO_ACTIVE_LOW>; | 144 | perst-gpio = <&msmgpio 35 GPIO_ACTIVE_LOW>; |
145 | }; | 145 | }; |
146 | 146 | ||
147 | qcom,pcie@00608000 { | 147 | qcom,pcie@608000 { |
148 | status = "okay"; | 148 | status = "okay"; |
149 | perst-gpio = <&msmgpio 130 GPIO_ACTIVE_LOW>; | 149 | perst-gpio = <&msmgpio 130 GPIO_ACTIVE_LOW>; |
150 | }; | 150 | }; |
151 | 151 | ||
152 | qcom,pcie@00610000 { | 152 | qcom,pcie@610000 { |
153 | status = "okay"; | 153 | status = "okay"; |
154 | perst-gpio = <&msmgpio 114 GPIO_ACTIVE_LOW>; | 154 | perst-gpio = <&msmgpio 114 GPIO_ACTIVE_LOW>; |
155 | }; | 155 | }; |
diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi index 4b2afcc4fdf4..0a6f7952bbb1 100644 --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi | |||
@@ -840,7 +840,7 @@ | |||
840 | #size-cells = <1>; | 840 | #size-cells = <1>; |
841 | ranges; | 841 | ranges; |
842 | 842 | ||
843 | pcie0: qcom,pcie@00600000 { | 843 | pcie0: qcom,pcie@600000 { |
844 | compatible = "qcom,pcie-msm8996", "snps,dw-pcie"; | 844 | compatible = "qcom,pcie-msm8996", "snps,dw-pcie"; |
845 | status = "disabled"; | 845 | status = "disabled"; |
846 | power-domains = <&gcc PCIE0_GDSC>; | 846 | power-domains = <&gcc PCIE0_GDSC>; |
@@ -893,7 +893,7 @@ | |||
893 | 893 | ||
894 | }; | 894 | }; |
895 | 895 | ||
896 | pcie1: qcom,pcie@00608000 { | 896 | pcie1: qcom,pcie@608000 { |
897 | compatible = "qcom,pcie-msm8996", "snps,dw-pcie"; | 897 | compatible = "qcom,pcie-msm8996", "snps,dw-pcie"; |
898 | power-domains = <&gcc PCIE1_GDSC>; | 898 | power-domains = <&gcc PCIE1_GDSC>; |
899 | bus-range = <0x00 0xff>; | 899 | bus-range = <0x00 0xff>; |
@@ -946,7 +946,7 @@ | |||
946 | "bus_slave"; | 946 | "bus_slave"; |
947 | }; | 947 | }; |
948 | 948 | ||
949 | pcie2: qcom,pcie@00610000 { | 949 | pcie2: qcom,pcie@610000 { |
950 | compatible = "qcom,pcie-msm8996", "snps,dw-pcie"; | 950 | compatible = "qcom,pcie-msm8996", "snps,dw-pcie"; |
951 | power-domains = <&gcc PCIE2_GDSC>; | 951 | power-domains = <&gcc PCIE2_GDSC>; |
952 | bus-range = <0x00 0xff>; | 952 | bus-range = <0x00 0xff>; |