1 files changed, 60 insertions, 21 deletions

diff --git a/drivers/usb/renesas_usbhs/mod.c b/drivers/usb/renesas_usbhs/mod.c
index a577f8f4064..053f86d7000 100644
--- a/drivers/usb/renesas_usbhs/mod.c
+++ b/drivers/usb/renesas_usbhs/mod.c
@@ -58,7 +58,7 @@ void usbhs_mod_autonomy_mode(struct usbhs_priv *priv)
         struct usbhs_mod_info *info = usbhs_priv_to_modinfo(priv);
 
         info->irq_vbus          = usbhsm_autonomy_irq_vbus;
-        priv->pfunc->get_vbus   = usbhsm_autonomy_get_vbus;
+        priv->pfunc.get_vbus    = usbhsm_autonomy_get_vbus;
 
         usbhs_irq_callback_update(priv, NULL);
 }
@@ -93,8 +93,9 @@ struct usbhs_mod *usbhs_mod_get(struct usbhs_priv *priv, int id)
         return ret;
 }
 
-int usbhs_mod_is_host(struct usbhs_priv *priv, struct usbhs_mod *mod)
+int usbhs_mod_is_host(struct usbhs_priv *priv)
 {
+        struct usbhs_mod *mod = usbhs_mod_get_current(priv);
         struct usbhs_mod_info *info = usbhs_priv_to_modinfo(priv);
 
         if (!mod)
@@ -139,13 +140,17 @@ int usbhs_mod_probe(struct usbhs_priv *priv)
         /*
          * install host/gadget driver
          */
-        ret = usbhs_mod_gadget_probe(priv);
+        ret = usbhs_mod_host_probe(priv);
         if (ret < 0)
                 return ret;
 
+        ret = usbhs_mod_gadget_probe(priv);
+        if (ret < 0)
+                goto mod_init_host_err;
+
         /* irq settings */
         ret = request_irq(priv->irq, usbhs_interrupt,
-                          IRQF_DISABLED, dev_name(dev), priv);
+                          0, dev_name(dev), priv);
         if (ret) {
                 dev_err(dev, "irq request err\n");
                 goto mod_init_gadget_err;
@@ -155,12 +160,15 @@ int usbhs_mod_probe(struct usbhs_priv *priv)
 
 mod_init_gadget_err:
         usbhs_mod_gadget_remove(priv);
+mod_init_host_err:
+        usbhs_mod_host_remove(priv);
 
         return ret;
 }
 
 void usbhs_mod_remove(struct usbhs_priv *priv)
 {
+        usbhs_mod_host_remove(priv);
         usbhs_mod_gadget_remove(priv);
         free_irq(priv->irq, priv);
 }
@@ -168,20 +176,6 @@ void usbhs_mod_remove(struct usbhs_priv *priv)
 /*
  *              status functions
  */
-int usbhs_status_get_usb_speed(struct usbhs_irq_state *irq_state)
-{
-        switch (irq_state->dvstctr & RHST) {
-        case RHST_LOW_SPEED:
-                return USB_SPEED_LOW;
-        case RHST_FULL_SPEED:
-                return USB_SPEED_FULL;
-        case RHST_HIGH_SPEED:
-                return USB_SPEED_HIGH;
-        }
-
-        return USB_SPEED_UNKNOWN;
-}
-
 int usbhs_status_get_device_state(struct usbhs_irq_state *irq_state)
 {
         int state = irq_state->intsts0 & DVSQ_MASK;
@@ -221,8 +215,6 @@ static void usbhs_status_get_each_irq(struct usbhs_priv *priv,
         state->intsts0 = usbhs_read(priv, INTSTS0);
         state->intsts1 = usbhs_read(priv, INTSTS1);
 
-        state->dvstctr = usbhs_read(priv, DVSTCTR);
-
         /* mask */
         if (mod) {
                 state->brdysts = usbhs_read(priv, BRDYSTS);
@@ -269,6 +261,8 @@ static irqreturn_t usbhs_interrupt(int irq, void *data)
          * see also
          *      usbhs_irq_setting_update
          */
+
+        /* INTSTS0 */
         if (irq_state.intsts0 & VBINT)
                 usbhs_mod_info_call(priv, irq_vbus, priv, &irq_state);
 
@@ -284,15 +278,38 @@ static irqreturn_t usbhs_interrupt(int irq, void *data)
         if (irq_state.intsts0 & BRDY)
                 usbhs_mod_call(priv, irq_ready, priv, &irq_state);
 
+        /* INTSTS1 */
+        if (irq_state.intsts1 & ATTCH)
+                usbhs_mod_call(priv, irq_attch, priv, &irq_state);
+
+        if (irq_state.intsts1 & DTCH)
+                usbhs_mod_call(priv, irq_dtch, priv, &irq_state);
+
+        if (irq_state.intsts1 & SIGN)
+                usbhs_mod_call(priv, irq_sign, priv, &irq_state);
+
+        if (irq_state.intsts1 & SACK)
+                usbhs_mod_call(priv, irq_sack, priv, &irq_state);
+
         return IRQ_HANDLED;
 }
 
 void usbhs_irq_callback_update(struct usbhs_priv *priv, struct usbhs_mod *mod)
 {
         u16 intenb0 = 0;
+        u16 intenb1 = 0;
         struct usbhs_mod_info *info = usbhs_priv_to_modinfo(priv);
 
+        /*
+         * BEMPENB/BRDYENB are picky.
+         * below method is required
+         *
+         *  - clear  INTSTS0
+         *  - update BEMPENB/BRDYENB
+         *  - update INTSTS0
+         */
         usbhs_write(priv, INTENB0, 0);
+        usbhs_write(priv, INTENB1, 0);
 
         usbhs_write(priv, BEMPENB, 0);
         usbhs_write(priv, BRDYENB, 0);
@@ -310,6 +327,9 @@ void usbhs_irq_callback_update(struct usbhs_priv *priv, struct usbhs_mod *mod)
                 intenb0 |= VBSE;
 
         if (mod) {
+                /*
+                 * INTSTS0
+                 */
                 if (mod->irq_ctrl_stage)
                         intenb0 |= CTRE;
 
@@ -322,7 +342,26 @@ void usbhs_irq_callback_update(struct usbhs_priv *priv, struct usbhs_mod *mod)
                         usbhs_write(priv, BRDYENB, mod->irq_brdysts);
                         intenb0 |= BRDYE;
                 }
+
+                /*
+                 * INTSTS1
+                 */
+                if (mod->irq_attch)
+                        intenb1 |= ATTCHE;
+
+                if (mod->irq_attch)
+                        intenb1 |= DTCHE;
+
+                if (mod->irq_sign)
+                        intenb1 |= SIGNE;
+
+                if (mod->irq_sack)
+                        intenb1 |= SACKE;
         }
 
-        usbhs_write(priv, INTENB0, intenb0);
+        if (intenb0)
+                usbhs_write(priv, INTENB0, intenb0);
+
+        if (intenb1)
+                usbhs_write(priv, INTENB1, intenb1);
 }