Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 165c0f39 authored by Olav Kongas's avatar Olav Kongas Committed by Greg Kroah-Hartman
Browse files

[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: default avatarOlav Kongas <ok@artecdesign.ee>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d4d62861

drivers/usb/host/isp116x-hcd.c

+4 −5
Original line number Diff line number Diff line
@@ -1581,10 +1581,9 @@ 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)

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

include/linux/usb_isp116x.h

+0 −5
Original line number Diff line number Diff line
@@ -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       */