ARM: dts: exynos/s3c: 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"
    Warning (unit_address_format): Node /XXX unit name should not have leading 0s

Converted using the following command:

    find arch/arm/boot/dts -type f \( -iname "*.dts" -o -iname "*.dtsi" \) -exec sed -i \
    -e "s/@\([0-9a-fA-FxX\.;:#]\+\)\s*{/@\L\1 {/g" -e "s/@0x\(.*\) {/@\1 \
    {/g" -e "s/@0\+\(.\+\) {/@\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 will solve also a side effect warning:

    Warning (simple_bus_reg): Node /XXX@<UPPER> simple-bus unit address format error, expected "<lower>"

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>
[krzk: Rerun the command to include few more changes, adjust the commit msg]
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>

diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index 1514f0d..346f719 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -90,7 +90,7 @@
        samsung,vbus-gpio = <&gpx3 5 1>;
        status = "okay";
 
-       port@1{
+       port@1 {
                status = "okay";
        };
        port@2 {

diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi
index 2ae1ab6..7b43c10 100644 (file)
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -298,7 +298,7 @@
                        status = "disabled";
                };
 
-               sysmmu_g2d: sysmmu@10A40000{
+               sysmmu_g2d: sysmmu@10a40000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x10A40000 0x1000>;
                        interrupt-parent = <&combiner>;

diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index aa6accb..2daf505 100644 (file)
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -878,7 +878,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_fimc_dis1: sysmmu@132E0000{
+               sysmmu_fimc_dis1: sysmmu@132e0000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x132E0000 0x1000>;
                        interrupt-parent = <&combiner>;

diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 3230476..717c0e6 100644 (file)
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -747,7 +747,7 @@
                        #include "exynos5420-tmu-sensor-conf.dtsi"
                };
 
-               sysmmu_g2dr: sysmmu@0x10A60000 {
+               sysmmu_g2dr: sysmmu@10a60000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x10A60000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -757,7 +757,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_g2dw: sysmmu@0x10A70000 {
+               sysmmu_g2dw: sysmmu@10a70000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x10A70000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -767,7 +767,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_tv: sysmmu@0x14650000 {
+               sysmmu_tv: sysmmu@14650000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x14650000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -778,7 +778,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_gscl0: sysmmu@0x13E80000 {
+               sysmmu_gscl0: sysmmu@13e80000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x13E80000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -789,7 +789,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_gscl1: sysmmu@0x13E90000 {
+               sysmmu_gscl1: sysmmu@13e90000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x13E90000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -800,7 +800,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_scaler0r: sysmmu@0x12880000 {
+               sysmmu_scaler0r: sysmmu@12880000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x12880000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -810,7 +810,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_scaler1r: sysmmu@0x12890000 {
+               sysmmu_scaler1r: sysmmu@12890000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x12890000 0x1000>;
                        interrupts = <GIC_SPI 186 IRQ_TYPE_LEVEL_HIGH>;
@@ -819,7 +819,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_scaler2r: sysmmu@0x128A0000 {
+               sysmmu_scaler2r: sysmmu@128a0000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x128A0000 0x1000>;
                        interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>;
@@ -828,7 +828,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_scaler0w: sysmmu@0x128C0000 {
+               sysmmu_scaler0w: sysmmu@128c0000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x128C0000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -838,7 +838,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_scaler1w: sysmmu@0x128D0000 {
+               sysmmu_scaler1w: sysmmu@128d0000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x128D0000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -848,7 +848,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_scaler2w: sysmmu@0x128E0000 {
+               sysmmu_scaler2w: sysmmu@128e0000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x128E0000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -858,7 +858,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_rotator: sysmmu@0x11D40000 {
+               sysmmu_rotator: sysmmu@11d40000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x11D40000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -868,7 +868,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_jpeg0: sysmmu@0x11F10000 {
+               sysmmu_jpeg0: sysmmu@11f10000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x11F10000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -878,7 +878,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_jpeg1: sysmmu@0x11F20000 {
+               sysmmu_jpeg1: sysmmu@11f20000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x11F20000 0x1000>;
                        interrupts = <GIC_SPI 169 IRQ_TYPE_LEVEL_HIGH>;
@@ -887,7 +887,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_mfc_l: sysmmu@0x11200000 {
+               sysmmu_mfc_l: sysmmu@11200000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x11200000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -898,7 +898,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_mfc_r: sysmmu@0x11210000 {
+               sysmmu_mfc_r: sysmmu@11210000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x11210000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -909,7 +909,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_fimd1_0: sysmmu@0x14640000 {
+               sysmmu_fimd1_0: sysmmu@14640000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x14640000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -920,7 +920,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_fimd1_1: sysmmu@0x14680000 {
+               sysmmu_fimd1_1: sysmmu@14680000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x14680000 0x1000>;
                        interrupt-parent = <&combiner>;

diff --git a/arch/arm/boot/dts/exynos5422-odroid-core.dtsi b/arch/arm/boot/dts/exynos5422-odroid-core.dtsi
index d31249f..2f4f408 100644 (file)
--- a/arch/arm/boot/dts/exynos5422-odroid-core.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroid-core.dtsi
@@ -23,7 +23,7 @@
                stdout-path = "serial2:115200n8";
        };
 
-       firmware@02073000 {
+       firmware@2073000 {
                compatible = "samsung,secure-firmware";
                reg = <0x02073000 0x1000>;
        };

diff --git a/arch/arm/boot/dts/s3c2416.dtsi b/arch/arm/boot/dts/s3c2416.dtsi
index 3c7385c..46cf85f 100644 (file)
--- a/arch/arm/boot/dts/s3c2416.dtsi
+++ b/arch/arm/boot/dts/s3c2416.dtsi
@@ -30,7 +30,7 @@
                compatible = "samsung,s3c2416-irq";
        };
 
-       clocks: clock-controller@0x4c000000 {
+       clocks: clock-controller@4c000000 {
                compatible = "samsung,s3c2416-clock";
                reg = <0x4c000000 0x40>;
                #clock-cells = <1>;
@@ -69,7 +69,7 @@
                                <&clocks SCLK_UART>;
        };
 
-       uart_3: serial@5000C000 {
+       uart_3: serial@5000c000 {
                compatible = "samsung,s3c2440-uart";
                reg = <0x5000C000 0x4000>;
                interrupts = <1 18 24 4>, <1 18 25 4>;
@@ -80,7 +80,7 @@
                status = "disabled";
        };
 
-       sdhci_1: sdhci@4AC00000 {
+       sdhci_1: sdhci@4ac00000 {
                compatible = "samsung,s3c6410-sdhci";
                reg = <0x4AC00000 0x100>;
                interrupts = <0 0 21 3>;
@@ -91,7 +91,7 @@
                status = "disabled";
        };
 
-       sdhci_0: sdhci@4A800000 {
+       sdhci_0: sdhci@4a800000 {
                compatible = "samsung,s3c6410-sdhci";
                reg = <0x4A800000 0x100>;
                interrupts = <0 0 20 3>;