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>
[backport of mainline commit edef4285afb072f8d8ddfbfa107e54c4b45c0547]
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: Ia25a2a2ffee646520762552549ea59f57ded8f5b

diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index b0b5ec7903a53e91ac6f235d3167b0bbb6846b90..e3c5cfeb7ef4663665f1dead85052f32492a7477 100644 (file)
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -93,7 +93,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 6a7b69ff7e185e5227ae3eb5d18957cc9862c6da..6e9e5d21f8e1d238ff6ac8288520c07df3fd487d 100644 (file)
--- a/arch/arm/boot/dts/exynos4412.dtsi
+++ b/arch/arm/boot/dts/exynos4412.dtsi
@@ -351,7 +351,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 fb9c85536e68692ad64d933ba7acf0fcb3a2f596..9b873c01bf4cb8da3f7406e26556021e1ec2d508 100644 (file)
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -950,7 +950,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 5eb15ee459a298a3ab9a057ff8fbcb06c5f1b249..4ee19fe3041025d614fa9de334c95a2d2231963b 100644 (file)
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -794,7 +794,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>;
@@ -804,7 +804,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_g2dw: sysmmu@0x10A70000 {
+               sysmmu_g2dw: sysmmu@10a70000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x10A70000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -814,7 +814,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_tv: sysmmu@0x14650000 {
+               sysmmu_tv: sysmmu@14650000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x14650000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -825,7 +825,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_gscl0: sysmmu@0x13E80000 {
+               sysmmu_gscl0: sysmmu@13e80000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x13E80000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -836,7 +836,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_gscl1: sysmmu@0x13E90000 {
+               sysmmu_gscl1: sysmmu@13e90000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x13E90000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -847,7 +847,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_scaler0r: sysmmu@0x12880000 {
+               sysmmu_scaler0r: sysmmu@12880000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x12880000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -858,7 +858,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>;
@@ -868,7 +868,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>;
@@ -878,7 +878,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_scaler0w: sysmmu@0x128C0000 {
+               sysmmu_scaler0w: sysmmu@128c0000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x128C0000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -889,7 +889,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_scaler1w: sysmmu@0x128D0000 {
+               sysmmu_scaler1w: sysmmu@128d0000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x128D0000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -900,7 +900,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_scaler2w: sysmmu@0x128E0000 {
+               sysmmu_scaler2w: sysmmu@128e0000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x128E0000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -911,7 +911,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_rotator: sysmmu@0x11D40000 {
+               sysmmu_rotator: sysmmu@11d40000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x11D40000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -921,7 +921,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_jpeg0: sysmmu@0x11F10000 {
+               sysmmu_jpeg0: sysmmu@11f10000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x11F10000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -931,7 +931,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>;
@@ -940,7 +940,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_mfc_l: sysmmu@0x11200000 {
+               sysmmu_mfc_l: sysmmu@11200000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x11200000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -951,7 +951,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_mfc_r: sysmmu@0x11210000 {
+               sysmmu_mfc_r: sysmmu@11210000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x11210000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -962,7 +962,7 @@
                        #iommu-cells = <0>;
                };
 
-               sysmmu_fimd1_0: sysmmu@0x14640000 {
+               sysmmu_fimd1_0: sysmmu@14640000 {
                        compatible = "samsung,exynos-sysmmu";
                        reg = <0x14640000 0x1000>;
                        interrupt-parent = <&combiner>;
@@ -973,7 +973,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 61f52ef4d431c68bddc06d8128fe6b5561445324..8c442bfb3bc5e85bdea61fcbdad00991c4b6b02e 100644 (file)
--- a/arch/arm/boot/dts/exynos5422-odroid-core.dtsi
+++ b/arch/arm/boot/dts/exynos5422-odroid-core.dtsi
@@ -27,7 +27,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 80f0075503246336adf448cee3c3398959fbe3dd..568524325f1a06cd2d4c2699df54253c9964e5aa 100644 (file)
--- a/arch/arm/boot/dts/s3c2416.dtsi
+++ b/arch/arm/boot/dts/s3c2416.dtsi
@@ -33,7 +33,7 @@
                compatible = "samsung,s3c2416-irq";
        };
 
-       clocks: clock-controller@0x4c000000 {
+       clocks: clock-controller@4c000000 {
                compatible = "samsung,s3c2416-clock";
                reg = <0x4c000000 0x40>;
                #clock-cells = <1>;
@@ -72,7 +72,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>;
@@ -83,7 +83,7 @@
                status = "disabled";
        };
 
-       sdhci_1: sdhci@4AC00000 {
+       sdhci_1: sdhci@4ac00000 {
                compatible = "samsung,s3c6410-sdhci";
                reg = <0x4AC00000 0x100>;
                interrupts = <0 0 21 3>;
@@ -94,7 +94,7 @@
                status = "disabled";
        };
 
-       sdhci_0: sdhci@4A800000 {
+       sdhci_0: sdhci@4a800000 {
                compatible = "samsung,s3c6410-sdhci";
                reg = <0x4A800000 0x100>;
                interrupts = <0 0 20 3>;