Commit 26ae19a3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here's a few USB and PHY fixes for 4.2-rc4.

  Nothing major, the shortlog has the full details.

  All of these have been in linux-next successfully"

* tag 'usb-4.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (21 commits)
  USB: OHCI: fix bad #define in ohci-tmio.c
  cdc-acm: Destroy acm_minors IDR on module exit
  usb-storage: Add ignore-device quirk for gm12u320 based usb mini projectors
  usb-storage: ignore ZTE MF 823 card reader in mode 0x1225
  USB: OHCI: Fix race between ED unlink and URB submission
  usb: core: lpm: set lpm_capable for root hub device
  xhci: do not report PLC when link is in internal resume state
  xhci: prevent bus_suspend if SS port resuming in phase 1
  xhci: report U3 when link is in resume state
  xhci: Calculate old endpoints correctly on device reset
  usb: xhci: Bugfix for NULL pointer deference in xhci_endpoint_init() function
  xhci: Workaround to get D3 working in Intel xHCI
  xhci: call BIOS workaround to enable runtime suspend on Intel Braswell
  usb: dwc3: Reset the transfer resource index on SET_INTERFACE
  usb: gadget: udc: core: Fix argument of dma_map_single for IOMMU
  usb: gadget: mv_udc_core: fix phy_regs I/O memory leak
  usb: ulpi: ulpi_init should be executed in subsys_initcall
  phy: berlin-usb: fix divider for BG2
  phy: berlin-usb: fix divider for BG2CD
  phy/pxa: add HAS_IOMEM dependency
  ...
parents 82b35f37 1209544d

drivers/phy/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ config PHY_EXYNOS_MIPI_VIDEO 


config PHY_PXA_28NM_HSIC

	tristate "Marvell USB HSIC 28nm PHY Driver"

	depends on HAS_IOMEM

	select GENERIC_PHY

	help

	  Enable this to support Marvell USB HSIC PHY driver for Marvell
@@ -66,6 +67,7 @@ config PHY_PXA_28NM_HSIC 


config PHY_PXA_28NM_USB2

	tristate "Marvell USB 2.0 28nm PHY Driver"

	depends on HAS_IOMEM

	select GENERIC_PHY

	help

	  Enable this to support Marvell USB 2.0 PHY driver for Marvell

drivers/phy/phy-berlin-usb.c

+2 −2
Original line number Diff line number Diff line
@@ -105,9 +105,9 @@ 


static const u32 phy_berlin_pll_dividers[] = {

	/* Berlin 2 */

	CLK_REF_DIV(0xc) | FEEDBACK_CLK_DIV(0x54),

	/* Berlin 2CD */

	CLK_REF_DIV(0x6) | FEEDBACK_CLK_DIV(0x55),

	/* Berlin 2CD/Q */

	CLK_REF_DIV(0xc) | FEEDBACK_CLK_DIV(0x54),

};



struct phy_berlin_usb_priv {

drivers/phy/phy-ti-pipe3.c

+41 −131
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <linux/delay.h>

#include <linux/phy/omap_control_phy.h>

#include <linux/of_platform.h>

#include <linux/spinlock.h>



#define	PLL_STATUS		0x00000004

#define	PLL_GO			0x00000008
@@ -83,10 +82,6 @@ struct ti_pipe3 { 
	struct clk		*refclk;

	struct clk		*div_clk;

	struct pipe3_dpll_map	*dpll_map;

	bool			enabled;

	spinlock_t		lock;	/* serialize clock enable/disable */

	/* the below flag is needed specifically for SATA */

	bool			refclk_enabled;

};



static struct pipe3_dpll_map dpll_map_usb[] = {
@@ -137,6 +132,9 @@ static struct pipe3_dpll_params *ti_pipe3_get_dpll_params(struct ti_pipe3 *phy) 
	return NULL;

}



static int ti_pipe3_enable_clocks(struct ti_pipe3 *phy);

static void ti_pipe3_disable_clocks(struct ti_pipe3 *phy);



static int ti_pipe3_power_off(struct phy *x)

{

	struct ti_pipe3 *phy = phy_get_drvdata(x);
@@ -217,6 +215,7 @@ static int ti_pipe3_init(struct phy *x) 
	u32 val;

	int ret = 0;



	ti_pipe3_enable_clocks(phy);

	/*

	 * Set pcie_pcs register to 0x96 for proper functioning of phy

	 * as recommended in AM572x TRM SPRUHZ6, section 18.5.2.2, table
@@ -250,13 +249,12 @@ static int ti_pipe3_exit(struct phy *x) 
	u32 val;

	unsigned long timeout;



	/* SATA DPLL can't be powered down due to Errata i783 and PCIe

	 * does not have internal DPLL

	 */

	if (of_device_is_compatible(phy->dev->of_node, "ti,phy-pipe3-sata") ||

	    of_device_is_compatible(phy->dev->of_node, "ti,phy-pipe3-pcie"))

	/* SATA DPLL can't be powered down due to Errata i783 */

	if (of_device_is_compatible(phy->dev->of_node, "ti,phy-pipe3-sata"))

		return 0;



	/* PCIe doesn't have internal DPLL */

	if (!of_device_is_compatible(phy->dev->of_node, "ti,phy-pipe3-pcie")) {

		/* Put DPLL in IDLE mode */

		val = ti_pipe3_readl(phy->pll_ctrl_base, PLL_CONFIGURATION2);

		val |= PLL_IDLE;
@@ -276,6 +274,9 @@ static int ti_pipe3_exit(struct phy *x) 
				val);

			return -EBUSY;

		}

	}



	ti_pipe3_disable_clocks(phy);



	return 0;

}
@@ -306,7 +307,6 @@ static int ti_pipe3_probe(struct platform_device *pdev) 
		return -ENOMEM;



	phy->dev		= &pdev->dev;

	spin_lock_init(&phy->lock);



	if (!of_device_is_compatible(node, "ti,phy-pipe3-pcie")) {

		match = of_match_device(ti_pipe3_id_table, &pdev->dev);
@@ -402,6 +402,10 @@ static int ti_pipe3_probe(struct platform_device *pdev) 


	platform_set_drvdata(pdev, phy);

	pm_runtime_enable(phy->dev);

	/* Prevent auto-disable of refclk for SATA PHY due to Errata i783 */

	if (of_device_is_compatible(node, "ti,phy-pipe3-sata"))

		if (!IS_ERR(phy->refclk))

			clk_prepare_enable(phy->refclk);



	generic_phy = devm_phy_create(phy->dev, NULL, &ops);

	if (IS_ERR(generic_phy))
@@ -413,63 +417,33 @@ static int ti_pipe3_probe(struct platform_device *pdev) 
	if (IS_ERR(phy_provider))

		return PTR_ERR(phy_provider);



	pm_runtime_get(&pdev->dev);



	return 0;

}



static int ti_pipe3_remove(struct platform_device *pdev)

{

	if (!pm_runtime_suspended(&pdev->dev))

		pm_runtime_put(&pdev->dev);

	pm_runtime_disable(&pdev->dev);



	return 0;

}



#ifdef CONFIG_PM

static int ti_pipe3_enable_refclk(struct ti_pipe3 *phy)

static int ti_pipe3_enable_clocks(struct ti_pipe3 *phy)

{

	if (!IS_ERR(phy->refclk) && !phy->refclk_enabled) {

		int ret;

	int ret = 0;



	if (!IS_ERR(phy->refclk)) {

		ret = clk_prepare_enable(phy->refclk);

		if (ret) {

			dev_err(phy->dev, "Failed to enable refclk %d\n", ret);

			return ret;

		}

		phy->refclk_enabled = true;

	}



	return 0;

}



static void ti_pipe3_disable_refclk(struct ti_pipe3 *phy)

{

	if (!IS_ERR(phy->refclk))

		clk_disable_unprepare(phy->refclk);



	phy->refclk_enabled = false;

	}



static int ti_pipe3_enable_clocks(struct ti_pipe3 *phy)

{

	int ret = 0;

	unsigned long flags;



	spin_lock_irqsave(&phy->lock, flags);

	if (phy->enabled)

		goto err1;



	ret = ti_pipe3_enable_refclk(phy);

	if (ret)

		goto err1;



	if (!IS_ERR(phy->wkupclk)) {

		ret = clk_prepare_enable(phy->wkupclk);

		if (ret) {

			dev_err(phy->dev, "Failed to enable wkupclk %d\n", ret);

			goto err2;

			goto disable_refclk;

		}

	}
@@ -477,95 +451,32 @@ static int ti_pipe3_enable_clocks(struct ti_pipe3 *phy) 
		ret = clk_prepare_enable(phy->div_clk);

		if (ret) {

			dev_err(phy->dev, "Failed to enable div_clk %d\n", ret);

			goto err3;

			goto disable_wkupclk;

		}

	}



	phy->enabled = true;

	spin_unlock_irqrestore(&phy->lock, flags);

	return 0;



err3:

disable_wkupclk:

	if (!IS_ERR(phy->wkupclk))

		clk_disable_unprepare(phy->wkupclk);



err2:

disable_refclk:

	if (!IS_ERR(phy->refclk))

		clk_disable_unprepare(phy->refclk);



	ti_pipe3_disable_refclk(phy);

err1:

	spin_unlock_irqrestore(&phy->lock, flags);

	return ret;

}



static void ti_pipe3_disable_clocks(struct ti_pipe3 *phy)

{

	unsigned long flags;



	spin_lock_irqsave(&phy->lock, flags);

	if (!phy->enabled) {

		spin_unlock_irqrestore(&phy->lock, flags);

		return;

	}



	if (!IS_ERR(phy->wkupclk))

		clk_disable_unprepare(phy->wkupclk);

	/* Don't disable refclk for SATA PHY due to Errata i783 */

	if (!of_device_is_compatible(phy->dev->of_node, "ti,phy-pipe3-sata"))

		ti_pipe3_disable_refclk(phy);

	if (!IS_ERR(phy->refclk))

		clk_disable_unprepare(phy->refclk);

	if (!IS_ERR(phy->div_clk))

		clk_disable_unprepare(phy->div_clk);

	phy->enabled = false;

	spin_unlock_irqrestore(&phy->lock, flags);

}



static int ti_pipe3_runtime_suspend(struct device *dev)

{

	struct ti_pipe3	*phy = dev_get_drvdata(dev);



	ti_pipe3_disable_clocks(phy);

	return 0;

}



static int ti_pipe3_runtime_resume(struct device *dev)

{

	struct ti_pipe3	*phy = dev_get_drvdata(dev);

	int ret = 0;



	ret = ti_pipe3_enable_clocks(phy);

	return ret;

}



static int ti_pipe3_suspend(struct device *dev)

{

	struct ti_pipe3	*phy = dev_get_drvdata(dev);



	ti_pipe3_disable_clocks(phy);

	return 0;

}



static int ti_pipe3_resume(struct device *dev)

{

	struct ti_pipe3	*phy = dev_get_drvdata(dev);

	int ret;



	ret = ti_pipe3_enable_clocks(phy);

	if (ret)

		return ret;



	pm_runtime_disable(dev);

	pm_runtime_set_active(dev);

	pm_runtime_enable(dev);

	return 0;

}

#endif



static const struct dev_pm_ops ti_pipe3_pm_ops = {

	SET_RUNTIME_PM_OPS(ti_pipe3_runtime_suspend,

			   ti_pipe3_runtime_resume, NULL)

	SET_SYSTEM_SLEEP_PM_OPS(ti_pipe3_suspend, ti_pipe3_resume)

};



static const struct of_device_id ti_pipe3_id_table[] = {

	{
@@ -592,7 +503,6 @@ static struct platform_driver ti_pipe3_driver = { 
	.remove		= ti_pipe3_remove,

	.driver		= {

		.name	= "ti-pipe3",

		.pm	= &ti_pipe3_pm_ops,

		.of_match_table = ti_pipe3_id_table,

	},

};

drivers/usb/class/cdc-acm.c

+1 −0
Original line number Diff line number Diff line
@@ -1944,6 +1944,7 @@ static void __exit acm_exit(void) 
	usb_deregister(&acm_driver);

	tty_unregister_driver(acm_tty_driver);

	put_tty_driver(acm_tty_driver);

	idr_destroy(&acm_minors);

}



module_init(acm_init);

drivers/usb/common/ulpi.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static int __init ulpi_init(void) 
{

	return bus_register(&ulpi_bus);

}

module_init(ulpi_init);

subsys_initcall(ulpi_init);



static void __exit ulpi_exit(void)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE