KARO: cleanup after merge of Freescale 3.10.17 stuff

[karo-tx-linux.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 d943851569bb9b34adf4de7b00ce57c9d84a7812..8f817c06912f06f7e3c635cd356f5d8d47682bcb 100644 (file)
--- a/arch/arm/boot/dts/imx6qdl-tx6.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
@@ -14,8 +14,8 @@
 
 / {
        aliases {
-               can0 = &flexcan2;
-               can1 = &flexcan1;
+               can0 = &can2;
+               can1 = &can1;
                ethernet0 = &fec;
                lcdif_23bit_pins_a = &pinctrl_disp0_1;
                lcdif_24bit_pins_a = &pinctrl_disp0_2;
@@ -179,6 +179,11 @@
                mux-int-port = <1>;
                mux-ext-port = <5>;
        };
+
+       v4l2_out {
+               compatible = "fsl,mxc_v4l2_output";
+               status = "okay";
+       };
 };
 
 &audmux {
@@ -187,14 +192,14 @@
        status = "okay";
 };
 
-&flexcan1 {
+&can1 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_flexcan1>;
        xceiver-supply = <&reg_can_xcvr>;
        status = "okay";
 };
 
-&flexcan2 {
+&can2 {
        pinctrl-names = "default";
        pinctrl-0 = <&pinctrl_flexcan2>;
        xceiver-supply = <&reg_can_xcvr>;