diff options
| -rw-r--r-- | drivers/usb/musb/ux500.c | 10 | ||||
| -rw-r--r-- | drivers/usb/otg/ab5500-usb.c | 3 |
2 files changed, 8 insertions, 5 deletions
diff --git a/drivers/usb/musb/ux500.c b/drivers/usb/musb/ux500.c index 77454c6ead2..fe322cf541c 100644 --- a/drivers/usb/musb/ux500.c +++ b/drivers/usb/musb/ux500.c @@ -145,10 +145,12 @@ void ux500_restore_context(struct musb *musb) if (!context_stored) return; - if (_musb != NULL) - musb = _musb; - else - return; + if (cpu_is_u5500()) { + if (_musb != NULL) + musb = _musb; + else + return; + } musb_base = musb->mregs; if (is_host_enabled(musb)) { diff --git a/drivers/usb/otg/ab5500-usb.c b/drivers/usb/otg/ab5500-usb.c index ae2c2127598..d37529f7f0a 100644 --- a/drivers/usb/otg/ab5500-usb.c +++ b/drivers/usb/otg/ab5500-usb.c @@ -201,7 +201,8 @@ static void ab5500_usb_phy_enable(struct ab5500_usb *ab, bool sel_host) clk_enable(ab->sysclk); regulator_enable(ab->v_ape); - ux500_restore_context(); + /* TODO: Remove ux500_resotore_context and handle similar to ab8500 */ + ux500_restore_context(NULL); ret = gpio_direction_output(ab->usb_cs_gpio, 0); if (ret < 0) { dev_err(ab->dev, "usb_cs_gpio: gpio direction failed\n"); |