diff options
| author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-09-05 03:31:22 +0200 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@freescale.com> | 2014-09-16 04:26:04 +0200 |
| commit | 58a32d91306787d6733767321a14c39afc136d93 (patch) | |
| tree | 71a263a42e09a207391a3661a85b4bcf790f828c /arch/arm/boot/dts/imx28-tx28.dts | |
| parent | ARM: dts: imx28-m28cu: Fix display duplicate name warning (diff) | |
| download | linux-58a32d91306787d6733767321a14c39afc136d93.tar.xz linux-58a32d91306787d6733767321a14c39afc136d93.zip | |
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 @@ aliases { can0 = &can0; can1 = &can1; - display = &display; + display = &display0; ds1339 = &ds1339; gpio5 = &gpio5; lcdif = &lcdif; @@ -309,10 +309,10 @@ pinctrl-names = "default"; pinctrl-0 = <&lcdif_24bit_pins_a &lcdif_sync_pins_a &tx28_lcdif_ctrl_pins>; lcd-supply = <®_lcd>; - display = <&display>; + display = <&display0>; status = "okay"; - display: display@0 { + display0: display0 { bits-per-pixel = <32>; bus-width = <24>; display-timings { |