diff options
| author | Dong Aisheng <aisheng.dong@freescale.com> | 2015-12-16 11:23:28 +0800 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@nxp.com> | 2016-01-14 11:02:45 -0600 |
| commit | c57d95fe51499c41945d49ed573160e5b7b8fbbc (patch) | |
| tree | 6d803cb14ed8b22cb1d1991b20dd6f570d204ed2 | |
| parent | be137110ca3d3cdf6aaaa201e58dc881d142327d (diff) | |
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>
| -rw-r--r-- | arch/arm/boot/dts/imx6dl-sabreauto-ecspi.dts | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6dl-sabreauto-gpmi-weim.dts | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6q-sabreauto-ecspi.dts | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6q-sabreauto-gpmi-weim.dts | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qp-sabreauto-ecspi.dts | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qp-sabreauto-gpmi-weim.dts | 5 |
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"; |