arch: arm: dts: add dts file to enable can1
authorJoakim Zhang <qiangqing.zhang@nxp.com>
Tue, 29 Oct 2019 05:01:08 +0000 (13:01 +0800)
committerDong Aisheng <aisheng.dong@nxp.com>
Mon, 14 Dec 2020 03:20:22 +0000 (11:20 +0800)
Add dts file to enbale can1 which is pin conflict with fec on
i.MX6Q/QP/DL sabreauto board.

Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts [new file with mode: 0644]
arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts [new file with mode: 0644]
arch/arm/boot/dts/imx6qp-sabreauto-flexcan1.dts [new file with mode: 0644]

index e7a831c..91d5f9c 100644 (file)
@@ -465,6 +465,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
        imx6dl-riotboard.dtb \
        imx6dl-sabreauto.dtb \
        imx6dl-sabreauto-enetirq.dtb \
+       imx6dl-sabreauto-flexcan1.dtb \
        imx6dl-sabrelite.dtb \
        imx6dl-sabresd.dtb \
        imx6dl-sabresd-hdcp.dtb \
@@ -558,6 +559,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
        imx6q-rex-pro.dtb \
        imx6q-sabreauto.dtb \
        imx6q-sabreauto-enetirq.dtb \
+       imx6q-sabreauto-flexcan1.dtb \
        imx6q-sabrelite.dtb \
        imx6q-sabresd.dtb \
        imx6q-sabresd-hdcp.dtb \
@@ -587,6 +589,7 @@ dtb-$(CONFIG_SOC_IMX6Q) += \
        imx6qp-nitrogen6_som2.dtb \
        imx6qp-phytec-mira-rdk-nand.dtb \
        imx6qp-sabreauto.dtb \
+       imx6qp-sabreauto-flexcan1.dtb \
        imx6qp-sabresd.dtb \
        imx6qp-sabresd-hdcp.dtb \
        imx6qp-tx6qp-8037.dtb \
diff --git a/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts b/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts
new file mode 100644 (file)
index 0000000..f101f7c
--- /dev/null
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2013 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 "imx6dl-sabreauto.dts"
+
+&can1{
+       status = "okay";
+};
+
+&fec {
+       /* pin conflict with flexcan1 */
+       status = "disabled";
+};
diff --git a/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts b/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts
new file mode 100644 (file)
index 0000000..71dd589
--- /dev/null
@@ -0,0 +1,18 @@
+/*
+ * Copyright (C) 2013 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 "imx6q-sabreauto.dts"
+
+&can1{
+       status = "okay";
+};
+
+&fec {
+       /* pin conflict with flexcan1 */
+       status = "disabled";
+};
diff --git a/arch/arm/boot/dts/imx6qp-sabreauto-flexcan1.dts b/arch/arm/boot/dts/imx6qp-sabreauto-flexcan1.dts
new file mode 100644 (file)
index 0000000..b57607b
--- /dev/null
@@ -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"
+
+&can1{
+       status = "okay";
+};
+
+&fec {
+       /* pin conflict with flexcan1 */
+       status = "disabled";
+};