]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
ARM: dts: imx28-tx28: Fix display duplicate name warning
authorFabio Estevam <fabio.estevam@freescale.com>
Fri, 5 Sep 2014 01:31:22 +0000 (22:31 -0300)
committerShawn Guo <shawn.guo@freescale.com>
Tue, 16 Sep 2014 02:26:04 +0000 (10:26 +0800)
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>
arch/arm/boot/dts/imx28-tx28.dts

index e14bd86f3e9999a50e0f60a7b443ed2b06ecbd07..f947fbb8c367d9645a068dfa0ece6f22361697b5 100644 (file)
@@ -21,7 +21,7 @@
        aliases {
                can0 = &can0;
                can1 = &can1;
-               display = &display;
+               display = &display0;
                ds1339 = &ds1339;
                gpio5 = &gpio5;
                lcdif = &lcdif;
        pinctrl-names = "default";
        pinctrl-0 = <&lcdif_24bit_pins_a &lcdif_sync_pins_a &tx28_lcdif_ctrl_pins>;
        lcd-supply = <&reg_lcd>;
-       display = <&display>;
+       display = <&display0>;
        status = "okay";
 
-       display: display@0 {
+       display0: display0 {
                bits-per-pixel = <32>;
                bus-width = <24>;
                display-timings {