diff options
-rw-r--r-- | drivers/usb/host/isp116x-hcd.c | 5 | ||||
-rw-r--r-- | include/linux/usb_isp116x.h | 12 |
2 files changed, 6 insertions, 11 deletions
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index a7cb134cf125..96aaee509929 100644 --- 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) | |||
1569 | if (board->sel15Kres) | 1569 | if (board->sel15Kres) |
1570 | val |= HCHWCFG_15KRSEL; | 1570 | val |= HCHWCFG_15KRSEL; |
1571 | /* Remote wakeup won't work without working clock */ | 1571 | /* Remote wakeup won't work without working clock */ |
1572 | if (board->clknotstop || board->remote_wakeup_enable) | 1572 | if (board->remote_wakeup_enable) |
1573 | val |= HCHWCFG_CLKNOTSTOP; | 1573 | val |= HCHWCFG_CLKNOTSTOP; |
1574 | if (board->oc_enable) | 1574 | if (board->oc_enable) |
1575 | val |= HCHWCFG_ANALOG_OC; | 1575 | val |= HCHWCFG_ANALOG_OC; |
@@ -1615,9 +1615,6 @@ static int isp116x_start(struct usb_hcd *hcd) | |||
1615 | 1615 | ||
1616 | /* Go operational */ | 1616 | /* Go operational */ |
1617 | val = HCCONTROL_USB_OPER; | 1617 | val = HCCONTROL_USB_OPER; |
1618 | /* Remote wakeup connected - NOT SUPPORTED */ | ||
1619 | /* if (board->remote_wakeup_connected) | ||
1620 | val |= HCCONTROL_RWC; */ | ||
1621 | if (board->remote_wakeup_enable) | 1618 | if (board->remote_wakeup_enable) |
1622 | val |= HCCONTROL_RWE; | 1619 | val |= HCCONTROL_RWE; |
1623 | isp116x_write_reg32(isp116x, HCCONTROL, val); | 1620 | isp116x_write_reg32(isp116x, HCCONTROL, val); |
diff --git a/include/linux/usb_isp116x.h b/include/linux/usb_isp116x.h index 9f4fb5626816..0d21407ccfc2 100644 --- a/include/linux/usb_isp116x.h +++ b/include/linux/usb_isp116x.h | |||
@@ -7,19 +7,17 @@ | |||
7 | struct isp116x_platform_data { | 7 | struct isp116x_platform_data { |
8 | /* Enable internal resistors on downstream ports */ | 8 | /* Enable internal resistors on downstream ports */ |
9 | unsigned sel15Kres:1; | 9 | unsigned sel15Kres:1; |
10 | /* Chip's internal clock won't be stopped in suspended state. | ||
11 | Setting/unsetting this bit takes effect only if | ||
12 | 'remote_wakeup_enable' below is not set. */ | ||
13 | unsigned clknotstop:1; | ||
14 | /* On-chip overcurrent protection */ | 10 | /* On-chip overcurrent protection */ |
15 | unsigned oc_enable:1; | 11 | unsigned oc_enable:1; |
16 | /* INT output polarity */ | 12 | /* INT output polarity */ |
17 | unsigned int_act_high:1; | 13 | unsigned int_act_high:1; |
18 | /* INT edge or level triggered */ | 14 | /* INT edge or level triggered */ |
19 | unsigned int_edge_triggered:1; | 15 | unsigned int_edge_triggered:1; |
20 | /* WAKEUP pin connected - NOT SUPPORTED */ | 16 | /* Enable wakeup by devices on usb bus (e.g. wakeup |
21 | /* unsigned remote_wakeup_connected:1; */ | 17 | by attachment/detachment or by device activity |
22 | /* Wakeup by devices on usb bus enabled */ | 18 | such as moving a mouse). When chosen, this option |
19 | prevents stopping internal clock, increasing | ||
20 | thereby power consumption in suspended state. */ | ||
23 | unsigned remote_wakeup_enable:1; | 21 | unsigned remote_wakeup_enable:1; |
24 | /* Switch or not to switch (keep always powered) */ | 22 | /* Switch or not to switch (keep always powered) */ |
25 | unsigned no_power_switching:1; | 23 | unsigned no_power_switching:1; |