summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2014-09-04 22:31:23 -0300
committerShawn Guo <shawn.guo@freescale.com>2014-09-16 10:26:04 +0800
commit433fb101132047383b550c58585b5a38797c90d1 (patch)
tree72040f127204a004e287bbbf183d0e86294a4eae
parent58a32d91306787d6733767321a14c39afc136d93 (diff)
downloadlinux-stable-433fb101132047383b550c58585b5a38797c90d1.tar.gz
linux-stable-433fb101132047383b550c58585b5a38797c90d1.tar.bz2
linux-stable-433fb101132047383b550c58585b5a38797c90d1.zip
ARM: dts: imx28-m28evk: 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>
-rw-r--r--arch/arm/boot/dts/imx28-m28evk.dts4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx28-m28evk.dts b/arch/arm/boot/dts/imx28-m28evk.dts
index b3c09ae3b928..e35cc6ba3ca6 100644
--- a/arch/arm/boot/dts/imx28-m28evk.dts
+++ b/arch/arm/boot/dts/imx28-m28evk.dts
@@ -81,10 +81,10 @@
pinctrl-names = "default";
pinctrl-0 = <&lcdif_24bit_pins_a
&lcdif_pins_m28>;
- display = <&display>;
+ display = <&display0>;
status = "okay";
- display: display {
+ display0: display0 {
bits-per-pixel = <16>;
bus-width = <18>;