summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMichael Grzeschik <m.grzeschik@pengutronix.de>2021-02-02 19:54:13 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2021-02-04 11:26:45 +0100
commit9ccf645bfaee366acd8dbd6b270717dae94f5347 (patch)
tree86bd48140e83608b56a7283e059657a58efc72af /drivers
parenteb2ad9a793c7d00988e399b9b7a1ebb2a0d85b3f (diff)
downloadbarebox-9ccf645bfaee366acd8dbd6b270717dae94f5347.tar.gz
barebox-9ccf645bfaee366acd8dbd6b270717dae94f5347.tar.xz
usb: imx: add overcurrent polarity handling on i.MX6
Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/usb/imx/imx-usb-misc.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/usb/imx/imx-usb-misc.c b/drivers/usb/imx/imx-usb-misc.c
index 660ebecd78..c16b4cf0ab 100644
--- a/drivers/usb/imx/imx-usb-misc.c
+++ b/drivers/usb/imx/imx-usb-misc.c
@@ -379,8 +379,15 @@ static __maybe_unused int mx6_initialize_usb_hw(void __iomem *base, int port,
case 0:
case 1:
val = readl(base + MX6_USB_CTRL(port));
- if (flags & MXC_EHCI_DISABLE_OVERCURRENT)
+ if (flags & MXC_EHCI_DISABLE_OVERCURRENT) {
val |= MX6_USB_CTRL_OVER_CUR_DIS;
+ } else {
+ val &= ~MX6_USB_CTRL_OVER_CUR_DIS;
+ if (flags & MXC_EHCI_OC_PIN_ACTIVE_LOW)
+ val |= MX6_USB_CTRL_OVER_CUR_ACT_LOW;
+ else
+ val &= ~MX6_USB_CTRL_OVER_CUR_ACT_LOW;
+ }
if (flags & MXC_EHCI_PWR_PIN_ACTIVE_HIGH)
val |= MX6_USB_CTRL_PWR_POLARITY;
writel(val, base + MX6_USB_CTRL(port));