6 files changed, 6 insertions, 24 deletions
diff --git a/arch/arm/boot/dts/imx6dl-sabreauto-ecspi.dts b/arch/arm/boot/dts/imx6dl-sabreauto-ecspi.dts
index 23d362c589c7..45ae16283627 100644
--- 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 bceeb39129ec..ad2e937d4ffa 100644
--- 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 4fbb20725fea..3cf99ed9be6b 100644
--- 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 269d3626eece..579aeb26e05d 100644
--- 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 ace6da9e0976..8846739a5558 100644
--- 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 ce910b648929..b91ebad61116 100644
--- 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";