commit 20d412b2d805d650d1b820d41a80e023d6a98461
author Fabio Estevam <fabio.estevam@freescale.com> Tue Sep 02 22:45:12 2014 -0300
committer Shawn Guo <shawn.guo@freescale.com> Tue Sep 16 10:26:01 2014 +0800
tree 2a180a05411aa4ba2ed480f4ca5b7b935bb2f83b
parent 31ffdbc80c8f139b0fe7f117d04bca0165e7e35e

ARM: dts: imx28-evk: Fix display duplicate name warning

The lcdif node has a property named "display" and also a child node
called "display", which causes the following warning:

device-tree: Duplicate name in lcdif@80030000, renamed to "display#1"

Rename the child node name in order to avoid the warning.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>

arch/arm/boot/dts/imx28-evk.dts

diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts
index e4cc44c..09664fc 100644
--- a/arch/arm/boot/dts/imx28-evk.dts
+++ b/arch/arm/boot/dts/imx28-evk.dts
@@ -124,10 +124,10 @@
 				pinctrl-0 = <&lcdif_24bit_pins_a
 					     &lcdif_pins_evk>;
 				lcd-supply = <&reg_lcd_3v3>;
-				display = <&display>;
+				display = <&display0>;
 				status = "okay";
 
-				display: display {
+				display0: display0 {
 					bits-per-pixel = <32>;
 					bus-width = <24>;