diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-09-04 21:31:22 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@freescale.com> | 2014-09-15 22:26:04 -0400 |
commit | 58a32d91306787d6733767321a14c39afc136d93 (patch) | |
tree | 71a263a42e09a207391a3661a85b4bcf790f828c /arch/arm/boot/dts/imx28-tx28.dts | |
parent | 7f0d61d6365c01b5941e2c166684392ccf9c340c (diff) |
ARM: dts: imx28-tx28: 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>
Acked-by: Lothar Waßmann <LW@KARO-electronics.de>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Diffstat (limited to 'arch/arm/boot/dts/imx28-tx28.dts')
-rw-r--r-- | arch/arm/boot/dts/imx28-tx28.dts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/imx28-tx28.dts b/arch/arm/boot/dts/imx28-tx28.dts index e14bd86f3e99..f947fbb8c367 100644 --- a/arch/arm/boot/dts/imx28-tx28.dts +++ b/arch/arm/boot/dts/imx28-tx28.dts | |||
@@ -21,7 +21,7 @@ | |||
21 | aliases { | 21 | aliases { |
22 | can0 = &can0; | 22 | can0 = &can0; |
23 | can1 = &can1; | 23 | can1 = &can1; |
24 | display = &display; | 24 | display = &display0; |
25 | ds1339 = &ds1339; | 25 | ds1339 = &ds1339; |
26 | gpio5 = &gpio5; | 26 | gpio5 = &gpio5; |
27 | lcdif = &lcdif; | 27 | lcdif = &lcdif; |
@@ -309,10 +309,10 @@ | |||
309 | pinctrl-names = "default"; | 309 | pinctrl-names = "default"; |
310 | pinctrl-0 = <&lcdif_24bit_pins_a &lcdif_sync_pins_a &tx28_lcdif_ctrl_pins>; | 310 | pinctrl-0 = <&lcdif_24bit_pins_a &lcdif_sync_pins_a &tx28_lcdif_ctrl_pins>; |
311 | lcd-supply = <®_lcd>; | 311 | lcd-supply = <®_lcd>; |
312 | display = <&display>; | 312 | display = <&display0>; |
313 | status = "okay"; | 313 | status = "okay"; |
314 | 314 | ||
315 | display: display@0 { | 315 | display0: display0 { |
316 | bits-per-pixel = <32>; | 316 | bits-per-pixel = <32>; |
317 | bus-width = <24>; | 317 | bus-width = <24>; |
318 | display-timings { | 318 | display-timings { |