Commit 9977a8c3 authored Dec 14, 2017 by Mathieu Malaterre Committed by Arnd Bergmann Feb 22, 2018

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 4c9847b7 ("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>

parent 713bb31c

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -51,7 +51,7 @@ reserved-memory {
		#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

Original line number	Diff line number	Diff line
		@@ -341,7 +341,7 @@ syscfg_pctl_a: syscfg_pctl_a@10005000 {
		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

Original line number	Diff line number	Diff line
		@@ -140,16 +140,16 @@ usb2_id: usb2-id {
		};

		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

Original line number	Diff line number	Diff line
		@@ -840,7 +840,7 @@ agnoc@0 {
		#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 @@ pcie0: qcom,pcie@00600000 {

		};

		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 @@ pcie1: qcom,pcie@00608000 {
		"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>;