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

Commit 4089ffd7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'fixes-for-v3.10-rc2' of... 

Merge tag 'fixes-for-v3.10-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb

 into usb-linus

Felipe writes:

usb: fixes for v3.10-rc2

Here's the initial set of fixes for v3.10-rc series. It countains miscellaneous
fixes in numerous drivers.

Many gadget drivers and PHY drivers learned that it's not necessary to
platform_set_drvdata() twice, that's not necessary to check the resource
pointer returned by platform_get_resource() when using devm_ioremap_resource()
and they learned that we shouldn't return 0 in case of errors.

DWC3 got a build fix for cases where DWC3 is marked as 'y' while gadget API is
marked as 'm'.

There's also a NULL pointer exception fix on usb_get_phy(), mxs-phy now knows
which PHY type it is and s3c-hsotg is now passing proper arguments to
usb_gadget_unmap_request().

Other than that there are some spelling fixes and kernel-doc warnings.

Signed-of-by: default avatarFelipe Balbi <balbi@ti.com>
parents f722406f 4e0aa635

drivers/staging/dwc2/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ config USB_DWC2 
	tristate "DesignWare USB2 DRD Core Support"

	depends on USB

	depends on VIRT_TO_BUS

	select USB_OTG_UTILS

	help

	  Say Y or M here if your system has a Dual Role HighSpeed

	  USB controller based on the DesignWare HSOTG IP Core.

drivers/usb/dwc3/Kconfig

+3 −3
Original line number Diff line number Diff line
@@ -19,21 +19,21 @@ choice 


config USB_DWC3_HOST

	bool "Host only mode"

	depends on USB

	depends on USB=y || USB=USB_DWC3

	help

	  Select this when you want to use DWC3 in host mode only,

	  thereby the gadget feature will be regressed.



config USB_DWC3_GADGET

	bool "Gadget only mode"

	depends on USB_GADGET

	depends on USB_GADGET=y || USB_GADGET=USB_DWC3

	help

	  Select this when you want to use DWC3 in gadget mode only,

	  thereby the host feature will be regressed.



config USB_DWC3_DUAL_ROLE

	bool "Dual Role mode"

	depends on (USB && USB_GADGET)

	depends on ((USB=y || USB=USB_DWC3) && (USB_GADGET=y || USB_GADGET=USB_DWC3))

	help

	  This is the default mode of working of DWC3 controller where

	  both host and gadget features are enabled.

drivers/usb/gadget/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -146,7 +146,6 @@ config USB_LPC32XX 
	depends on ARCH_LPC32XX

	depends on USB_PHY

	select USB_ISP1301

	select USB_OTG_UTILS

	help

	   This option selects the USB device controller in the LPC32xx SoC.

drivers/usb/gadget/atmel_usba_udc.c

+0 −2
Original line number Diff line number Diff line
@@ -1992,8 +1992,6 @@ static int __init usba_udc_probe(struct platform_device *pdev) 
err_get_hclk:

	clk_put(pclk);



	platform_set_drvdata(pdev, NULL);



	return ret;

}

drivers/usb/gadget/bcm63xx_udc.c

+0 −11
Original line number Diff line number Diff line
@@ -2334,21 +2334,11 @@ static int bcm63xx_udc_probe(struct platform_device *pdev) 
	}



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(dev, "error finding USBD resource\n");

		return -ENXIO;

	}



	udc->usbd_regs = devm_ioremap_resource(dev, res);

	if (IS_ERR(udc->usbd_regs))

		return PTR_ERR(udc->usbd_regs);



	res = platform_get_resource(pdev, IORESOURCE_MEM, 1);

	if (!res) {

		dev_err(dev, "error finding IUDMA resource\n");

		return -ENXIO;

	}



	udc->iudma_regs = devm_ioremap_resource(dev, res);

	if (IS_ERR(udc->iudma_regs))

		return PTR_ERR(udc->iudma_regs);
@@ -2420,7 +2410,6 @@ static int bcm63xx_udc_remove(struct platform_device *pdev) 
	usb_del_gadget_udc(&udc->gadget);

	BUG_ON(udc->driver);



	platform_set_drvdata(pdev, NULL);

	bcm63xx_uninit_udc_hw(udc);



	return 0;