ARM: dts: imx6-tx6*: fix 'flexcan' labels

diff --git a/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts b/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
index 4b537313333387c01d33e72435bc756aa126ea67..1c602a4e733cd04f45859c83568348bfe5fe2e1f 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
+++ b/arch/arm/boot/dts/imx6dl-tx6dl-comtft.dts
@@ -66,11 +66,11 @@
        };
 };
 
-&flexcan1 {
+&can1 {
        status = "disabled";
 };
 
-&flexcan2 {
+&can2 {
        xceiver-supply = <&reg_3v3>;
 };
 

diff --git a/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts b/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts
index 00829488ccd810c33540e39c6782fe043576e393..8c6f6b9d8ad1ab5d955664b4e02ba5d72b284463 100644 (file)
--- a/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts
+++ b/arch/arm/boot/dts/imx6q-tx6q-1010-comtft.dts
@@ -66,11 +66,11 @@
        };
 };
 
-&flexcan1 {
+&can1 {
        status = "disabled";
 };
 
-&flexcan2 {
+&can2 {
        xceiver-supply = <&reg_3v3>;
 };
 

diff --git a/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts b/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts
index 2848f8eb0b30fb43c8174407fa8fc3de8101a2ab..70655fede36249acb4babcfd83b47251480bbf25 100644 (file)
--- a/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts
+++ b/arch/arm/boot/dts/imx6q-tx6q-1020-comtft.dts
@@ -66,11 +66,11 @@
        };
 };
 
-&flexcan1 {
+&can1 {
        status = "disabled";
 };
 
-&flexcan2 {
+&can2 {
        xceiver-supply = <&reg_3v3>;
 };
 

diff --git a/arch/arm/boot/dts/imx6qdl-tx6.dtsi b/arch/arm/boot/dts/imx6qdl-tx6.dtsi
index d943851569bb9b34adf4de7b00ce57c9d84a7812..2105c785a8348e481cc09fdf61d622ebc2e21b51 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;
@@ -187,14 +187,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>;