summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx28-cfa10049.dts
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2014-09-04 22:31:20 -0300
committerShawn Guo <shawn.guo@freescale.com>2014-09-16 10:26:03 +0800
commit7029b396b08aeb15d8cb23c4bff3e10c1f518238 (patch)
tree58ae35527fbd9daee0f4dcc22c94c4d746f58cdd /arch/arm/boot/dts/imx28-cfa10049.dts
parentee99b4636b3108a3a6d92f1189b797006e4416e9 (diff)
ARM: dts: imx28-cfa100: 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>
Diffstat (limited to 'arch/arm/boot/dts/imx28-cfa10049.dts')
-rw-r--r--arch/arm/boot/dts/imx28-cfa10049.dts4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx28-cfa10049.dts b/arch/arm/boot/dts/imx28-cfa10049.dts
index 7d51459de5e8..ef944b6d4f01 100644
--- a/arch/arm/boot/dts/imx28-cfa10049.dts
+++ b/arch/arm/boot/dts/imx28-cfa10049.dts
@@ -177,10 +177,10 @@
pinctrl-0 = <&lcdif_18bit_pins_cfa10049
&lcdif_pins_cfa10049
&lcdif_pins_cfa10049_pullup>;
- display = <&display>;
+ display = <&display0>;
status = "okay";
- display: display {
+ display0: display0 {
bits-per-pixel = <32>;
bus-width = <18>;