diff options
| author | Dong Aisheng <b29396@freescale.com> | 2015-04-29 19:15:33 +0800 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@nxp.com> | 2016-01-14 11:02:02 -0600 |
| commit | 17fe9e7b872bf834e0cea65ca8b890d35ca4cd23 (patch) | |
| tree | 542e353c080aab203a68bc81a2393913a049645b /arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-flexcan2.dts | |
| parent | 52fbec28decc70f7699ce8a70ee13d4a26b79118 (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/boot/dts/imx6ul-14x14-ddr3-arm2-flexcan2.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-14x14-ddr3-arm2-flexcan2.dts | 18 |
1 files changed, 18 insertions, 0 deletions
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..4806513c71e9 --- /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"; +}; + +&flexcan2 { + status = "okay"; +}; + |