]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ARM: dts: imx7-colibri: fix muxing of usbc_det pin
authorOleksandr Suvorov <oleksandr.suvorov@toradex.com>
Tue, 4 Feb 2020 11:11:47 +0000 (13:11 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 21 Apr 2020 07:06:36 +0000 (09:06 +0200)
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

index 04717cf69db07cd4049e52aefce6ef3542df3f3c..9bad960f2b391f3a823c4c141752332210f298c5 100644 (file)
 &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 = <
 
        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
                >;
        };
 
+       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 */