diff options
| author | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-05-03 14:17:29 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2019-05-07 07:59:54 +0200 |
| commit | 22060130df2f99a212208eb90980d0f3a7d1ddd8 (patch) | |
| tree | aafe4a1e1c4cb62b109b2f209ce021f99953043f | |
| parent | b04d94e096286a455d9e30c351c845e37e22f66b (diff) | |
ARM: dts: imx8: apalis-imx8qm: improve usb over-current handling
Improve USB over-current handling by muxing USBH_OC# as GPIO and
USBO1_OC# as native USB_OTG1_OC. This is especially important as they
default to I2C pin muxing which may interfere with the actual pins we
use for resp. I2C instance. While at it also improve indentation and
pull comments out to the top.
Signed-off-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
| -rw-r--r-- | arch/arm64/boot/dts/freescale/fsl-imx8qm-apalis.dts | 28 |
1 files changed, 19 insertions, 9 deletions
diff --git a/arch/arm64/boot/dts/freescale/fsl-imx8qm-apalis.dts b/arch/arm64/boot/dts/freescale/fsl-imx8qm-apalis.dts index e689c107450b..8651fd936179 100644 --- a/arch/arm64/boot/dts/freescale/fsl-imx8qm-apalis.dts +++ b/arch/arm64/boot/dts/freescale/fsl-imx8qm-apalis.dts @@ -210,11 +210,12 @@ pinctrl-0 = <&pinctrl_cam1_gpios>, <&pinctrl_dap1_gpios>, <&pinctrl_esai0_gpios>, <&pinctrl_fec2_gpios>, <&pinctrl_gpio34>, <&pinctrl_gpio56>, - <&pinctrl_lpuart1ctrl>, <&pinctrl_lvds0_i2c0_gpio>, - <&pinctrl_lvds1_i2c0_gpios>, <&pinctrl_mipi_dsi_0_1_en>, - <&pinctrl_mipi_dsi1_gpios>, <&pinctrl_mlb_gpios>, - <&pinctrl_qspi1a_gpios>, <&pinctrl_sata1_act>, - <&pinctrl_sim0_gpios>, <&pinctrl_usdhc1_gpios>; + <&pinctrl_gpio_usbh_oc_n>, <&pinctrl_lpuart1ctrl>, + <&pinctrl_lvds0_i2c0_gpio>, <&pinctrl_lvds1_i2c0_gpios>, + <&pinctrl_mipi_dsi_0_1_en>, <&pinctrl_mipi_dsi1_gpios>, + <&pinctrl_mlb_gpios>, <&pinctrl_qspi1a_gpios>, + <&pinctrl_sata1_act>, <&pinctrl_sim0_gpios>, + <&pinctrl_usdhc1_gpios>; apalis-imx8qm { pinctrl_adc0: adc0grp { @@ -843,17 +844,27 @@ >; }; + /* Apalis USBO1 */ pinctrl_usbotg1: usbotg1 { fsl,pins = < /* Apalis USBO1_EN */ - SC_P_USB_SS3_TC0_CONN_USB_OTG1_PWR 0x00000021 + SC_P_USB_SS3_TC0_CONN_USB_OTG1_PWR 0x00000021 + /* Apalis USBO1_OC# */ + SC_P_USB_SS3_TC2_CONN_USB_OTG1_OC 0x04000021 >; }; + /* Apalis USBH_EN */ pinctrl_usbh_en: usbhen { fsl,pins = < - /* Apalis USBH_EN */ - SC_P_USB_SS3_TC1_LSIO_GPIO4_IO04 0x00000021 + SC_P_USB_SS3_TC1_LSIO_GPIO4_IO04 0x00000021 + >; + }; + + /* Apalis USBH_OC# */ + pinctrl_gpio_usbh_oc_n: gpiousbhocn { + fsl,pins = < + SC_P_USB_SS3_TC3_LSIO_GPIO4_IO06 0x04000021 >; }; @@ -989,7 +1000,6 @@ hnp-disable; adp-disable; power-polarity-active-high; - disable-over-current; ci-disable-lpm; status = "okay"; }; |