From: Fabio Estevam <fabio.estevam@freescale.com>
Date: Wed, 3 Sep 2014 01:45:14 +0000 (-0300)
Subject: ARM: dts: imx6sl-evk: Fix display duplicate name warning
X-Git-Tag: v3.18-rc1~119^2~20^2~20
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3f50a61937b3fabe0c46123cef48e2569042ca07;p=~emulex%2Finfiniband.git

ARM: dts: imx6sl-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@02220000, 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>
---

diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts
index 9925c4a031c..898d14fd765 100644
--- a/arch/arm/boot/dts/imx6sl-evk.dts
+++ b/arch/arm/boot/dts/imx6sl-evk.dts
@@ -546,10 +546,10 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_lcd>;
 	lcd-supply = <&reg_lcd_3v3>;
-	display = <&display>;
+	display = <&display0>;
 	status = "okay";
 
-	display: display {
+	display0: display0 {
 		bits-per-pixel = <32>;
 		bus-width = <24>;