diff options
| author | Dong Aisheng <b29396@freescale.com> | 2015-05-06 16:19:50 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2015-05-08 17:25:20 +0800 |
| commit | ea58712d39ae08d2d078453f067c01dda9b8e450 (patch) | |
| tree | 5752f78e06ffc7e9b7534b8f49cc2532e259cd96 | |
| parent | b11073abae54a3357d95e1ea415435f8bb53568d (diff) | |
MLK-10819 dts: imx6qp-sabreaudo: add flexcan1 support
Flexcan1 is conflict with fec, so a new dts imx6qp-sabreauto-flexcan1.dts
is introduced which has flexcan1 enabled while fec disabled.
BTW, the patch also fixes a typo of adding imx6qp-sabreauto-gpmi-weim.dtb
in Makefile.
Signed-off-by: Dong Aisheng <b29396@freescale.com>
(cherry picked from commit af9f3293e568284d7610f82458e8ee529bec68db)
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 3 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6qp-sabreauto-flexcan1.dts | 18 |
2 files changed, 20 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 5dec3b3f22a1..fcd3ed4f1872 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -174,7 +174,8 @@ dtb-$(CONFIG_ARCH_MXC) += \ imx6q-sabreauto-gpmi-weim.dtb \ imx6qp-sabreauto.dtb \ imx6qp-sabreauto-ecspi.dtb \ - imx6qp-sabreauto-gpmi-weim.dtb\ + imx6qp-sabreauto-flexcan1.dtb \ + imx6qp-sabreauto-gpmi-weim.dtb \ imx6q-sabrelite.dtb \ imx6q-sabresd.dtb \ imx6q-sabresd-ldo.dtb \ diff --git a/arch/arm/boot/dts/imx6qp-sabreauto-flexcan1.dts b/arch/arm/boot/dts/imx6qp-sabreauto-flexcan1.dts new file mode 100644 index 000000000000..a8aa08ce220e --- /dev/null +++ b/arch/arm/boot/dts/imx6qp-sabreauto-flexcan1.dts @@ -0,0 +1,18 @@ +/* + * Copyright (C) 2015 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include "imx6qp-sabreauto.dts" + +&flexcan1{ + status = "okay"; +}; + +&fec { + /* pin conflict with flexcan1 */ + status = "disabled"; +}; |