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

Commit 246baac2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are some small USB fixes for 4.12-rc5

  They are for some reported issues in the chipidea and gadget drivers.
  Nothing major. All have been in linux-next for a while with no
  reported issues"

* tag 'usb-4.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: gadget: udc: renesas_usb3: Fix PN_INT_ENA disabling timing
  usb: gadget: udc: renesas_usb3: lock for PN_ registers access
  usb: gadget: udc: renesas_usb3: fix deadlock by spinlock
  usb: gadget: udc: renesas_usb3: fix pm_runtime functions calling
  usb: gadget: f_mass_storage: Serialize wake and sleep execution
  usb: dwc2: add support for the DWC2 controller on Meson8 SoCs
  phy: qualcomm: phy-qcom-qmp: fix application of sizeof to pointer
  usb: musb: dsps: keep VBUS on for host-only mode
  usb: chipidea: core: check before accessing ci_role in ci_role_show
  usb: chipidea: debug: check before accessing ci_role
  phy: qcom-qmp: fix return value check in qcom_qmp_phy_create()
  usb: chipidea: udc: fix NULL pointer dereference if udc_start failed
  usb: chipidea: imx: Do not access CLKONOFF on i.MX51
parents ef918d3c 29532e7b

Documentation/devicetree/bindings/usb/dwc2.txt

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Required properties: 
  - "rockchip,rk3288-usb", "rockchip,rk3066-usb", "snps,dwc2": for rk3288 Soc;

  - "lantiq,arx100-usb": The DWC2 USB controller instance in Lantiq ARX SoCs;

  - "lantiq,xrx200-usb": The DWC2 USB controller instance in Lantiq XRX SoCs;

  - "amlogic,meson8-usb": The DWC2 USB controller instance in Amlogic Meson8 SoCs;

  - "amlogic,meson8b-usb": The DWC2 USB controller instance in Amlogic Meson8b SoCs;

  - "amlogic,meson-gxbb-usb": The DWC2 USB controller instance in Amlogic S905 SoCs;

  - "amcc,dwc-otg": The DWC2 USB controller instance in AMCC Canyonlands 460EX SoCs;

drivers/phy/phy-qcom-qmp.c

+7 −7
Original line number Diff line number Diff line
@@ -844,7 +844,7 @@ static int qcom_qmp_phy_vreg_init(struct device *dev) 
	int num = qmp->cfg->num_vregs;

	int i;



	qmp->vregs = devm_kcalloc(dev, num, sizeof(qmp->vregs), GFP_KERNEL);

	qmp->vregs = devm_kcalloc(dev, num, sizeof(*qmp->vregs), GFP_KERNEL);

	if (!qmp->vregs)

		return -ENOMEM;
@@ -983,16 +983,16 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id) 
	 * Resources are indexed as: tx -> 0; rx -> 1; pcs -> 2.

	 */

	qphy->tx = of_iomap(np, 0);

	if (IS_ERR(qphy->tx))

		return PTR_ERR(qphy->tx);

	if (!qphy->tx)

		return -ENOMEM;



	qphy->rx = of_iomap(np, 1);

	if (IS_ERR(qphy->rx))

		return PTR_ERR(qphy->rx);

	if (!qphy->rx)

		return -ENOMEM;



	qphy->pcs = of_iomap(np, 2);

	if (IS_ERR(qphy->pcs))

		return PTR_ERR(qphy->pcs);

	if (!qphy->pcs)

		return -ENOMEM;



	/*

	 * Get PHY's Pipe clock, if any. USB3 and PCIe are PIPE3

drivers/usb/chipidea/core.c

+4 −1
Original line number Diff line number Diff line
@@ -843,7 +843,10 @@ static ssize_t ci_role_show(struct device *dev, struct device_attribute *attr, 
{

	struct ci_hdrc *ci = dev_get_drvdata(dev);



	if (ci->role != CI_ROLE_END)

		return sprintf(buf, "%s\n", ci_role(ci)->name);



	return 0;

}



static ssize_t ci_role_store(struct device *dev,

drivers/usb/chipidea/debug.c

+2 −1
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ static int ci_role_show(struct seq_file *s, void *data) 
{

	struct ci_hdrc *ci = s->private;



	if (ci->role != CI_ROLE_END)

		seq_printf(s, "%s\n", ci_role(ci)->name);



	return 0;

drivers/usb/chipidea/udc.c

+6 −2
Original line number Diff line number Diff line
@@ -1993,6 +1993,7 @@ static void udc_id_switch_for_host(struct ci_hdrc *ci) 
int ci_hdrc_gadget_init(struct ci_hdrc *ci)

{

	struct ci_role_driver *rdrv;

	int ret;



	if (!hw_read(ci, CAP_DCCPARAMS, DCCPARAMS_DC))

		return -ENXIO;
@@ -2005,7 +2006,10 @@ int ci_hdrc_gadget_init(struct ci_hdrc *ci) 
	rdrv->stop	= udc_id_switch_for_host;

	rdrv->irq	= udc_irq;

	rdrv->name	= "gadget";



	ret = udc_start(ci);

	if (!ret)

		ci->roles[CI_ROLE_GADGET] = rdrv;



	return udc_start(ci);

	return ret;

}