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

Commit 207b08b9 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fixes-for-v4.5-rc3' of... 

Merge tag 'fixes-for-v4.5-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb into usb-linus

Felipe writes:

usb: fixes for v4.5-rc2

DWC3 got a fix for OTG Certification, DWC2 has two fixes for regressions on
RasPI, MUSB has a NULL pointer dereference fix for ux500 platforms and two
PHYs (MSM and MXS) got some minor fixes.

While at that, I'm also adding a fix to my email address which has changed
recently.
parents 5c821711 6a4290cc

MAINTAINERS

+5 −5
Original line number Diff line number Diff line
@@ -3445,7 +3445,7 @@ S: Maintained 
F:	drivers/usb/dwc2/



DESIGNWARE USB3 DRD IP DRIVER

M:	Felipe Balbi <balbi@ti.com>

M:	Felipe Balbi <balbi@kernel.org>

L:	linux-usb@vger.kernel.org

L:	linux-omap@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
@@ -7370,7 +7370,7 @@ F: drivers/tty/isicom.c 
F:	include/linux/isicom.h



MUSB MULTIPOINT HIGH SPEED DUAL-ROLE CONTROLLER

M:	Felipe Balbi <balbi@ti.com>

M:	Felipe Balbi <balbi@kernel.org>

L:	linux-usb@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git

S:	Maintained
@@ -7939,7 +7939,7 @@ F: drivers/media/platform/omap3isp/ 
F:	drivers/staging/media/omap4iss/



OMAP USB SUPPORT

M:	Felipe Balbi <balbi@ti.com>

M:	Felipe Balbi <balbi@kernel.org>

L:	linux-usb@vger.kernel.org

L:	linux-omap@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
@@ -11318,7 +11318,7 @@ F: Documentation/usb/ehci.txt 
F:	drivers/usb/host/ehci*



USB GADGET/PERIPHERAL SUBSYSTEM

M:	Felipe Balbi <balbi@ti.com>

M:	Felipe Balbi <balbi@kernel.org>

L:	linux-usb@vger.kernel.org

W:	http://www.linux-usb.org/gadget

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
@@ -11394,7 +11394,7 @@ S: Maintained 
F:	drivers/net/usb/pegasus.*



USB PHY LAYER

M:	Felipe Balbi <balbi@ti.com>

M:	Felipe Balbi <balbi@kernel.org>

L:	linux-usb@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git

S:	Maintained

drivers/usb/dwc2/core.c

+0 −14
Original line number Diff line number Diff line
@@ -572,12 +572,6 @@ static bool dwc2_force_mode(struct dwc2_hsotg *hsotg, bool host) 
	set = host ? GUSBCFG_FORCEHOSTMODE : GUSBCFG_FORCEDEVMODE;

	clear = host ? GUSBCFG_FORCEDEVMODE : GUSBCFG_FORCEHOSTMODE;



	/*

	 * If the force mode bit is already set, don't set it.

	 */

	if ((gusbcfg & set) && !(gusbcfg & clear))

		return false;



	gusbcfg &= ~clear;

	gusbcfg |= set;

	dwc2_writel(gusbcfg, hsotg->regs + GUSBCFG);
@@ -3278,9 +3272,6 @@ static void dwc2_get_dev_hwparams(struct dwc2_hsotg *hsotg) 
/**

 * During device initialization, read various hardware configuration

 * registers and interpret the contents.

 *

 * This should be called during driver probe. It will perform a core

 * soft reset in order to get the reset values of the parameters.

 */

int dwc2_get_hwparams(struct dwc2_hsotg *hsotg)

{
@@ -3288,7 +3279,6 @@ int dwc2_get_hwparams(struct dwc2_hsotg *hsotg) 
	unsigned width;

	u32 hwcfg1, hwcfg2, hwcfg3, hwcfg4;

	u32 grxfsiz;

	int retval;



	/*

	 * Attempt to ensure this device is really a DWC_otg Controller.
@@ -3308,10 +3298,6 @@ int dwc2_get_hwparams(struct dwc2_hsotg *hsotg) 
		hw->snpsid >> 12 & 0xf, hw->snpsid >> 8 & 0xf,

		hw->snpsid >> 4 & 0xf, hw->snpsid & 0xf, hw->snpsid);



	retval = dwc2_core_reset(hsotg);

	if (retval)

		return retval;



	hwcfg1 = dwc2_readl(hsotg->regs + GHWCFG1);

	hwcfg2 = dwc2_readl(hsotg->regs + GHWCFG2);

	hwcfg3 = dwc2_readl(hsotg->regs + GHWCFG3);

drivers/usb/dwc2/platform.c

+7 −1
Original line number Diff line number Diff line
@@ -530,7 +530,13 @@ static int dwc2_driver_probe(struct platform_device *dev) 
	if (retval)

		return retval;



	/* Reset the controller and detect hardware config values */

	/*

	 * Reset before dwc2_get_hwparams() then it could get power-on real

	 * reset value form registers.

	 */

	dwc2_core_reset_and_force_dr_mode(hsotg);



	/* Detect config values from hardware */

	retval = dwc2_get_hwparams(hsotg);

	if (retval)

		goto error;

drivers/usb/dwc3/gadget.c

+1 −0
Original line number Diff line number Diff line
@@ -2789,6 +2789,7 @@ int dwc3_gadget_init(struct dwc3 *dwc) 
	dwc->gadget.speed		= USB_SPEED_UNKNOWN;

	dwc->gadget.sg_supported	= true;

	dwc->gadget.name		= "dwc3-gadget";

	dwc->gadget.is_otg		= dwc->dr_mode == USB_DR_MODE_OTG;



	/*

	 * FIXME We might be setting max_speed to <SUPER, however versions

drivers/usb/musb/ux500.c

+5 −2
Original line number Diff line number Diff line
@@ -348,7 +348,9 @@ static int ux500_suspend(struct device *dev) 
	struct ux500_glue	*glue = dev_get_drvdata(dev);

	struct musb		*musb = glue_to_musb(glue);



	if (musb)

		usb_phy_set_suspend(musb->xceiv, 1);



	clk_disable_unprepare(glue->clk);



	return 0;
@@ -366,6 +368,7 @@ static int ux500_resume(struct device *dev) 
		return ret;

	}



	if (musb)

		usb_phy_set_suspend(musb->xceiv, 0);



	return 0;