Skip to content

Commit

Permalink
[PATCH] USB: isp116x-hcd: remove unnecessary ClockNotStop configurati…
Browse files Browse the repository at this point in the history
…on option

Signed-off-by: Olav Kongas <ok@artecdesign.ee>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Olav Kongas authored and Greg Kroah-Hartman committed Sep 8, 2005
1 parent dc5bed0 commit d4d6286
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 11 deletions.
5 changes: 1 addition & 4 deletions drivers/usb/host/isp116x-hcd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
12 changes: 5 additions & 7 deletions include/linux/usb_isp116x.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit d4d6286

Please sign in to comment.