ARM: dts: imx: Fix incorrect display nodes notation

The following build warnings are seen with W=1:

Warning (unit_address_vs_reg): Node /display@di0 has a unit name, but no reg property
Warning (unit_address_vs_reg): Node /display@di1 has a unit name, but no reg property

Fix all these warnings by changing 'display@diX' to 'dispX'.

Signed-off-by: Marco Franchi <marco.franchi@nxp.com>
Acked-by: Philipp Zabel <p.zabel@pengutronix.de>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>

diff --git a/arch/arm/boot/dts/imx51-apf51dev.dts b/arch/arm/boot/dts/imx51-apf51dev.dts
index a5e6091c8729968beef3bd4279c325a3212a5ca8..f04d0df742781482396cde7e17cc03bf6daffbf7 100644 (file)
--- a/arch/arm/boot/dts/imx51-apf51dev.dts
+++ b/arch/arm/boot/dts/imx51-apf51dev.dts
@@ -24,7 +24,7 @@
                default-on;
        };
 
-       display@di1 {
+       disp1 {
                compatible = "fsl,imx-parallel-display";
                interface-pix-fmt = "bgr666";
                pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index 873cf242679c0d1cbc9a84938105abfada2c9610..297953cef0180b3c919ad680984f1567847c8916 100644 (file)
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -39,7 +39,7 @@
                };
        };
 
-       display0: display@di0 {
+       display0: disp0 {
                compatible = "fsl,imx-parallel-display";
                interface-pix-fmt = "rgb24";
                pinctrl-names = "default";
@@ -66,7 +66,7 @@
                };
        };
 
-       display1: display@di1 {
+       display1: disp1 {
                compatible = "fsl,imx-parallel-display";
                interface-pix-fmt = "rgb565";
                pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/imx51-ts4800.dts b/arch/arm/boot/dts/imx51-ts4800.dts
index ca1cc5eca80fb1cd6a0b32b85fdee9374f2792b3..e6be869cfb8cfe6b0f8dd0aa8fd6edbf364d0eb0 100644 (file)
--- a/arch/arm/boot/dts/imx51-ts4800.dts
+++ b/arch/arm/boot/dts/imx51-ts4800.dts
@@ -50,7 +50,7 @@
                power-supply = <&backlight_reg>;
        };
 
-       display0: display@di0 {
+       display0: disp0 {
                compatible = "fsl,imx-parallel-display";
                interface-pix-fmt = "rgb24";
                pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/imx53-m53evk.dts b/arch/arm/boot/dts/imx53-m53evk.dts
index 4347a321c78216087e0cfbf79563af73dc3b7577..9794a04fe2ee8cc9cfdf3214297ead9df0125a20 100644 (file)
--- a/arch/arm/boot/dts/imx53-m53evk.dts
+++ b/arch/arm/boot/dts/imx53-m53evk.dts
@@ -16,7 +16,7 @@
        model = "Aries/DENX M53EVK";
        compatible = "aries,imx53-m53evk", "denx,imx53-m53evk", "fsl,imx53";
 
-       display1: display@di1 {
+       display1: disp1 {
                compatible = "fsl,imx-parallel-display";
                interface-pix-fmt = "bgr666";
                pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/imx53-mba53.dts b/arch/arm/boot/dts/imx53-mba53.dts
index df705ba48897f87bad941c11dd693150867f9df4..296dd74fc24685d323e026cc8136d8e743a40237 100644 (file)
--- a/arch/arm/boot/dts/imx53-mba53.dts
+++ b/arch/arm/boot/dts/imx53-mba53.dts
@@ -30,7 +30,7 @@
                power-supply = <&reg_backlight>;
        };
 
-       disp1: display@disp1 {
+       disp1: disp1 {
                compatible = "fsl,imx-parallel-display";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_disp1_1>;

diff --git a/arch/arm/boot/dts/imx53-qsb-common.dtsi b/arch/arm/boot/dts/imx53-qsb-common.dtsi
index 683dcbe27cbd63b6b30a8e20b7dc52d604a84616..d5adf331f83df6cbfd2459190f7c89fe13981495 100644 (file)
--- a/arch/arm/boot/dts/imx53-qsb-common.dtsi
+++ b/arch/arm/boot/dts/imx53-qsb-common.dtsi
@@ -22,7 +22,7 @@
                      <0xb0000000 0x20000000>;
        };
 
-       display0: display@di0 {
+       display0: disp0 {
                compatible = "fsl,imx-parallel-display";
                interface-pix-fmt = "rgb565";
                pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/imx53-tx53-x03x.dts b/arch/arm/boot/dts/imx53-tx53-x03x.dts
index 0ecb43d88522318701304fad35e3c214cfcb276e..b1ea73fd6a16859948cec2f8131bad6af7d76781 100644 (file)
--- a/arch/arm/boot/dts/imx53-tx53-x03x.dts
+++ b/arch/arm/boot/dts/imx53-tx53-x03x.dts
@@ -24,7 +24,7 @@
        };
 
        soc {
-               display: display@di0 {
+               display: disp0 {
                        compatible = "fsl,imx-parallel-display";
                        interface-pix-fmt = "rgb24";
                        pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/imx6dl-aristainetos2_4.dts b/arch/arm/boot/dts/imx6dl-aristainetos2_4.dts
index 0677625463d6fec91172fb251f4a49955940c108..5f0d196495d08ff23b6b2d2478f34545c7bca110 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-aristainetos2_4.dts
+++ b/arch/arm/boot/dts/imx6dl-aristainetos2_4.dts
@@ -52,7 +52,7 @@
                reg = <0x10000000 0x40000000>;
        };
 
-       display0: display@di0 {
+       display0: disp0 {
                #address-cells = <1>;
                #size-cells = <0>;
                compatible = "fsl,imx-parallel-display";

diff --git a/arch/arm/boot/dts/imx6dl-aristainetos_4.dts b/arch/arm/boot/dts/imx6dl-aristainetos_4.dts
index 32a812b1839ea0cc5e3ab4451b031e6053fb9b29..cc418cecabdb3b76ef5be767184950b5d609d64f 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-aristainetos_4.dts
+++ b/arch/arm/boot/dts/imx6dl-aristainetos_4.dts
@@ -32,7 +32,7 @@
        };
 
        soc {
-               display0: display@di0 {
+               display0: disp0 {
                        compatible = "fsl,imx-parallel-display";
                        interface-pix-fmt = "rgb24";
                        pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/imx6dl-aristainetos_7.dts b/arch/arm/boot/dts/imx6dl-aristainetos_7.dts
index 15203f0e9725cb775dac06399ab212d12479e536..126ff964edede598c126d62b0561979f5c6a3c06 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-aristainetos_7.dts
+++ b/arch/arm/boot/dts/imx6dl-aristainetos_7.dts
@@ -21,7 +21,7 @@
        };
 
        soc {
-               display0: display@di0 {
+               display0: disp0 {
                        compatible = "fsl,imx-parallel-display";
                        interface-pix-fmt = "rgb24";
                        pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
index 26541538562c6d937fde7b96066112c5c7463689..5705ebee05955932f8e7cfce562d5c4115b8f1ae 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
+++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts
@@ -88,7 +88,7 @@
                };
        };
 
-       lcd_display: display@di0 {
+       lcd_display: disp0 {
                compatible = "fsl,imx-parallel-display";
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts b/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
index aac42ac465b64619a82773bf097cc49051c5aa08..389fc16a6674701208fa7bd8a56e9d3671dd304e 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
+++ b/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
@@ -73,7 +73,7 @@
                default-brightness-level = <50>;
        };
 
-       display: display@di0 {
+       display: disp0 {
                compatible = "fsl,imx-parallel-display";
                interface-pix-fmt = "rgb24";
                pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/imx6dl-tx6s-8034.dts b/arch/arm/boot/dts/imx6dl-tx6s-8034.dts
index ff8f7b1c42825b5f24fe16846a7a01367cae992a..a21075ba84bd0692ebf0858f5b0d729faed5fd8d 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-tx6s-8034.dts
+++ b/arch/arm/boot/dts/imx6dl-tx6s-8034.dts
@@ -81,7 +81,7 @@
                default-brightness-level = <50>;
        };
 
-       display: display@di0 {
+       display: disp0 {
                compatible = "fsl,imx-parallel-display";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_disp0_2>;

diff --git a/arch/arm/boot/dts/imx6dl-tx6s-8035.dts b/arch/arm/boot/dts/imx6dl-tx6s-8035.dts
index f988950e9443d44b19886f12ad9d9f423556c91e..fee8854c124be47c3cd73f141fb48505ac1570c1 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-tx6s-8035.dts
+++ b/arch/arm/boot/dts/imx6dl-tx6s-8035.dts
@@ -81,7 +81,7 @@
                default-brightness-level = <50>;
        };
 
-       display: display@di0 {
+       display: disp0 {
                compatible = "fsl,imx-parallel-display";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_disp0_2>;

diff --git a/arch/arm/boot/dts/imx6dl-tx6u-801x.dts b/arch/arm/boot/dts/imx6dl-tx6u-801x.dts
index d1f1298ec55a8f28e80a297ee9e15d62d8385d28..efe5772cf2e832b506802988f6268d05f1e7ba65 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-tx6u-801x.dts
+++ b/arch/arm/boot/dts/imx6dl-tx6u-801x.dts
@@ -73,7 +73,7 @@
                default-brightness-level = <50>;
        };
 
-       display: display@di0 {
+       display: disp0 {
                compatible = "fsl,imx-parallel-display";
                interface-pix-fmt = "rgb24";
                pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/imx6dl-tx6u-8033.dts b/arch/arm/boot/dts/imx6dl-tx6u-8033.dts
index 4d3204a56f46114347be5943691be5917e752dab..e22208627c474f155ce305c0a0caec56c2b8f275 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-tx6u-8033.dts
+++ b/arch/arm/boot/dts/imx6dl-tx6u-8033.dts
@@ -76,7 +76,7 @@
                default-brightness-level = <50>;
        };
 
-       display: display@di0 {
+       display: disp0 {
                compatible = "fsl,imx-parallel-display";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_disp0_2>;

diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts
index 4bbfe3d6102756178a14e76a4b60b1c02dfead96..8b56656e53da8c50ff9a9ba4468d280b2250780b 100644 (file)
--- a/arch/arm/boot/dts/imx6q-apalis-eval.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts
@@ -76,7 +76,7 @@
                };
        };
 
-       lcd_display: display@di0 {
+       lcd_display: disp0 {
                compatible = "fsl,imx-parallel-display";
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
index a35c7a54ad3b5484be85987024d771e42fb01bb1..27dc0fc686a918b75dc9ac37db5e670560c97217 100644 (file)
--- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts
@@ -77,7 +77,7 @@
                };
        };
 
-       lcd_display: display@di0 {
+       lcd_display: disp0 {
                compatible = "fsl,imx-parallel-display";
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
index 60d33e99de76037cf546c8000ade4304c959c1c6..40b2c67fe7af2c1511c19de5171ac55541be442b 100644 (file)
--- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts
+++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts
@@ -76,7 +76,7 @@
                };
        };
 
-       lcd_display: display@di0 {
+       lcd_display: disp0 {
                compatible = "fsl,imx-parallel-display";
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts b/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts
index 71746edc2ee9218d21cd8a738188ff24370862b0..d3ee1f52ee859e8f9e3815ef44023a33ddda2447 100644 (file)
--- a/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts
+++ b/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts
@@ -73,7 +73,7 @@
                default-brightness-level = <50>;
        };
 
-       display: display@di0 {
+       display: disp0 {
                compatible = "fsl,imx-parallel-display";
                interface-pix-fmt = "rgb24";
                pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/imx6q-tx6q-1010.dts b/arch/arm/boot/dts/imx6q-tx6q-1010.dts
index f9cd21a41a797c8b2dc81a04f1485de650611e3e..e14e6be22b05d62c9853d81b5331addd0d36567a 100644 (file)
--- a/arch/arm/boot/dts/imx6q-tx6q-1010.dts
+++ b/arch/arm/boot/dts/imx6q-tx6q-1010.dts
@@ -73,7 +73,7 @@
                default-brightness-level = <50>;
        };
 
-       display: display@di0 {
+       display: disp0 {
                compatible = "fsl,imx-parallel-display";
                interface-pix-fmt = "rgb24";
                pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts b/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts
index 959ff3fb7304e4c3aef373eb6801e54ddb086d90..ea84561614730fd56af720feecb7cf7b8a86d6e6 100644 (file)
--- a/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts
+++ b/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts
@@ -73,7 +73,7 @@
                default-brightness-level = <50>;
        };
 
-       display: display@di0 {
+       display: disp0 {
                compatible = "fsl,imx-parallel-display";
                interface-pix-fmt = "rgb24";
                pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/imx6q-tx6q-1020.dts b/arch/arm/boot/dts/imx6q-tx6q-1020.dts
index b49133d25d80995e7a38d87195fc1c588c753efc..9c168eee2e93ed1a6c0942b3c859a11bad2aaa68 100644 (file)
--- a/arch/arm/boot/dts/imx6q-tx6q-1020.dts
+++ b/arch/arm/boot/dts/imx6q-tx6q-1020.dts
@@ -73,7 +73,7 @@
                default-brightness-level = <50>;
        };
 
-       display: display@di0 {
+       display: disp0 {
                compatible = "fsl,imx-parallel-display";
                interface-pix-fmt = "rgb24";
                pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/imx6q-tx6q-1036.dts b/arch/arm/boot/dts/imx6q-tx6q-1036.dts
index 7c152e32758cbc63b634daa37b55c0c44a947d01..c81e8bdd8b940f9d7c693d176ad799415d0b34ee 100644 (file)
--- a/arch/arm/boot/dts/imx6q-tx6q-1036.dts
+++ b/arch/arm/boot/dts/imx6q-tx6q-1036.dts
@@ -76,7 +76,7 @@
                default-brightness-level = <50>;
        };
 
-       display: display@di0 {
+       display: disp0 {
                compatible = "fsl,imx-parallel-display";
                pinctrl-names = "default";
                pinctrl-0 = <&pinctrl_disp0_2>;

diff --git a/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi b/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
index 9cd2a7477ed76b20bd938319c0fcef35a5117395..37a59a847693101dcc7a15fde5ffca395480038a 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apf6dev.dtsi
@@ -54,7 +54,7 @@
                stdout-path = &uart4;
        };
 
-       display@di0 {
+       disp0 {
                compatible = "fsl,imx-parallel-display";
                interface-pix-fmt = "bgr666";
                pinctrl-names = "default";

diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
index b63134e3b51a078a44b65698b7db3707c9f0bcdd..472b0c9d6addbf563df13a8e1997c2e98949fc7c 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi
@@ -256,7 +256,7 @@
                status = "okay";
        };
 
-       lcd_display: display@di0 {
+       lcd_display: disp0 {
                compatible = "fsl,imx-parallel-display";
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi
index a24e4f1911abe77917726d8ff8342f7dcb88dab2..4bab60aa4e4f7cb2331c9b0bc6f8bbcf760eefd9 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6_som2.dtsi
@@ -120,7 +120,7 @@
                };
        };
 
-       lcd_display: display@di0 {
+       lcd_display: disp0 {
                compatible = "fsl,imx-parallel-display";
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
index d309a4d0eb08b38c0ba551ee3652549421538eb5..9a46cf1bb6fc47d0d9ebd7d7ce354ec2fd667016 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-nitrogen6x.dtsi
@@ -197,7 +197,7 @@
                status = "okay";
        };
 
-       lcd_display: display@di0 {
+       lcd_display: disp0 {
                compatible = "fsl,imx-parallel-display";
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
index 756c5054f047724f7e12a1fad1ca98fde09f50c2..fc1f2c0910c5959f5b5d07a2edf69047c48d78f3 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabrelite.dtsi
@@ -221,7 +221,7 @@
                status = "okay";
        };
 
-       lcd_display: display@di0 {
+       lcd_display: disp0 {
                compatible = "fsl,imx-parallel-display";
                #address-cells = <1>;
                #size-cells = <0>;

diff --git a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
index ec745eb3b6a853b1aab6eb7faab14c30e68bcdf7..5610d191079c2202c0b6d1f438725785e406cfe1 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
+++ b/arch/arm/boot/dts/imx6ul-tx6ul.dtsi
@@ -424,7 +424,7 @@
        display = <&display>;
        status = "okay";
 
-       display: display@di0 {
+       display: disp0 {
                bits-per-pixel = <32>;
                bus-width = <24>;
                status = "okay";