From ok@artecdesign.ee Thu Aug 4 06:53:21 2005
Date: Thu, 4 Aug 2005 16:48:19 +0300 (EEST)
From: Olav Kongas <ok@artecdesign.ee>
To: Greg KH <greg@kroah.com>
Subject: USB: isp116x-hcd: remove unnecessary ClockNotStop configuration option
Message-ID: <Pine.LNX.4.63.0508041646370.2726@pcx>
Signed-off-by: Olav Kongas <ok@artecdesign.ee>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
drivers/usb/host/isp116x-hcd.c | 5 +----
include/linux/usb_isp116x.h | 12 +++++-------
2 files changed, 6 insertions(+), 11 deletions(-)
--- gregkh-2.6.orig/drivers/usb/host/isp116x-hcd.c 2005-08-08 16:01:38.000000000 -0700
+++ gregkh-2.6/drivers/usb/host/isp116x-hcd.c 2005-08-08 16:01:39.000000000 -0700
@@ -1569,7 +1569,7 @@
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 @@
/* 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);
--- gregkh-2.6.orig/include/linux/usb_isp116x.h 2005-08-08 16:01:38.000000000 -0700
+++ gregkh-2.6/include/linux/usb_isp116x.h 2005-08-08 16:01:39.000000000 -0700
@@ -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;