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

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 9336ec1..5a3cdec 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -451,6 +451,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 (file)
index 0000000..1a3a014
--- /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";
+};
+