| From 6481ef7541f3bad8d7dbd593401131fa97049604 Mon Sep 17 00:00:00 2001 |
| From: Philippe Schenker <philippe.schenker@toradex.com> |
| Date: Mon, 12 Aug 2019 14:21:18 +0000 |
| Subject: [PATCH] ARM: dts: imx7-colibri: prepare module device tree for |
| FlexCAN |
| |
| commit 03d655ff251c8296cd887055e470796eb1e47e47 upstream. |
| |
| Prepare FlexCAN use on SODIMM 55/63 178/188. Those SODIMM pins are |
| compatible for CAN bus use with several modules from the Colibri |
| family. |
| Add Better drivestrength and also add flexcan2. |
| |
| Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com> |
| Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com> |
| Signed-off-by: Shawn Guo <shawnguo@kernel.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi |
| index 37aeba999be3..8b04dbcae644 100644 |
| --- a/arch/arm/boot/dts/imx7-colibri.dtsi |
| +++ b/arch/arm/boot/dts/imx7-colibri.dtsi |
| @@ -115,6 +115,18 @@ |
| fsl,magic-packet; |
| }; |
| |
| +&flexcan1 { |
| + pinctrl-names = "default"; |
| + pinctrl-0 = <&pinctrl_flexcan1>; |
| + status = "disabled"; |
| +}; |
| + |
| +&flexcan2 { |
| + pinctrl-names = "default"; |
| + pinctrl-0 = <&pinctrl_flexcan2>; |
| + status = "disabled"; |
| +}; |
| + |
| &gpmi { |
| pinctrl-names = "default"; |
| pinctrl-0 = <&pinctrl_gpmi_nand>; |
| @@ -327,12 +339,11 @@ |
| |
| &iomuxc { |
| pinctrl-names = "default"; |
| - pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 &pinctrl_gpio4>; |
| + pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 &pinctrl_gpio4 |
| + &pinctrl_gpio7>; |
| |
| pinctrl_gpio1: gpio1-grp { |
| fsl,pins = < |
| - MX7D_PAD_ENET1_RGMII_RD3__GPIO7_IO3 0x74 /* SODIMM 55 */ |
| - MX7D_PAD_ENET1_RGMII_RD2__GPIO7_IO2 0x74 /* SODIMM 63 */ |
| MX7D_PAD_SAI1_RX_SYNC__GPIO6_IO16 0x14 /* SODIMM 77 */ |
| MX7D_PAD_EPDC_DATA09__GPIO2_IO9 0x14 /* SODIMM 89 */ |
| MX7D_PAD_EPDC_DATA08__GPIO2_IO8 0x74 /* SODIMM 91 */ |
| @@ -413,6 +424,13 @@ |
| >; |
| }; |
| |
| + pinctrl_gpio7: gpio7-grp { /* Alternatively CAN1 */ |
| + fsl,pins = < |
| + MX7D_PAD_ENET1_RGMII_RD3__GPIO7_IO3 0x14 /* SODIMM 55 */ |
| + MX7D_PAD_ENET1_RGMII_RD2__GPIO7_IO2 0x14 /* SODIMM 63 */ |
| + >; |
| + }; |
| + |
| pinctrl_i2c1_int: i2c1-int-grp { /* PMIC / TOUCH */ |
| fsl,pins = < |
| MX7D_PAD_GPIO1_IO13__GPIO1_IO13 0x79 |
| @@ -456,10 +474,17 @@ |
| >; |
| }; |
| |
| + pinctrl_flexcan1: flexcan1-grp { |
| + fsl,pins = < |
| + MX7D_PAD_ENET1_RGMII_RD3__FLEXCAN1_TX 0x79 /* SODIMM 55 */ |
| + MX7D_PAD_ENET1_RGMII_RD2__FLEXCAN1_RX 0x79 /* SODIMM 63 */ |
| + >; |
| + }; |
| + |
| pinctrl_flexcan2: flexcan2-grp { |
| fsl,pins = < |
| - MX7D_PAD_GPIO1_IO14__FLEXCAN2_RX 0x59 |
| - MX7D_PAD_GPIO1_IO15__FLEXCAN2_TX 0x59 |
| + MX7D_PAD_GPIO1_IO14__FLEXCAN2_RX 0x79 /* SODIMM 188 */ |
| + MX7D_PAD_GPIO1_IO15__FLEXCAN2_TX 0x79 /* SODIMM 178 */ |
| >; |
| }; |
| |
| -- |
| 2.7.4 |
| |
