From: Fabio Estevam <fabio.estevam@freescale.com>
Date: Fri, 5 Sep 2014 01:31:19 +0000 (-0300)
Subject: ARM: dts: imx28-apf28dev: Fix display duplicate name warning
X-Git-Tag: firefly_0821_release~176^2~3110^2~20^2~18
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ee99b4636b3108a3a6d92f1189b797006e4416e9;p=firefly-linux-kernel-4.4.55.git

ARM: dts: imx28-apf28dev: 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 wa

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/imx28-apf28dev.dts b/arch/arm/boot/dts/imx28-apf28dev.dts
index 221cac4fb2cd..1f38a052ad4b 100644
--- a/arch/arm/boot/dts/imx28-apf28dev.dts
+++ b/arch/arm/boot/dts/imx28-apf28dev.dts
@@ -83,10 +83,10 @@
 				pinctrl-names = "default";
 				pinctrl-0 = <&lcdif_16bit_pins_a
 						&lcdif_pins_apf28dev>;
-				display = <&display>;
+				display = <&display0>;
 				status = "okay";
 
-				display: display {
+				display0: display0 {
 					bits-per-pixel = <16>;
 					bus-width = <16>;