diff options
| author | Fabio Estevam | 2014-09-03 03:45:14 +0200 |
|---|---|---|
| committer | Shawn Guo | 2014-09-16 04:26:02 +0200 |
| commit | 3f50a61937b3fabe0c46123cef48e2569042ca07 (patch) | |
| tree | f1f98b1698643d593c1d9dc226fba65ab88bc381 /arch/arm/boot/dts/imx6sl-evk.dts | |
| parent | ARM: dts: imx23-evk: Fix display duplicate name warning (diff) | |
| download | kernel-qcow2-linux-3f50a61937b3fabe0c46123cef48e2569042ca07.tar.gz kernel-qcow2-linux-3f50a61937b3fabe0c46123cef48e2569042ca07.tar.xz kernel-qcow2-linux-3f50a61937b3fabe0c46123cef48e2569042ca07.zip | |
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/arm/boot/dts/imx6sl-evk.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx6sl-evk.dts | 4 |
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 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_lcd>; lcd-supply = <®_lcd_3v3>; - display = <&display>; + display = <&display0>; status = "okay"; - display: display { + display0: display0 { bits-per-pixel = <32>; bus-width = <24>; |