usb: gadget: renesas_usbhs: add INTSTS1 interrupt support

[pandora-kernel.git] / drivers / usb / renesas_usbhs / mod.h

diff --git a/drivers/usb/renesas_usbhs/mod.h b/drivers/usb/renesas_usbhs/mod.h
index 5c845a2..df4b61d 100644 (file)
--- a/drivers/usb/renesas_usbhs/mod.h
+++ b/drivers/usb/renesas_usbhs/mod.h
@@ -30,7 +30,6 @@ struct usbhs_irq_state {
        u16 brdysts;
        u16 nrdysts;
        u16 bempsts;
-       u16 dvstctr;
 };
 
 struct usbhs_mod {
@@ -42,26 +41,48 @@ struct usbhs_mod {
        int (*start)(struct usbhs_priv *priv);
        int (*stop)(struct usbhs_priv *priv);
 
-       /* INTSTS0 :: DVST (DVSQ) */
+       /*
+        * INTSTS0
+        */
+
+       /* DVST (DVSQ) */
        int (*irq_dev_state)(struct usbhs_priv *priv,
                             struct usbhs_irq_state *irq_state);
 
-       /* INTSTS0 :: CTRT (CTSQ) */
+       /* CTRT (CTSQ) */
        int (*irq_ctrl_stage)(struct usbhs_priv *priv,
                              struct usbhs_irq_state *irq_state);
 
-       /* INTSTS0 :: BEMP */
-       /* BEMPSTS */
+       /* BEMP / BEMPSTS */
        int (*irq_empty)(struct usbhs_priv *priv,
                         struct usbhs_irq_state *irq_state);
        u16 irq_bempsts;
 
-       /* INTSTS0 :: BRDY */
-       /* BRDYSTS */
+       /* BRDY / BRDYSTS */
        int (*irq_ready)(struct usbhs_priv *priv,
                         struct usbhs_irq_state *irq_state);
        u16 irq_brdysts;
 
+       /*
+        * INTSTS1
+        */
+
+       /* ATTCHE */
+       int (*irq_attch)(struct usbhs_priv *priv,
+                        struct usbhs_irq_state *irq_state);
+
+       /* DTCHE */
+       int (*irq_dtch)(struct usbhs_priv *priv,
+                       struct usbhs_irq_state *irq_state);
+
+       /* SIGN */
+       int (*irq_sign)(struct usbhs_priv *priv,
+                       struct usbhs_irq_state *irq_state);
+
+       /* SACK */
+       int (*irq_sack)(struct usbhs_priv *priv,
+                       struct usbhs_irq_state *irq_state);
+
        struct usbhs_priv *priv;
 };
 
@@ -89,7 +110,7 @@ struct usbhs_mod_info {
 struct usbhs_mod *usbhs_mod_get(struct usbhs_priv *priv, int id);
 struct usbhs_mod *usbhs_mod_get_current(struct usbhs_priv *priv);
 void usbhs_mod_register(struct usbhs_priv *priv, struct usbhs_mod *usb, int id);
-int usbhs_mod_is_host(struct usbhs_priv *priv, struct usbhs_mod *mod);
+int usbhs_mod_is_host(struct usbhs_priv *priv);
 int usbhs_mod_change(struct usbhs_priv *priv, int id);
 int usbhs_mod_probe(struct usbhs_priv *priv);
 void usbhs_mod_remove(struct usbhs_priv *priv);
@@ -99,7 +120,6 @@ void usbhs_mod_autonomy_mode(struct usbhs_priv *priv);
 /*
  *             status functions
  */
-int usbhs_status_get_usb_speed(struct usbhs_irq_state *irq_state);
 int usbhs_status_get_device_state(struct usbhs_irq_state *irq_state);
 int usbhs_status_get_ctrl_stage(struct usbhs_irq_state *irq_state);