aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDong Aisheng <b29396@freescale.com>2014-03-06 06:12:16 -0500
committerNitin Garg <nitin.garg@freescale.com>2014-04-16 09:57:52 -0400
commit018f8680f1fdbcaefe8659f23aa289f1bc623faa (patch)
tree08e9d799a4bd4922338c5b911699cada114bacb4
parent1e3600919eddb4746c851f47cea319732f9ae894 (diff)
ENGR00302227-8 dts: imx6sx-sdb: add flexcan support
Add flexcan support Signed-off-by: Dong Aisheng <b29396@freescale.com>
-rw-r--r--arch/arm/boot/dts/imx6sx-sdb.dts18
-rw-r--r--arch/arm/mach-imx/mach-imx6sx.c3
2 files changed, 20 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dts
index d705f4f016d2..d3d81cfeea40 100644
--- a/arch/arm/boot/dts/imx6sx-sdb.dts
+++ b/arch/arm/boot/dts/imx6sx-sdb.dts
@@ -198,6 +198,22 @@
198 }; 198 };
199}; 199};
200 200
201&flexcan1 {
202 pinctrl-names = "default";
203 pinctrl-0 = <&pinctrl_flexcan1_1>;
204 trx-en-gpio = <&gpio4 25 GPIO_ACTIVE_HIGH>;
205 trx-stby-gpio = <&gpio4 27 GPIO_ACTIVE_HIGH>;
206 status = "okay";
207};
208
209&flexcan2 {
210 pinctrl-names = "default";
211 pinctrl-0 = <&pinctrl_flexcan2_1>;
212 trx-en-gpio = <&gpio4 25 GPIO_ACTIVE_HIGH>;
213 trx-stby-gpio = <&gpio4 27 GPIO_ACTIVE_HIGH>;
214 status = "okay";
215};
216
201&i2c2 { 217&i2c2 {
202 clock-frequency = <100000>; 218 clock-frequency = <100000>;
203 pinctrl-names = "default"; 219 pinctrl-names = "default";
@@ -244,6 +260,8 @@
244 MX6SX_PAD_SD4_DATA7__GPIO6_IO_21 0x17059 260 MX6SX_PAD_SD4_DATA7__GPIO6_IO_21 0x17059
245 MX6SX_PAD_SD4_DATA6__GPIO6_IO_20 0x17059 261 MX6SX_PAD_SD4_DATA6__GPIO6_IO_20 0x17059
246 MX6SX_PAD_SD1_DATA0__GPIO6_IO_2 0x17059 262 MX6SX_PAD_SD1_DATA0__GPIO6_IO_2 0x17059
263 MX6SX_PAD_QSPI1B_DATA1__GPIO4_IO_25 0x17059
264 MX6SX_PAD_QSPI1B_DATA3__GPIO4_IO_27 0x17059
247 >; 265 >;
248 }; 266 };
249 }; 267 };
diff --git a/arch/arm/mach-imx/mach-imx6sx.c b/arch/arm/mach-imx/mach-imx6sx.c
index a0059960dd8b..8b61e1afde3a 100644
--- a/arch/arm/mach-imx/mach-imx6sx.c
+++ b/arch/arm/mach-imx/mach-imx6sx.c
@@ -187,7 +187,8 @@ static void __init imx6sx_init_late(void)
187 187
188 imx6q_cpuidle_init(); 188 imx6q_cpuidle_init();
189 189
190 if (of_machine_is_compatible("fsl,imx6sx-17x17-arm2")) 190 if (of_machine_is_compatible("fsl,imx6sx-17x17-arm2") ||
191 of_machine_is_compatible("fsl,imx6sx-sdb"))
191 imx6sx_arm2_flexcan_fixup(); 192 imx6sx_arm2_flexcan_fixup();
192} 193}
193 194