From 4dc28e0ff33534926f055bed1d66554971a47773 Mon Sep 17 00:00:00 2001
From: Olav Kongas <ok@artecdesign.ee>
Date: Thu, 4 Aug 2005 16:46:28 +0300
Subject: [PATCH] --- yaml --- r: 7951 b: refs/heads/master c:
 dc5bed091a7a5fe378055c30a2da874f77228b71 h: refs/heads/master i:   7949:
 c34b2fc0a5f38dd790ab78557134b06154ddbdfc   7947:
 baebb67a4bdcab7e5822820ced0d2c07c4a8f7ad   7943:
 821b60db8bbd4386ab80c5bc335ad1d6cac6e73f   7935:
 b221087c8d062a02a19e9b51950fa2b997c42d75 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/usb/host/isp116x-hcd.c | 6 +-----
 trunk/include/linux/usb_isp116x.h    | 2 --
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index a1bfe8a6a261..1be9695c5e8e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d9899f8139b1e4ee84b97fb61615714fd40be5b
+refs/heads/master: dc5bed091a7a5fe378055c30a2da874f77228b71
diff --git a/trunk/drivers/usb/host/isp116x-hcd.c b/trunk/drivers/usb/host/isp116x-hcd.c
index 75128c371800..a7cb134cf125 100644
--- a/trunk/drivers/usb/host/isp116x-hcd.c
+++ b/trunk/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);
 
diff --git a/trunk/include/linux/usb_isp116x.h b/trunk/include/linux/usb_isp116x.h
index 5f5a9d9bd6c2..9f4fb5626816 100644
--- a/trunk/include/linux/usb_isp116x.h
+++ b/trunk/include/linux/usb_isp116x.h
@@ -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       */