From 306d24f52fa96681a5fba7599915d22beeb237bd Mon Sep 17 00:00:00 2001 From: Dong Aisheng Date: Wed, 16 Dec 2015 11:23:28 +0800 Subject: 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 --- arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts') 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"; -- cgit v1.2.3