From 018f8680f1fdbcaefe8659f23aa289f1bc623faa Mon Sep 17 00:00:00 2001 From: Dong Aisheng Date: Thu, 6 Mar 2014 19:12:16 +0800 Subject: ENGR00302227-8 dts: imx6sx-sdb: add flexcan support Add flexcan support Signed-off-by: Dong Aisheng --- arch/arm/boot/dts/imx6sx-sdb.dts | 18 ++++++++++++++++++ arch/arm/mach-imx/mach-imx6sx.c | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) 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 @@ }; }; +&flexcan1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan1_1>; + trx-en-gpio = <&gpio4 25 GPIO_ACTIVE_HIGH>; + trx-stby-gpio = <&gpio4 27 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + +&flexcan2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan2_1>; + trx-en-gpio = <&gpio4 25 GPIO_ACTIVE_HIGH>; + trx-stby-gpio = <&gpio4 27 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + &i2c2 { clock-frequency = <100000>; pinctrl-names = "default"; @@ -244,6 +260,8 @@ MX6SX_PAD_SD4_DATA7__GPIO6_IO_21 0x17059 MX6SX_PAD_SD4_DATA6__GPIO6_IO_20 0x17059 MX6SX_PAD_SD1_DATA0__GPIO6_IO_2 0x17059 + MX6SX_PAD_QSPI1B_DATA1__GPIO4_IO_25 0x17059 + MX6SX_PAD_QSPI1B_DATA3__GPIO4_IO_27 0x17059 >; }; }; 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) imx6q_cpuidle_init(); - if (of_machine_is_compatible("fsl,imx6sx-17x17-arm2")) + if (of_machine_is_compatible("fsl,imx6sx-17x17-arm2") || + of_machine_is_compatible("fsl,imx6sx-sdb")) imx6sx_arm2_flexcan_fixup(); } -- cgit v1.2.2