From 6545df4a1401f258a0bbce6c88347ab726de83f4 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Mon, 24 Sep 2018 14:59:12 +0200 Subject: ARM: dts: imx7-colibri: unify settings for FlexCAN The current Colibri iMX7 device tree are prepared for flexcan1 and flexcan2. However their settings are different and the integration is done to a different degree. Unify that. Signed-off-by: Max Krummenacher Acked-by: Marcel Ziswiler --- arch/arm/boot/dts/imx7-colibri.dtsi | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/imx7-colibri.dtsi b/arch/arm/boot/dts/imx7-colibri.dtsi index 46603e3b881b..9cbfde7bd843 100644 --- a/arch/arm/boot/dts/imx7-colibri.dtsi +++ b/arch/arm/boot/dts/imx7-colibri.dtsi @@ -135,6 +135,12 @@ status = "disabled"; }; +&flexcan2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_flexcan2>; + status = "disabled"; +}; + &gpmi { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_gpmi_nand>; @@ -514,15 +520,15 @@ pinctrl_flexcan1: flexcan1-grp { fsl,pins = < - MX7D_PAD_ENET1_RGMII_RD3__FLEXCAN1_TX 0x78 /* SODIMM 55 */ - MX7D_PAD_ENET1_RGMII_RD2__FLEXCAN1_RX 0x78 /* SODIMM 63 */ + 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 */ >; }; -- cgit v1.2.3