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

Commit e900f2c0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB and PHY driver fixes from Greg KH:
 "Here are some USB and PHY driver fixes that resolve some reported
  regressions.  Also in here are some new device ids.

  All of the details are in the shortlog and these patches have been in
  linux-next with no problems"

* tag 'usb-4.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (22 commits)
  USB: cp210x: add ID for HubZ dual ZigBee and Z-Wave dongle
  usb: renesas_usbhs: Don't disable the pipe if Control write status stage
  usb: renesas_usbhs: Fix fifo unclear in usbhsf_prepare_pop
  usb: gadget: f_fs: fix check in read operation
  usb: musb: fix order of conditions for assigning end point operations
  usb: gadget: f_uac1: check return code from config_ep_by_speed
  usb: gadget: ffs: fix: Always call ffs_closed() in ffs_data_clear()
  usb: gadget: g_ffs: Fix counting of missing_functions
  usb: s3c2410_udc: correct reversed pullup logic
  usb: dwc3: gadget: Fix incorrect DEPCMD and DGCMD status macros
  usb: phy: tahvo: Pass the IRQF_ONESHOT flag
  usb: phy: ab8500-usb: Pass the IRQF_ONESHOT flag
  usb: renesas_usbhs: Revise the binding document about the dma-names
  usb: host: xhci: add mutex for non-thread-safe data
  usb: make module xhci_hcd removable
  USB: serial: ftdi_sio: Add support for a Motion Tracker Development Board
  usb: gadget: f_midi: fix segfault when reading empty id
  phy: phy-rcar-gen2: Fix USBHS_UGSTS_LOCK value
  phy: omap-usb2: invoke pm_runtime_disable on error path
  phy: fix Kconfig dependencies
  ...
parents be19c4ab 9d082030

Documentation/devicetree/bindings/usb/renesas_usbhs.txt

+2 −4
Original line number Diff line number Diff line
@@ -15,10 +15,8 @@ Optional properties: 
  - phys: phandle + phy specifier pair

  - phy-names: must be "usb"

  - dmas: Must contain a list of references to DMA specifiers.

  - dma-names : Must contain a list of DMA names:

   - tx0 ... tx<n>

   - rx0 ... rx<n>

    - This <n> means DnFIFO in USBHS module.

  - dma-names : named "ch%d", where %d is the channel number ranging from zero

                to the number of channels (DnFIFOs) minus one.



Example:

	usbhs: usb@e6590000 {

drivers/phy/Kconfig

+7 −3
Original line number Diff line number Diff line
@@ -38,7 +38,9 @@ config ARMADA375_USBCLUSTER_PHY 
config PHY_DM816X_USB

	tristate "TI dm816x USB PHY driver"

	depends on ARCH_OMAP2PLUS

	depends on USB_SUPPORT

	select GENERIC_PHY

	select USB_PHY

	help

	  Enable this for dm816x USB to work.
@@ -97,8 +99,9 @@ config OMAP_CONTROL_PHY 
config OMAP_USB2

	tristate "OMAP USB2 PHY Driver"

	depends on ARCH_OMAP2PLUS

	depends on USB_PHY

	depends on USB_SUPPORT

	select GENERIC_PHY

	select USB_PHY

	select OMAP_CONTROL_PHY

	depends on OMAP_OCP2SCP

	help
@@ -122,8 +125,9 @@ config TI_PIPE3 
config TWL4030_USB

	tristate "TWL4030 USB Transceiver Driver"

	depends on TWL4030_CORE && REGULATOR_TWL4030 && USB_MUSB_OMAP2PLUS

	depends on USB_PHY

	depends on USB_SUPPORT

	select GENERIC_PHY

	select USB_PHY

	help

	  Enable this to support the USB OTG transceiver on TWL4030

	  family chips (including the TWL5030 and TPS659x0 devices).
@@ -304,7 +308,7 @@ config PHY_STIH41X_USB 


config PHY_QCOM_UFS

	tristate "Qualcomm UFS PHY driver"

	depends on OF && ARCH_MSM

	depends on OF && ARCH_QCOM

	select GENERIC_PHY

	help

	  Support for UFS PHY on QCOM chipsets.

drivers/phy/phy-core.c

+2 −2
Original line number Diff line number Diff line
@@ -530,7 +530,7 @@ struct phy *phy_optional_get(struct device *dev, const char *string) 
{

	struct phy *phy = phy_get(dev, string);



	if (PTR_ERR(phy) == -ENODEV)

	if (IS_ERR(phy) && (PTR_ERR(phy) == -ENODEV))

		phy = NULL;



	return phy;
@@ -584,7 +584,7 @@ struct phy *devm_phy_optional_get(struct device *dev, const char *string) 
{

	struct phy *phy = devm_phy_get(dev, string);



	if (PTR_ERR(phy) == -ENODEV)

	if (IS_ERR(phy) && (PTR_ERR(phy) == -ENODEV))

		phy = NULL;



	return phy;

drivers/phy/phy-omap-usb2.c

+1 −0
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ static int omap_usb2_probe(struct platform_device *pdev) 
		phy->wkupclk = devm_clk_get(phy->dev, "usb_phy_cm_clk32k");

		if (IS_ERR(phy->wkupclk)) {

			dev_err(&pdev->dev, "unable to get usb_phy_cm_clk32k\n");

			pm_runtime_disable(phy->dev);

			return PTR_ERR(phy->wkupclk);

		} else {

			dev_warn(&pdev->dev,

drivers/phy/phy-rcar-gen2.c

+2 −2
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#define USBHS_LPSTS			0x02

#define USBHS_UGCTRL			0x80

#define USBHS_UGCTRL2			0x84

#define USBHS_UGSTS			0x88	/* The manuals have 0x90 */

#define USBHS_UGSTS			0x88	/* From technical update */



/* Low Power Status register (LPSTS) */

#define USBHS_LPSTS_SUSPM		0x4000
@@ -41,7 +41,7 @@ 
#define USBHS_UGCTRL2_USB0SEL_HS_USB	0x00000030



/* USB General status register (UGSTS) */

#define USBHS_UGSTS_LOCK		0x00000300 /* The manuals have 0x3 */

#define USBHS_UGSTS_LOCK		0x00000100 /* From technical update */



#define PHYS_PER_CHANNEL	2