Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / imx6qdl-tx6.dtsi

diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
index f015e2d1cf353954b069a5b4cbfb40dd3188adc4..a98fb2564c63f47ed59699ac4fc9a5510e158ca3 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
@@ -50,11 +50,11 @@
                can0 = &can2;
                can1 = &can1;
                ethernet0 = &fec;
-               lcdif_23bit_pins_a = &pinctrl_disp0_1;
-               lcdif_24bit_pins_a = &pinctrl_disp0_2;
+               lcdif-23bit-pins-a = &pinctrl_disp0_1;
+               lcdif-24bit-pins-a = &pinctrl_disp0_2;
                pwm0 = &pwm1;
                pwm1 = &pwm2;
-               reg_can_xcvr = &reg_can_xcvr;
+               reg-can-xcvr = &reg_can_xcvr;
                stk5led = &user_led;
                usbotg = &usbotg;
                sdhc0 = &usdhc1;