Commit dc5bed09 authored by Olav Kongas's avatar Olav Kongas Committed by Greg Kroah-Hartman

[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: default avatarOlav Kongas <ok@artecdesign.ee>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0d9899f8
...@@ -1580,16 +1580,12 @@ static int isp116x_start(struct usb_hcd *hcd) ...@@ -1580,16 +1580,12 @@ static int isp116x_start(struct usb_hcd *hcd)
isp116x_write_reg16(isp116x, HCHWCFG, val); isp116x_write_reg16(isp116x, HCHWCFG, val);
/* ----- Root hub conf */ /* ----- Root hub conf */
val = 0; val = (25 << 24) & RH_A_POTPGT;
/* AN10003_1.pdf recommends NPS to be always 1 */ /* AN10003_1.pdf recommends NPS to be always 1 */
if (board->no_power_switching) if (board->no_power_switching)
val |= RH_A_NPS; val |= RH_A_NPS;
if (board->power_switching_mode) if (board->power_switching_mode)
val |= RH_A_PSM; 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_write_reg32(isp116x, HCRHDESCA, val);
isp116x->rhdesca = isp116x_read_reg32(isp116x, HCRHDESCA); isp116x->rhdesca = isp116x_read_reg32(isp116x, HCRHDESCA);
......
...@@ -26,8 +26,6 @@ struct isp116x_platform_data { ...@@ -26,8 +26,6 @@ struct isp116x_platform_data {
/* Ganged port power switching (0) or individual port /* Ganged port power switching (0) or individual port
power switching (1) */ power switching (1) */
unsigned power_switching_mode: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: /* Hardware reset set/clear. If implemented, this function must:
if set == 0, deassert chip's HW reset pin if set == 0, deassert chip's HW reset pin
otherwise, assert chip's HW reset pin */ otherwise, assert chip's HW reset pin */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment