aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/usb/host/isp116x-hcd.c6
-rw-r--r--include/linux/usb_isp116x.h2
2 files changed, 1 insertions, 7 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
diff --git a/include/linux/usb_isp116x.h b/include/linux/usb_isp116x.h
index 5f5a9d9bd6c2..9f4fb5626816 100644
--- a/include/linux/usb_isp116x.h
+++ b/include/linux/usb_isp116x.h
@@ -26,8 +26,6 @@ struct isp116x_platform_data {
26 /* Ganged port power switching (0) or individual port 26 /* Ganged port power switching (0) or individual port
27 power switching (1) */ 27 power switching (1) */
28 unsigned power_switching_mode:1; 28 unsigned power_switching_mode:1;
29 /* Given port_power, msec/2 after power on till power good */
30 u8 potpg;
31 /* Hardware reset set/clear. If implemented, this function must: 29 /* Hardware reset set/clear. If implemented, this function must:
32 if set == 0, deassert chip's HW reset pin 30 if set == 0, deassert chip's HW reset pin
33 otherwise, assert chip's HW reset pin */ 31 otherwise, assert chip's HW reset pin */