From dbf73e20a29cc4515e559d58b1feeaa8574d21e2 Mon Sep 17 00:00:00 2001 From: Dong Aisheng Date: Thu, 6 Mar 2014 19:12:16 +0800 Subject: [PATCH] ENGR00302227-8 dts: imx6sx-sdb: add flexcan support Add flexcan support Signed-off-by: Dong Aisheng (cherry picked from commit 88a15283025250835ca757f5ad61d2a78ca0dbd6) --- arch/arm/boot/dts/imx6sx-sdb.dts | 30 ++++++++++++++++++++++++++++++ arch/arm/mach-imx/mach-imx6sx.c | 3 +++ 2 files changed, 33 insertions(+) diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dts index ff7e47386067..cb2922394dda 100644 --- a/arch/arm/boot/dts/imx6sx-sdb.dts +++ b/arch/arm/boot/dts/imx6sx-sdb.dts @@ -198,6 +198,22 @@ status = "okay"; }; +&flexcan1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan1>; + 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>; + trx-en-gpio = <&gpio4 25 GPIO_ACTIVE_HIGH>; + trx-stby-gpio = <&gpio4 27 GPIO_ACTIVE_HIGH>; + status = "okay"; +}; + &qspi2 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_qspi2_1>; @@ -340,6 +356,20 @@ >; }; + pinctrl_flexcan1: flexcan1grp { + fsl,pins = < + MX6SX_PAD_QSPI1B_DQS__CAN1_TX 0x1b0b0 + MX6SX_PAD_QSPI1A_SS1_B__CAN1_RX 0x1b0b0 + >; + }; + + pinctrl_flexcan2: flexcan2grp { + fsl,pins = < + MX6SX_PAD_QSPI1B_SS1_B__CAN2_RX 0x1b0b0 + MX6SX_PAD_QSPI1A_DQS__CAN2_TX 0x1b0b0 + >; + }; + pinctrl_gpio_keys: gpio_keysgrp { fsl,pins = < MX6SX_PAD_CSI_DATA04__GPIO1_IO_18 0x17059 diff --git a/arch/arm/mach-imx/mach-imx6sx.c b/arch/arm/mach-imx/mach-imx6sx.c index 436a9be8ab8b..d40e2e4293b6 100644 --- a/arch/arm/mach-imx/mach-imx6sx.c +++ b/arch/arm/mach-imx/mach-imx6sx.c @@ -138,6 +138,9 @@ static void __init imx6sx_init_late(void) imx6sx_opp_init(&imx6sx_cpufreq_pdev.dev); platform_device_register(&imx6sx_cpufreq_pdev); } + + if (of_machine_is_compatible("fsl,imx6sx-sdb")) + imx6sx_arm2_flexcan_fixup(); } DT_MACHINE_START(IMX6SX, "Freescale i.MX6 SoloX (Device Tree)") -- 2.39.2