[PATCH] USB: isp116x-hcd: support only per-port power switching

The isp116x chip will now always be in per-port power switching mode. Remove
conf options to set any other mode.

Signed-off-by: Olav Kongas <ok@artecdesign.ee>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2 files changed, 4 insertions, 10 deletions

diff --git a/drivers/usb/host/isp116x-hcd.c b/drivers/usb/host/isp116x-hcd.c
index 96aaee509929..a3e881c60026 100644
--- a/drivers/usb/host/isp116x-hcd.c
+++ b/drivers/usb/host/isp116x-hcd.c
@@ -1581,11 +1581,10 @@ static int isp116x_start(struct usb_hcd *hcd)
 
         /* ----- Root hub conf */
         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;
+        /* AN10003_1.pdf recommends RH_A_NPS (no power switching) to
+           be always set. Yet, instead, we request individual port
+           power switching. */
+        val |= RH_A_PSM;
         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 0d21407ccfc2..c028d724be94 100644
--- a/include/linux/usb_isp116x.h
+++ b/include/linux/usb_isp116x.h
@@ -19,11 +19,6 @@ struct isp116x_platform_data {
            prevents stopping internal clock, increasing
            thereby power consumption in suspended state. */
         unsigned remote_wakeup_enable:1;
-        /* Switch or not to switch (keep always powered) */
-        unsigned no_power_switching:1;
-        /* Ganged port power switching (0) or individual port
-           power switching (1) */
-        unsigned power_switching_mode:1;
         /* 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       */