summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2014-09-04 22:31:21 -0300
committerShawn Guo <shawn.guo@freescale.com>2014-09-16 10:26:03 +0800
commit7f0d61d6365c01b5941e2c166684392ccf9c340c (patch)
treef42e4174dfaf5f226476a231acfec81ce4f90af8 /arch
parent7029b396b08aeb15d8cb23c4bff3e10c1f518238 (diff)
downloadtalos-obmc-linux-7f0d61d6365c01b5941e2c166684392ccf9c340c.tar.gz
talos-obmc-linux-7f0d61d6365c01b5941e2c166684392ccf9c340c.zip
ARM: dts: imx28-m28cu: 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')
-rw-r--r--arch/arm/boot/dts/imx28-m28cu3.dts4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx28-m28cu3.dts b/arch/arm/boot/dts/imx28-m28cu3.dts
index 9348ce59dda4..2df63bee6f4e 100644
--- a/arch/arm/boot/dts/imx28-m28cu3.dts
+++ b/arch/arm/boot/dts/imx28-m28cu3.dts
@@ -115,10 +115,10 @@
pinctrl-names = "default";
pinctrl-0 = <&lcdif_24bit_pins_a
&lcdif_pins_m28>;
- display = <&display>;
+ display = <&display0>;
status = "okay";
- display: display0 {
+ display0: display0 {
bits-per-pixel = <32>;
bus-width = <24>;
OpenPOWER on IntegriCloud