MLK-12016-4 dts: imx6: remove flexcan for pin conflict devices

Removing flexcan for pin conflict devices such as ecspi/gpmi.

Signed-off-by: Dong Aisheng <aisheng.dong@freescale.com>
Signed-off-by: Arulpandiyan Vadivel <arulpandiyan_vadivel@mentor.com>
Signed-off-by: Srikanth Krishnakar <Srikanth_Krishnakar@mentor.com>

diff --git a/arch/arm/boot/dts/imx6dl-sabreauto-ecspi.dts b/arch/arm/boot/dts/imx6dl-sabreauto-ecspi.dts
index 23d362c..45ae162 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-sabreauto-ecspi.dts
+++ b/arch/arm/boot/dts/imx6dl-sabreauto-ecspi.dts
@@ -13,13 +13,10 @@
        status = "okay";
 };
 
-/* remove the #if 0 after flexcan is ready */
-#if 0
-&flexcan2 {
+&can2 {
        /* max7310_c on i2c3 is gone */
        status = "disabled";
 };
-#endif
 
 &i2c3 {
        /* pin conflict with ecspi1 */

diff --git a/arch/arm/boot/dts/imx6dl-sabreauto-gpmi-weim.dts b/arch/arm/boot/dts/imx6dl-sabreauto-gpmi-weim.dts
index bceeb39..ad2e937 100644 (file)
--- a/arch/arm/boot/dts/imx6dl-sabreauto-gpmi-weim.dts
+++ b/arch/arm/boot/dts/imx6dl-sabreauto-gpmi-weim.dts
@@ -13,13 +13,10 @@
        status = "disabled";
 };
 
-/* remove #if 0 after flexcan is ready */
-#if 0
-&flexcan2 {
+&can2 {
        /* max7310_c on i2c3 is gone */
        status = "disabled";
 };
-#endif
 
 &gpmi {
        status = "okay";

diff --git a/arch/arm/boot/dts/imx6q-sabreauto-ecspi.dts b/arch/arm/boot/dts/imx6q-sabreauto-ecspi.dts
index 4fbb207..3cf99ed 100644 (file)
--- a/arch/arm/boot/dts/imx6q-sabreauto-ecspi.dts
+++ b/arch/arm/boot/dts/imx6q-sabreauto-ecspi.dts
@@ -13,13 +13,10 @@
        status = "okay";
 };
 
-/* remove #if 0 after flexcan is ready */
-#if 0
-&flexcan2 {
+&can2 {
        /* max7310_c on i2c3 is gone */
        status = "disabled";
 };
-#endif
 
 &i2c3 {
        /* pin conflict with ecspi1 */

diff --git a/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts b/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts
index 269d362..579aeb2 100644 (file)
--- a/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts
+++ b/arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts
@@ -13,13 +13,10 @@
        status = "disabled";
 };
 
-/* remove #if 0 after flexcan is ready */
-#if 0
-&flexcan2 {
+&can2 {
        /* max7310_c on i2c3 is gone */
        status = "disabled";
 };
-#endif
 
 &gpmi {
        status = "okay";

diff --git a/arch/arm/boot/dts/imx6qp-sabreauto-ecspi.dts b/arch/arm/boot/dts/imx6qp-sabreauto-ecspi.dts
index ace6da9..8846739 100644 (file)
--- a/arch/arm/boot/dts/imx6qp-sabreauto-ecspi.dts
+++ b/arch/arm/boot/dts/imx6qp-sabreauto-ecspi.dts
@@ -13,13 +13,10 @@
        status = "okay";
 };
 
-/* remove #if 0 after flexcan is ready */
-#if 0
-&flexcan2 {
+&can2 {
        /* max7310_c on i2c3 is gone */
        status = "disabled";
 };
-#endif
 
 &i2c3 {
        /* pin conflict with ecspi1 */

diff --git a/arch/arm/boot/dts/imx6qp-sabreauto-gpmi-weim.dts b/arch/arm/boot/dts/imx6qp-sabreauto-gpmi-weim.dts
index ce910b6..b91ebad 100644 (file)
--- a/arch/arm/boot/dts/imx6qp-sabreauto-gpmi-weim.dts
+++ b/arch/arm/boot/dts/imx6qp-sabreauto-gpmi-weim.dts
@@ -13,13 +13,10 @@
        status = "disabled";
 };
 
-/* remove #if 0 after flexcan is ready */
-#if 0
-&flexcan2 {
+&can2 {
        /* max7310_c on i2c3 is gone */
        status = "disabled";
 };
-#endif
 
 &gpmi {
        compatible = "fsl,imx6qp-gpmi-nand";