diff options
| author | Olav Kongas <ok@artecdesign.ee> | 2005-08-04 09:52:31 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-08 19:22:47 -0400 |
| commit | 165c0f39390212d7a517b80c3bb61cb8f1782fef (patch) | |
| tree | d1ebe787ce1a506454c3a8b50e00890399382fc5 /drivers/usb/host | |
| parent | d4d62861b5cdb0ecfcae448e4281623284de5d05 (diff) | |
[PATCH] USB: isp116x-hcd: support only per-port power switching
The isp116x chip will now always be in per-port power switching mode. Remove
conf options to set any other mode.
Signed-off-by: Olav Kongas <ok@artecdesign.ee>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host')
| -rw-r--r-- | drivers/usb/host/isp116x-hcd.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index 96aaee509929..a3e881c60026 100644 --- a/drivers/usb/host/isp116x-hcd.c +++ b/drivers/usb/host/isp116x-hcd.c | |||
| @@ -1581,11 +1581,10 @@ static int isp116x_start(struct usb_hcd *hcd) | |||
| 1581 | 1581 | ||
| 1582 | /* ----- Root hub conf */ | 1582 | /* ----- Root hub conf */ |
| 1583 | val = (25 << 24) & RH_A_POTPGT; | 1583 | val = (25 << 24) & RH_A_POTPGT; |
| 1584 | /* AN10003_1.pdf recommends NPS to be always 1 */ | 1584 | /* AN10003_1.pdf recommends RH_A_NPS (no power switching) to |
| 1585 | if (board->no_power_switching) | 1585 | be always set. Yet, instead, we request individual port |
| 1586 | val |= RH_A_NPS; | 1586 | power switching. */ |
| 1587 | if (board->power_switching_mode) | 1587 | val |= RH_A_PSM; |
| 1588 | val |= RH_A_PSM; | ||
| 1589 | isp116x_write_reg32(isp116x, HCRHDESCA, val); | 1588 | isp116x_write_reg32(isp116x, HCRHDESCA, val); |
| 1590 | isp116x->rhdesca = isp116x_read_reg32(isp116x, HCRHDESCA); | 1589 | isp116x->rhdesca = isp116x_read_reg32(isp116x, HCRHDESCA); |
| 1591 | 1590 | ||