diff options
| author | Dong Aisheng <b29396@freescale.com> | 2015-04-29 19:15:33 +0800 |
|---|---|---|
| committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:23:35 +0800 |
| commit | 7f782944ccb221a199a2309b2249d3712c56edac (patch) | |
| tree | b9c7eee805470f911e479c80fbe913ca3ad0bbf2 /arch/arm | |
| parent | a36821d8c119ecb2e1a38c4ea804447977b235e2 (diff) | |
MLK-10853-2 dts: imx6ul-ddr3-arm2: add flexcan2 support
Flexcan2 on ddr3 arm2 board is conflict with uart2, thus a new dts
imx6ul-14x14-ddr3-arm2-flexcan2.dts with uart2 disabled is introduced to
resolve such confliction.
Signed-off-by: Dong Aisheng <b29396@freescale.com>
(cherry picked from commit 14d7595a2f1622c72de1bc534cf18b9e828140ea)
Conflicts:
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/imx6ul-ddr3-arm2.dts
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-flexcan2.dts | 18 |
2 files changed, 19 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 9eccf66ce53e..38ca669647ad 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -510,6 +510,7 @@ dtb-$(CONFIG_SOC_IMX6UL) += \ imx6ul-tx6ul-mainboard.dtb \ imx6ul-14x14-ddr3-arm2.dtb \ imx6ul-14x14-ddr3-arm2-emmc.dtb \ + imx6ul-14x14-ddr3-arm2-flexcan2.dtb \ imx6ul-14x14-ddr3-arm2-gpmi-weim.dtb \ imx6ul-14x14-ddr3-arm2-mqs.dtb \ imx6ul-14x14-ddr3-arm2-spdif.dtb \ diff --git a/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-flexcan2.dts b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-flexcan2.dts new file mode 100644 index 000000000000..1a3a0141d747 --- /dev/null +++ b/arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-flexcan2.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 "imx6ul-14x14-ddr3-arm2.dts" + +&uart2{ + status = "disabled"; +}; + +&can2 { + status = "okay"; +}; + |