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

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

Pull USB fixes from Greg KH:
 "Here are a number of USB fixes for reported issues for 3.14-rc4

  The majority of these are for USB gadget, phy, and musb driver issues.
  And there's a few new device ids thrown in for good measure"

* tag 'usb-3.14-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: chipidea: need to mask when writting endptflush and endptprime
  usb: musb: correct use of schedule_delayed_work()
  usb: phy: msm: fix compilation errors when !CONFIG_PM_SLEEP
  usb: gadget: fix NULL pointer dereference
  usb: gadget: printer: using gadget_is_otg to check otg support at runtime
  phy: let phy_provider_register be the last step in registering PHY
  phy-core: Don't allow building phy-core as a module
  phy-core: Don't propagate -ENOSUPP from phy_pm_runtime_get_sync to caller
  phy-core: phy_get: Leave error logging to the caller
  phy,phy-bcm-kona-usb2.c: Add dependency on HAS_IOMEM
  usb: musb: correct use of schedule_delayed_work()
  usb: musb: do not sleep in atomic context
  USB: serial: option: blacklist interface 4 for Cinterion PHS8 and PXS8
  USB: EHCI: add delay during suspend to prevent erroneous wakeups
  usb: gadget: bcm63xx_udc: fix build failure on DMA channel code
  usb: musb: do not sleep in atomic context
  usb: gadget: s3c2410_udc: Fix build error
  usb: musb: core: Fix remote-wakeup resume
  usb: musb: host: Fix SuperSpeed hub enumeration
  usb: musb: fix obex in g_nokia.ko causing kernel panic
parents e0f13bd4 5bf5dbed

drivers/phy/Kconfig

+2 −1
Original line number Original line Diff line number Diff line
@@ -5,7 +5,7 @@ 
menu "PHY Subsystem"

menu "PHY Subsystem"





config GENERIC_PHY

config GENERIC_PHY

	tristate "PHY Core"

	bool "PHY Core"

	help

	help

	  Generic PHY support.

	  Generic PHY support.
@@ -61,6 +61,7 @@ config PHY_EXYNOS_DP_VIDEO 
config BCM_KONA_USB2_PHY

config BCM_KONA_USB2_PHY

	tristate "Broadcom Kona USB2 PHY Driver"

	tristate "Broadcom Kona USB2 PHY Driver"

	depends on GENERIC_PHY

	depends on GENERIC_PHY

	depends on HAS_IOMEM

	help

	help

	  Enable this to support the Broadcom Kona USB 2.0 PHY.

	  Enable this to support the Broadcom Kona USB 2.0 PHY.

drivers/phy/phy-core.c

+6 −8
Original line number Original line Diff line number Diff line
@@ -176,6 +176,8 @@ int phy_init(struct phy *phy) 
			dev_err(&phy->dev, "phy init failed --> %d\n", ret);

			dev_err(&phy->dev, "phy init failed --> %d\n", ret);

			goto out;

			goto out;

		}

		}

	} else {

		ret = 0; /* Override possible ret == -ENOTSUPP */

	}

	}

	++phy->init_count;

	++phy->init_count;
@@ -232,6 +234,8 @@ int phy_power_on(struct phy *phy) 
			dev_err(&phy->dev, "phy poweron failed --> %d\n", ret);

			dev_err(&phy->dev, "phy poweron failed --> %d\n", ret);

			goto out;

			goto out;

		}

		}

	} else {

		ret = 0; /* Override possible ret == -ENOTSUPP */

	}

	}

	++phy->power_count;

	++phy->power_count;

	mutex_unlock(&phy->mutex);

	mutex_unlock(&phy->mutex);
@@ -404,17 +408,11 @@ struct phy *phy_get(struct device *dev, const char *string) 
		index = of_property_match_string(dev->of_node, "phy-names",

		index = of_property_match_string(dev->of_node, "phy-names",

			string);

			string);

		phy = of_phy_get(dev, index);

		phy = of_phy_get(dev, index);

		if (IS_ERR(phy)) {

			dev_err(dev, "unable to find phy\n");

			return phy;

		}

	} else {

	} else {

		phy = phy_lookup(dev, string);

		phy = phy_lookup(dev, string);

		if (IS_ERR(phy)) {

			dev_err(dev, "unable to find phy\n");

			return phy;

		}

	}

	}

	if (IS_ERR(phy))

		return phy;





	if (!try_module_get(phy->ops->owner))

	if (!try_module_get(phy->ops->owner))

		return ERR_PTR(-EPROBE_DEFER);

		return ERR_PTR(-EPROBE_DEFER);

drivers/phy/phy-exynos-dp-video.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -76,10 +76,6 @@ static int exynos_dp_video_phy_probe(struct platform_device *pdev) 
	if (IS_ERR(state->regs))

	if (IS_ERR(state->regs))

		return PTR_ERR(state->regs);

		return PTR_ERR(state->regs);





	phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);

	if (IS_ERR(phy_provider))

		return PTR_ERR(phy_provider);



	phy = devm_phy_create(dev, &exynos_dp_video_phy_ops, NULL);

	phy = devm_phy_create(dev, &exynos_dp_video_phy_ops, NULL);

	if (IS_ERR(phy)) {

	if (IS_ERR(phy)) {

		dev_err(dev, "failed to create Display Port PHY\n");

		dev_err(dev, "failed to create Display Port PHY\n");
@@ -87,6 +83,10 @@ static int exynos_dp_video_phy_probe(struct platform_device *pdev) 
	}

	}

	phy_set_drvdata(phy, state);

	phy_set_drvdata(phy, state);





	phy_provider = devm_of_phy_provider_register(dev, of_phy_simple_xlate);

	if (IS_ERR(phy_provider))

		return PTR_ERR(phy_provider);



	return 0;

	return 0;

}

}

drivers/phy/phy-exynos-mipi-video.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -134,11 +134,6 @@ static int exynos_mipi_video_phy_probe(struct platform_device *pdev) 
	dev_set_drvdata(dev, state);

	dev_set_drvdata(dev, state);

	spin_lock_init(&state->slock);

	spin_lock_init(&state->slock);





	phy_provider = devm_of_phy_provider_register(dev,

					exynos_mipi_video_phy_xlate);

	if (IS_ERR(phy_provider))

		return PTR_ERR(phy_provider);



	for (i = 0; i < EXYNOS_MIPI_PHYS_NUM; i++) {

	for (i = 0; i < EXYNOS_MIPI_PHYS_NUM; i++) {

		struct phy *phy = devm_phy_create(dev,

		struct phy *phy = devm_phy_create(dev,

					&exynos_mipi_video_phy_ops, NULL);

					&exynos_mipi_video_phy_ops, NULL);
@@ -152,6 +147,11 @@ static int exynos_mipi_video_phy_probe(struct platform_device *pdev) 
		phy_set_drvdata(phy, &state->phys[i]);

		phy_set_drvdata(phy, &state->phys[i]);

	}

	}





	phy_provider = devm_of_phy_provider_register(dev,

					exynos_mipi_video_phy_xlate);

	if (IS_ERR(phy_provider))

		return PTR_ERR(phy_provider);



	return 0;

	return 0;

}

}

drivers/phy/phy-mvebu-sata.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -99,17 +99,17 @@ static int phy_mvebu_sata_probe(struct platform_device *pdev) 
	if (IS_ERR(priv->clk))

	if (IS_ERR(priv->clk))

		return PTR_ERR(priv->clk);

		return PTR_ERR(priv->clk);





	phy_provider = devm_of_phy_provider_register(&pdev->dev,

						     of_phy_simple_xlate);

	if (IS_ERR(phy_provider))

		return PTR_ERR(phy_provider);



	phy = devm_phy_create(&pdev->dev, &phy_mvebu_sata_ops, NULL);

	phy = devm_phy_create(&pdev->dev, &phy_mvebu_sata_ops, NULL);

	if (IS_ERR(phy))

	if (IS_ERR(phy))

		return PTR_ERR(phy);

		return PTR_ERR(phy);





	phy_set_drvdata(phy, priv);

	phy_set_drvdata(phy, priv);





	phy_provider = devm_of_phy_provider_register(&pdev->dev,

						     of_phy_simple_xlate);

	if (IS_ERR(phy_provider))

		return PTR_ERR(phy_provider);



	/* The boot loader may of left it on. Turn it off. */

	/* The boot loader may of left it on. Turn it off. */

	phy_mvebu_sata_power_off(phy);

	phy_mvebu_sata_power_off(phy);

CRA Git | Maintained and supported by SUSTech CRA and CCSE