ENGR00319455-3 dts: imx6sx-sdb: add canfd support

Introduce a new dtb imx6sx-sdb-canfd.dtb due to pin conflict with flexcan.

Signed-off-by: Dong Aisheng <b29396@freescale.com>

3 files changed, 74 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index e37e1a092912..efc8bb828ae5 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -152,6 +152,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
         imx6sx-sdb-sai.dtb \
         imx6sx-sdb-emmc.dtb \
         imx6sx-sdb-m4.dtb \
+        imx6sx-sdb-canfd.dtb \
         vf610-twr.dtb
 dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
         imx23-olinuxino.dtb \
diff --git a/arch/arm/boot/dts/imx6sx-sdb-canfd.dts b/arch/arm/boot/dts/imx6sx-sdb-canfd.dts
new file mode 100644
index 000000000000..496f24a40162
--- /dev/null
+++ b/arch/arm/boot/dts/imx6sx-sdb-canfd.dts
@@ -0,0 +1,35 @@
+/*
+ * Copyright (C) 2014 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 "imx6sx-sdb.dts"
+
+/*
+ * flexcan and canfd are sharing the same pads, so disable flexcan to
+ * enable canfd.
+ * There's a trick here that the tranceiver configuration gpios are still
+ * got from the flexcan node since they're using the same tranceiver.
+ */
+&flexcan1 {
+        status = "disabled";
+};
+
+&flexcan2 {
+        status = "disabled";
+};
+
+&canfd1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_canfd1_1>;
+        status = "okay";
+};
+
+&canfd2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_canfd2_1>;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index bfbc2b7647fe..b3863694bc94 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -673,6 +673,26 @@
                                 };
                         };
 
+                        canfd1: canfd@020e8000 {
+                                compatible = "bosch,m_can";
+                                reg = <0x020e8000 0x4000>, <0x02298000 0x4000>;
+                                reg-names = "canfd", "message_ram";
+                                interrupts = <0 114 0x04>;
+                                clocks = <&clks IMX6SX_CLK_CANFD>;
+                                mram-cfg = <0x0 0 0 32 32 32 0 1>;
+                                status = "disabled";
+                        };
+
+                        canfd2: canfd@020f0000 {
+                                compatible = "bosch,m_can";
+                                reg = <0x020f0000 0x4000>, <0x02298000 0x4000>;
+                                reg-names = "canfd", "message_ram";
+                                interrupts = <0 115 0x04>;
+                                clocks = <&clks IMX6SX_CLK_CANFD>;
+                                mram-cfg = <0x2000 0 0 32 32 32 0 1>;
+                                status = "disabled";
+                        };
+
                         pwm1: pwm@02080000 {
                                 #pwm-cells = <2>;
                                 compatible = "fsl,imx6sx-pwm", "fsl,imx27-pwm";
@@ -1222,6 +1242,24 @@
                 };
         };
 
+        canfd1 {
+                pinctrl_canfd1_1: canfd1grp-1 {
+                        fsl,pins = <
+                                MX6SX_PAD_QSPI1B_DQS__CANFD_TX1         0x1b0b0
+                                MX6SX_PAD_QSPI1A_SS1_B__CANFD_RX1       0x1b0b0
+                        >;
+                };
+        };
+
+        canfd2 {
+                pinctrl_canfd2_1: canfd2grp-1 {
+                        fsl,pins = <
+                                MX6SX_PAD_QSPI1B_SS1_B__CANFD_RX2       0x1b0b0
+                                MX6SX_PAD_QSPI1A_DQS__CANFD_TX2         0x1b0b0
+                        >;
+                };
+        };
+
         csi {
                 pinctrl_csi_0: csigrp-0 {
                         fsl,pins = <