summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorOlav Kongas <ok@artecdesign.ee>2005-08-04 15:46:28 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2005-09-09 01:22:47 +0200
commitdc5bed091a7a5fe378055c30a2da874f77228b71 (patch)
tree4b03155bc71c8a817c7edec8f62cbd4680e11624 /drivers
parent[PATCH] USB: usbnet and unsigned gfp_flags (diff)
downloadlinux-dc5bed091a7a5fe378055c30a2da874f77228b71.tar.xz
linux-dc5bed091a7a5fe378055c30a2da874f77228b71.zip
[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')
-rw-r--r--drivers/usb/host/isp116x-hcd.c6
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)
isp116x_write_reg16(isp116x, HCHWCFG, val);
/* ----- Root hub conf */
- val = 0;
+ val = (25 << 24) & RH_A_POTPGT;
/* AN10003_1.pdf recommends NPS to be always 1 */
if (board->no_power_switching)
val |= RH_A_NPS;
if (board->power_switching_mode)
val |= RH_A_PSM;
- if (board->potpg)
- val |= (board->potpg << 24) & RH_A_POTPGT;
- else
- val |= (25 << 24) & RH_A_POTPGT;
isp116x_write_reg32(isp116x, HCRHDESCA, val);
isp116x->rhdesca = isp116x_read_reg32(isp116x, HCRHDESCA);