Greg,
This patch removes the power-on-to-power-good-time
configuration option for isp116x-hcd.
Please apply,
Olav
Use fixed power-on-to-power-good-time setting.
Signed-off-by: Olav Kongas <[EMAIL PROTECTED]>
--- linux-2.6.13-rc4-tmp3/drivers/usb/host/isp116x-hcd.c.or 2005-08-03
09:31:08.064708793 +0300
+++ linux-2.6.13-rc4-tmp3/drivers/usb/host/isp116x-hcd.c 2005-08-03
09:48:10.925143073 +0300
@@ -1580,16 +1580,12 @@ static int isp116x_start(struct usb_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);
--- linux-2.6.13-rc4-tmp3/include/linux/usb_isp116x.h.or 2005-08-03
10:05:33.424072167 +0300
+++ linux-2.6.13-rc4-tmp3/include/linux/usb_isp116x.h 2005-08-03
10:05:51.673814854 +0300
@@ -26,8 +26,6 @@ struct isp116x_platform_data {
/* Ganged port power switching (0) or individual port
power switching (1) */
unsigned power_switching_mode:1;
- /* Given port_power, msec/2 after power on till power good */
- u8 potpg;
/* Hardware reset set/clear. If implemented, this function must:
if set == 0, deassert chip's HW reset pin
otherwise, assert chip's HW reset pin */
