| From 7007f2eca0f258710899ca486da00546d03db0ed Mon Sep 17 00:00:00 2001 |
| From: Oleksandr Suvorov <oleksandr.suvorov@toradex.com> |
| Date: Tue, 4 Feb 2020 13:11:47 +0200 |
| Subject: ARM: dts: imx7-colibri: fix muxing of usbc_det pin |
| |
| From: Oleksandr Suvorov <oleksandr.suvorov@toradex.com> |
| |
| commit 7007f2eca0f258710899ca486da00546d03db0ed upstream. |
| |
| USB_C_DET pin shouldn't be in ethernet group. |
| |
| Creating a separate group allows one to use this pin |
| as an USB ID pin. |
| |
| Fixes: b326629f25b7 ("ARM: dts: imx7: add Toradex Colibri iMX7S/iMX7D suppor") |
| Signed-off-by: Oleksandr Suvorov <oleksandr.suvorov@toradex.com> |
| Signed-off-by: Shawn Guo <shawnguo@kernel.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| arch/arm/boot/dts/imx7-colibri.dtsi | 9 +++++++-- |
| 1 file changed, 7 insertions(+), 2 deletions(-) |
| |
| --- a/arch/arm/boot/dts/imx7-colibri.dtsi |
| +++ b/arch/arm/boot/dts/imx7-colibri.dtsi |
| @@ -346,7 +346,7 @@ |
| &iomuxc { |
| pinctrl-names = "default"; |
| pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 &pinctrl_gpio4 |
| - &pinctrl_gpio7>; |
| + &pinctrl_gpio7 &pinctrl_usbc_det>; |
| |
| pinctrl_gpio1: gpio1-grp { |
| fsl,pins = < |
| @@ -451,7 +451,6 @@ |
| |
| pinctrl_enet1: enet1grp { |
| fsl,pins = < |
| - MX7D_PAD_ENET1_CRS__GPIO7_IO14 0x14 |
| MX7D_PAD_ENET1_RGMII_RX_CTL__ENET1_RGMII_RX_CTL 0x73 |
| MX7D_PAD_ENET1_RGMII_RD0__ENET1_RGMII_RD0 0x73 |
| MX7D_PAD_ENET1_RGMII_RD1__ENET1_RGMII_RD1 0x73 |
| @@ -649,6 +648,12 @@ |
| >; |
| }; |
| |
| + pinctrl_usbc_det: gpio-usbc-det { |
| + fsl,pins = < |
| + MX7D_PAD_ENET1_CRS__GPIO7_IO14 0x14 |
| + >; |
| + }; |
| + |
| pinctrl_usbh_reg: gpio-usbh-vbus { |
| fsl,pins = < |
| MX7D_PAD_UART3_CTS_B__GPIO4_IO7 0x14 /* SODIMM 129 USBH PEN */ |
