ENGR00286724-10 dts: sabreauto: add new dts for flexcan1 support

The flexcan1 is pin conflict with fec. So we add a new dts file with
flexcan1 enabled with fec disabled for user to use.

Signed-off-by: Dong Aisheng <b29396@freescale.com>
(cherry picked from commit ce7e34bdf46deb88fd8db718ffbad47507465fc8)

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 86ce4aabc4c3afd2f2f1b5f2b33eae4204d9e131..820e1b71fa18fe4e07d205999e68431120c9f2a5 100644 (file)
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -156,6 +156,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
        imx6dl-cubox-i.dtb \
        imx6dl-hummingboard.dtb \
        imx6dl-sabreauto.dtb \
+       imx6dl-sabreauto-flexcan1.dtb \
        imx6dl-sabresd.dtb \
        imx6dl-sabresd-hdcp.dtb \
        imx6dl-wandboard.dtb \
@@ -163,6 +164,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
        imx6q-cubox-i.dtb \
        imx6q-phytec-pbab01.dtb \
        imx6q-sabreauto.dtb \
+       imx6q-sabreauto-flexcan1.dtb \
        imx6q-sabrelite.dtb \
        imx6q-sabresd.dtb \
        imx6q-sabresd-enetirq.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..14c8191
--- /dev/null
+++ b/arch/arm/boot/dts/imx6dl-sabreauto-flexcan1.dts
@@ -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"
+
+&flexcan1{
+       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..a7124c0
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-sabreauto-flexcan1.dts
@@ -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"
+
+&flexcan1{
+       status = "okay";
+};
+
+&fec {
+       /* pin conflict with flexcan1 */
+       status = "disabled";
+};