usb: musb: drop useless board_mode usage

we are compiling the driver always with full OTG
capabilities, so that board_mode trick becomes
useless.

Signed-off-by: Felipe Balbi <balbi@ti.com>

1 files changed, 7 insertions, 17 deletions

diff --git a/drivers/usb/musb/da8xx.c b/drivers/usb/musb/da8xx.c
index 0f9fcec4e1d3..4e4df9d2eee2 100644
--- a/drivers/usb/musb/da8xx.c
+++ b/drivers/usb/musb/da8xx.c
@@ -155,9 +155,8 @@ static void da8xx_musb_enable(struct musb *musb)
         musb_writel(reg_base, DA8XX_USB_INTR_MASK_SET_REG, mask);
 
         /* Force the DRVVBUS IRQ so we can start polling for ID change. */
-        if (is_otg_enabled(musb))
-                musb_writel(reg_base, DA8XX_USB_INTR_SRC_SET_REG,
-                            DA8XX_INTR_DRVVBUS << DA8XX_INTR_USB_SHIFT);
+        musb_writel(reg_base, DA8XX_USB_INTR_SRC_SET_REG,
+                        DA8XX_INTR_DRVVBUS << DA8XX_INTR_USB_SHIFT);
 }
 
 /**
@@ -231,9 +230,6 @@ static void otg_timer(unsigned long _musb)
                             MUSB_INTR_VBUSERROR << DA8XX_INTR_USB_SHIFT);
                 break;
         case OTG_STATE_B_IDLE:
-                if (!is_peripheral_enabled(musb))
-                        break;
-
                 /*
                  * There's no ID-changed IRQ, so we have no good way to tell
                  * when to switch to the A-Default state machine (by setting
@@ -263,9 +259,6 @@ static void da8xx_musb_try_idle(struct musb *musb, unsigned long timeout)
 {
         static unsigned long last_timer;
 
-        if (!is_otg_enabled(musb))
-                return;
-
         if (timeout == 0)
                 timeout = jiffies + msecs_to_jiffies(3);
 
@@ -333,8 +326,7 @@ static irqreturn_t da8xx_musb_interrupt(int irq, void *hci)
                 u8 devctl = musb_readb(mregs, MUSB_DEVCTL);
                 int err;
 
-                err = is_host_enabled(musb) && (musb->int_usb &
-                                                MUSB_INTR_VBUSERROR);
+                err = musb->int_usb & USB_INTR_VBUSERROR;
                 if (err) {
                         /*
                          * The Mentor core doesn't debounce VBUS as needed
@@ -351,7 +343,7 @@ static irqreturn_t da8xx_musb_interrupt(int irq, void *hci)
                         musb->xceiv->state = OTG_STATE_A_WAIT_VFALL;
                         mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
                         WARNING("VBUS error workaround (delay coming)\n");
-                } else if (is_host_enabled(musb) && drvvbus) {
+                } else if (drvvbus) {
                         MUSB_HST_MODE(musb);
                         otg->default_a = 1;
                         musb->xceiv->state = OTG_STATE_A_WAIT_VRISE;
@@ -382,7 +374,7 @@ static irqreturn_t da8xx_musb_interrupt(int irq, void *hci)
                 musb_writel(reg_base, DA8XX_USB_END_OF_INTR_REG, 0);
 
         /* Poll for ID change */
-        if (is_otg_enabled(musb) && musb->xceiv->state == OTG_STATE_B_IDLE)
+        if (musb->xceiv->state == OTG_STATE_B_IDLE)
                 mod_timer(&otg_workaround, jiffies + POLL_SECONDS * HZ);
 
         spin_unlock_irqrestore(&musb->lock, flags);
@@ -430,8 +422,7 @@ static int da8xx_musb_init(struct musb *musb)
         if (IS_ERR_OR_NULL(musb->xceiv))
                 goto fail;
 
-        if (is_host_enabled(musb))
-                setup_timer(&otg_workaround, otg_timer, (unsigned long)musb);
+        setup_timer(&otg_workaround, otg_timer, (unsigned long)musb);
 
         /* Reset the controller */
         musb_writel(reg_base, DA8XX_USB_CTRL_REG, DA8XX_SOFT_RESET_MASK);
@@ -454,8 +445,7 @@ fail:
 
 static int da8xx_musb_exit(struct musb *musb)
 {
-        if (is_host_enabled(musb))
-                del_timer_sync(&otg_workaround);
+        del_timer_sync(&otg_workaround);
 
         phy_off();