summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-flexcan2.dts
diff options
context:
space:
mode:
authorLeonard Crestez <leonard.crestez@nxp.com>2018-03-07 22:47:54 +0200
committerJason Liu <jason.hui.liu@nxp.com>2019-02-12 10:24:39 +0800
commitbe03a9f3c30021185cc06d8a2be357ca784b6796 (patch)
tree66b14f3f394f7779b7f3509918c7d706c5f42889 /arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-flexcan2.dts
parent6c5aed9618b7bf748ee3760fc3dce373b5961865 (diff)
MLK-12744 dts: imx6ull-ddr3-arm2: add flexcan2 support
flexcan2 tx/rx pin conflicts with uart2, so introduce new dts. Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com>
Diffstat (limited to 'arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-flexcan2.dts')
-rw-r--r--arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-flexcan2.dts19
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-flexcan2.dts b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-flexcan2.dts
new file mode 100644
index 000000000000..c8c92c392266
--- /dev/null
+++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-flexcan2.dts
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2016 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 "imx6ull-14x14-ddr3-arm2.dts"
+
+/* flexcan2 tx/rx pin conflicts with uart2 */
+
+&uart2 {
+ status = "disabled";
+};
+
+&flexcan2 {
+ status = "okay";
+};