aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorFabio Estevam <fabio.estevam@freescale.com>2014-09-02 21:45:14 -0400
committerShawn Guo <shawn.guo@freescale.com>2014-09-15 22:26:02 -0400
commit3f50a61937b3fabe0c46123cef48e2569042ca07 (patch)
treef1f98b1698643d593c1d9dc226fba65ab88bc381 /arch
parent3148092df08f741d677c8eadce5a409555eda32c (diff)
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>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/imx6sl-evk.dts4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6sl-evk.dts b/arch/arm/boot/dts/imx6sl-evk.dts
index 9925c4a031c3..898d14fd765f 100644
--- a/arch/arm/boot/dts/imx6sl-evk.dts
+++ b/arch/arm/boot/dts/imx6sl-evk.dts
@@ -546,10 +546,10 @@
546 pinctrl-names = "default"; 546 pinctrl-names = "default";
547 pinctrl-0 = <&pinctrl_lcd>; 547 pinctrl-0 = <&pinctrl_lcd>;
548 lcd-supply = <&reg_lcd_3v3>; 548 lcd-supply = <&reg_lcd_3v3>;
549 display = <&display>; 549 display = <&display0>;
550 status = "okay"; 550 status = "okay";
551 551
552 display: display { 552 display0: display0 {
553 bits-per-pixel = <32>; 553 bits-per-pixel = <32>;
554 bus-width = <24>; 554 bus-width = <24>;
555 555