usb: gadget: renesas_usbhs: change usbhsc_bus_ctrl() to usbsc_set_buswait()
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tue, 11 Oct 2011 05:01:28 +0000 (22:01 -0700)
committerFelipe Balbi <balbi@ti.com>
Thu, 13 Oct 2011 17:41:37 +0000 (20:41 +0300)
renesas_usbhs will have register DVSTCTR control function for HOST support.
This patch changes usbhsc_bus_ctrl() to usbsc_set_buswait(),
to remove DVSTCTR access from it,

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
drivers/usb/renesas_usbhs/common.c
include/linux/usb/renesas_usbhs.h

index 319ed47153d7e39b38190872e70beff4df7f3a0c..fd43fdd6cd81e1f583bc8ad37af9f2606d7c80b7 100644 (file)
@@ -149,17 +149,13 @@ int usbhs_frame_get_num(struct usbhs_priv *priv)
 /*
  *             local functions
  */
-static void usbhsc_bus_ctrl(struct usbhs_priv *priv, int enable)
+static void usbhsc_set_buswait(struct usbhs_priv *priv)
 {
        int wait = usbhs_get_dparam(priv, buswait_bwait);
-       u16 data = 0;
 
-       if (enable) {
-               /* set bus wait if platform have */
-               if (wait)
-                       usbhs_bset(priv, BUSWAIT, 0x000F, wait);
-       }
-       usbhs_write(priv, DVSTCTR, data);
+       /* set bus wait if platform have */
+       if (wait)
+               usbhs_bset(priv, BUSWAIT, 0x000F, wait);
 }
 
 /*
@@ -191,10 +187,9 @@ static void usbhsc_power_ctrl(struct usbhs_priv *priv, int enable)
 
                /* USB on */
                usbhs_sys_clock_ctrl(priv, enable);
-               usbhsc_bus_ctrl(priv, enable);
+               usbhsc_set_buswait(priv);
        } else {
                /* USB off */
-               usbhsc_bus_ctrl(priv, enable);
                usbhs_sys_clock_ctrl(priv, enable);
 
                /* disable PM */
index 8977431259c6c12660647590bb7ae5f8724e610d..959af02d3af6c8665f9d120c7531a60950d94cb6 100644 (file)
@@ -101,6 +101,8 @@ struct renesas_usbhs_driver_param {
         * option:
         *
         * for BUSWAIT :: BWAIT
+        * see
+        *      renesas_usbhs/common.c :: usbhsc_set_buswait()
         * */
        int buswait_bwait;