[PATCH] USB: isp116x-hcd: remove unnecessary ClockNotStop configuration option

Signed-off-by: Olav Kongas <ok@artecdesign.ee>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index a7cb134cf1251a1afd046a3421d2c1422d7fb5d5..96aaee5099295551ccece392a69aa3879207ada4 100644 (file)
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
@@ -1569,7 +1569,7 @@ static int isp116x_start(struct usb_hcd *hcd)
        if (board->sel15Kres)
                val |= HCHWCFG_15KRSEL;
        /* Remote wakeup won't work without working clock */
-       if (board->clknotstop || board->remote_wakeup_enable)
+       if (board->remote_wakeup_enable)
                val |= HCHWCFG_CLKNOTSTOP;
        if (board->oc_enable)
                val |= HCHWCFG_ANALOG_OC;
@@ -1615,9 +1615,6 @@ static int isp116x_start(struct usb_hcd *hcd)
 
        /* Go operational */
        val = HCCONTROL_USB_OPER;
-       /* Remote wakeup connected - NOT SUPPORTED */
-       /*  if (board->remote_wakeup_connected)
-          val |= HCCONTROL_RWC;  */
        if (board->remote_wakeup_enable)
                val |= HCCONTROL_RWE;
        isp116x_write_reg32(isp116x, HCCONTROL, val);

diff --git a/include/linux/usb_isp116x.h b/include/linux/usb_isp116x.h
index 9f4fb5626816a39c7557b9d97ce9b3e1f6e9fb7a..0d21407ccfc2657bf59df44c9f4dd8f210cf4c71 100644 (file)
--- a/include/linux/usb_isp116x.h
+++ b/include/linux/usb_isp116x.h
@@ -7,19 +7,17 @@
 struct isp116x_platform_data {
        /* Enable internal resistors on downstream ports */
        unsigned sel15Kres:1;
-       /* Chip's internal clock won't be stopped in suspended state.
-          Setting/unsetting this bit takes effect only if
-          'remote_wakeup_enable' below is not set. */
-       unsigned clknotstop:1;
        /* On-chip overcurrent protection */
        unsigned oc_enable:1;
        /* INT output polarity */
        unsigned int_act_high:1;
        /* INT edge or level triggered */
        unsigned int_edge_triggered:1;
-       /* WAKEUP pin connected - NOT SUPPORTED  */
-       /* unsigned remote_wakeup_connected:1; */
-       /* Wakeup by devices on usb bus enabled */
+       /* Enable wakeup by devices on usb bus (e.g. wakeup
+          by attachment/detachment or by device activity
+          such as moving a mouse). When chosen, this option
+          prevents stopping internal clock, increasing
+          thereby power consumption in suspended state. */
        unsigned remote_wakeup_enable:1;
        /* Switch or not to switch (keep always powered) */
        unsigned no_power_switching:1;