diff options
author | Olav Kongas <ok@artecdesign.ee> | 2005-08-04 09:46:28 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-08 19:22:47 -0400 |
commit | dc5bed091a7a5fe378055c30a2da874f77228b71 (patch) | |
tree | 4b03155bc71c8a817c7edec8f62cbd4680e11624 /drivers/usb | |
parent | 0d9899f8139b1e4ee84b97fb61615714fd40be5b (diff) |
[PATCH] USB: isp116x-hcd: use fixed power-on-to-power-good-time
This patch removes the power-on-to-power-good-time configuration option for
isp116x-hcd.
Signed-off-by: Olav Kongas <ok@artecdesign.ee>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb')
-rw-r--r-- | drivers/usb/host/isp116x-hcd.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c index 75128c371800..a7cb134cf125 100644 --- a/drivers/usb/host/isp116x-hcd.c +++ b/drivers/usb/host/isp116x-hcd.c | |||
@@ -1580,16 +1580,12 @@ static int isp116x_start(struct usb_hcd *hcd) | |||
1580 | isp116x_write_reg16(isp116x, HCHWCFG, val); | 1580 | isp116x_write_reg16(isp116x, HCHWCFG, val); |
1581 | 1581 | ||
1582 | /* ----- Root hub conf */ | 1582 | /* ----- Root hub conf */ |
1583 | val = 0; | 1583 | val = (25 << 24) & RH_A_POTPGT; |
1584 | /* AN10003_1.pdf recommends NPS to be always 1 */ | 1584 | /* AN10003_1.pdf recommends NPS to be always 1 */ |
1585 | if (board->no_power_switching) | 1585 | if (board->no_power_switching) |
1586 | val |= RH_A_NPS; | 1586 | val |= RH_A_NPS; |
1587 | if (board->power_switching_mode) | 1587 | if (board->power_switching_mode) |
1588 | val |= RH_A_PSM; | 1588 | val |= RH_A_PSM; |
1589 | if (board->potpg) | ||
1590 | val |= (board->potpg << 24) & RH_A_POTPGT; | ||
1591 | else | ||
1592 | val |= (25 << 24) & RH_A_POTPGT; | ||
1593 | isp116x_write_reg32(isp116x, HCRHDESCA, val); | 1589 | isp116x_write_reg32(isp116x, HCRHDESCA, val); |
1594 | isp116x->rhdesca = isp116x_read_reg32(isp116x, HCRHDESCA); | 1590 | isp116x->rhdesca = isp116x_read_reg32(isp116x, HCRHDESCA); |
1595 | 1591 | ||