MLK-21618 ARM: dts: imx6/imx7: avoid duplicate names in lcdif node

This patch fixes the following warning on various imx boards.

OF: Duplicate name in lcdif@......, renamed to "display#1"

Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Shrikant Bobade <Shrikant_Bobade@mentor.com>

diff --git a/arch/arm/boot/dts/imx6sx-19x19-arm2.dts b/arch/arm/boot/dts/imx6sx-19x19-arm2.dts
index cf128c1..f401df9 100644 (file)
--- a/arch/arm/boot/dts/imx6sx-19x19-arm2.dts
+++ b/arch/arm/boot/dts/imx6sx-19x19-arm2.dts
@@ -383,7 +383,7 @@
        display = <&display0>;
        status = "disabled";
 
-       display0: display {
+       display0: display@0 {
                bits-per-pixel = <16>;
                bus-width = <24>;
 

diff --git a/arch/arm/boot/dts/imx6ul-14x14-evk.dts b/arch/arm/boot/dts/imx6ul-14x14-evk.dts
index 6bf9e9c..f758b6a 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-14x14-evk.dts
+++ b/arch/arm/boot/dts/imx6ul-14x14-evk.dts
@@ -286,7 +286,7 @@
        display = <&display0>;
        status = "okay";
 
-       display0: display {
+       display0: display@0 {
                bits-per-pixel = <16>;
                bus-width = <24>;
 

diff --git a/arch/arm/boot/dts/imx6ul-9x9-evk.dts b/arch/arm/boot/dts/imx6ul-9x9-evk.dts
index bdd2a28..c064099 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-9x9-evk.dts
+++ b/arch/arm/boot/dts/imx6ul-9x9-evk.dts
@@ -669,7 +669,7 @@
        display = <&display0>;
        status = "okay";
 
-       display0: display {
+       display0: display@0 {
                bits-per-pixel = <16>;
                bus-width = <24>;
 

diff --git a/arch/arm/boot/dts/imx6ul-geam.dts b/arch/arm/boot/dts/imx6ul-geam.dts
index d81d20f..e6f996f 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-geam.dts
+++ b/arch/arm/boot/dts/imx6ul-geam.dts
@@ -204,7 +204,7 @@
        display = <&display0>;
        status = "okay";
 
-       display0: display {
+       display0: display@0 {
                bits-per-pixel = <16>;
                bus-width = <18>;
 

diff --git a/arch/arm/boot/dts/imx6ul-isiot.dtsi b/arch/arm/boot/dts/imx6ul-isiot.dtsi
index cd99285..8d94b23 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-isiot.dtsi
+++ b/arch/arm/boot/dts/imx6ul-isiot.dtsi
@@ -189,7 +189,7 @@
        display = <&display0>;
        status = "okay";
 
-       display0: display {
+       display0: display@0 {
                bits-per-pixel = <16>;
                bus-width = <18>;
 

diff --git a/arch/arm/boot/dts/imx6ul-opos6uldev.dts b/arch/arm/boot/dts/imx6ul-opos6uldev.dts
index 0e59ee5..d925e87 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-opos6uldev.dts
+++ b/arch/arm/boot/dts/imx6ul-opos6uldev.dts
@@ -186,7 +186,7 @@
        lcd-supply = <&reg_3v3>;
        status = "okay";
 
-       display0: display0 {
+       display0: display@0 {
                bits-per-pixel = <32>;
                bus-width = <18>;
 

diff --git a/arch/arm/boot/dts/imx6ul-pico-hobbit.dts b/arch/arm/boot/dts/imx6ul-pico-hobbit.dts
index 0c09420..e2699dd 100644 (file)
--- a/arch/arm/boot/dts/imx6ul-pico-hobbit.dts
+++ b/arch/arm/boot/dts/imx6ul-pico-hobbit.dts
@@ -246,7 +246,7 @@
        display = <&display0>;
        status = "okay";
 
-       display0: display0 {
+       display0: display@0 {
                bits-per-pixel = <32>;
                bus-width = <24>;
 

diff --git a/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2.dts b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2.dts
index 7f4b85d..7d8087d 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2.dts
+++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2.dts
@@ -885,7 +885,7 @@
        display = <&display0>;
        status = "disabled";
 
-       display0: display {
+       display0: display@0 {
                bits-per-pixel = <16>;
                bus-width = <24>;
 

diff --git a/arch/arm/boot/dts/imx6ull-9x9-evk.dts b/arch/arm/boot/dts/imx6ull-9x9-evk.dts
index 3c5d9da..73bc190 100644 (file)
--- a/arch/arm/boot/dts/imx6ull-9x9-evk.dts
+++ b/arch/arm/boot/dts/imx6ull-9x9-evk.dts
@@ -680,7 +680,7 @@
        display = <&display0>;
        status = "okay";
 
-       display0: display {
+       display0: display@0 {
                bits-per-pixel = <16>;
                bus-width = <24>;
 

diff --git a/arch/arm/boot/dts/imx7d-12x12-ddr3-arm2.dts b/arch/arm/boot/dts/imx7d-12x12-ddr3-arm2.dts
index eb029c0..25f4c37 100644 (file)
--- a/arch/arm/boot/dts/imx7d-12x12-ddr3-arm2.dts
+++ b/arch/arm/boot/dts/imx7d-12x12-ddr3-arm2.dts
@@ -465,7 +465,7 @@
        display = <&display0>;
        status = "okay";
 
-       display0: display {
+       display0: display@0 {
                bits-per-pixel = <16>;
                bus-width = <24>;
 

diff --git a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
index a244166..f9724de 100644 (file)
--- a/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
+++ b/arch/arm/boot/dts/imx7d-12x12-lpddr3-arm2.dts
@@ -875,7 +875,7 @@
        display = <&display0>;
        status = "okay";
 
-       display0: display {
+       display0: display@0 {
                bits-per-pixel = <16>;
                bus-width = <24>;
 

diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts
index 1d86259..019813f 100644 (file)
--- a/arch/arm/boot/dts/imx7d-sdb.dts
+++ b/arch/arm/boot/dts/imx7d-sdb.dts
@@ -559,7 +559,7 @@
        display = <&display0>;
        status = "okay";
 
-       display0: display {
+       display0: display@0 {
                bits-per-pixel = <16>;
                bus-width = <24>;