[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>

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)
         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/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 {
         /* 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       */