Merge tag 'usb-4.4-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb (24b0d5e7) · Commits · 戴 / test

drivers/phy/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -233,6 +233,7 @@ config PHY_SUN9I_USB
		tristate "Allwinner sun9i SoC USB PHY driver"
		depends on ARCH_SUNXI && HAS_IOMEM && OF
		depends on RESET_CONTROLLER
		depends on USB_COMMON
		select GENERIC_PHY
		help
		Enable this to support the transceiver that is part of Allwinner

+12 −4

Original line number	Diff line number	Diff line
		@@ -128,6 +128,7 @@ static int cygnus_pcie_phy_probe(struct platform_device *pdev)
		struct phy_provider *provider;
		struct resource *res;
		unsigned cnt = 0;
		int ret;

		if (of_get_child_count(node) == 0) {
		dev_err(dev, "PHY no child node\n");
		@@ -154,24 +155,28 @@ static int cygnus_pcie_phy_probe(struct platform_device *pdev)
		if (of_property_read_u32(child, "reg", &id)) {
		dev_err(dev, "missing reg property for %s\n",
		child->name);
		return -EINVAL;
		ret = -EINVAL;
		goto put_child;
		}

		if (id >= MAX_NUM_PHYS) {
		dev_err(dev, "invalid PHY id: %u\n", id);
		return -EINVAL;
		ret = -EINVAL;
		goto put_child;
		}

		if (core->phys[id].phy) {
		dev_err(dev, "duplicated PHY id: %u\n", id);
		return -EINVAL;
		ret = -EINVAL;
		goto put_child;
		}

		p = &core->phys[id];
		p->phy = devm_phy_create(dev, child, &cygnus_pcie_phy_ops);
		if (IS_ERR(p->phy)) {
		dev_err(dev, "failed to create PHY\n");
		return PTR_ERR(p->phy);
		ret = PTR_ERR(p->phy);
		goto put_child;
		}

		p->core = core;
		@@ -191,6 +196,9 @@ static int cygnus_pcie_phy_probe(struct platform_device *pdev)
		dev_dbg(dev, "registered %u PCIe PHY(s)\n", cnt);

		return 0;
		put_child:
		of_node_put(child);
		return ret;
		}

		static const struct of_device_id cygnus_pcie_phy_match_table[] = {

+14 −6

Original line number	Diff line number	Diff line
		@@ -195,7 +195,7 @@ static int phy_berlin_sata_probe(struct platform_device *pdev)
		struct phy_provider *phy_provider;
		struct phy_berlin_priv *priv;
		struct resource *res;
		int i = 0;
		int ret, i = 0;
		u32 phy_id;

		priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
		@@ -237,22 +237,27 @@ static int phy_berlin_sata_probe(struct platform_device *pdev)
		if (of_property_read_u32(child, "reg", &phy_id)) {
		dev_err(dev, "missing reg property in node %s\n",
		child->name);
		return -EINVAL;
		ret = -EINVAL;
		goto put_child;
		}

		if (phy_id >= ARRAY_SIZE(phy_berlin_power_down_bits)) {
		dev_err(dev, "invalid reg in node %s\n", child->name);
		return -EINVAL;
		ret = -EINVAL;
		goto put_child;
		}

		phy_desc = devm_kzalloc(dev, sizeof(*phy_desc), GFP_KERNEL);
		if (!phy_desc)
		return -ENOMEM;
		if (!phy_desc) {
		ret = -ENOMEM;
		goto put_child;
		}

		phy = devm_phy_create(dev, NULL, &phy_berlin_sata_ops);
		if (IS_ERR(phy)) {
		dev_err(dev, "failed to create PHY %d\n", phy_id);
		return PTR_ERR(phy);
		ret = PTR_ERR(phy);
		goto put_child;
		}

		phy_desc->phy = phy;
		@@ -269,6 +274,9 @@ static int phy_berlin_sata_probe(struct platform_device *pdev)
		phy_provider =
		devm_of_phy_provider_register(dev, phy_berlin_sata_phy_xlate);
		return PTR_ERR_OR_ZERO(phy_provider);
		put_child:
		of_node_put(child);
		return ret;
		}

		static const struct of_device_id phy_berlin_sata_of_match[] = {

+12 −5

Original line number	Diff line number	Diff line
		@@ -140,7 +140,7 @@ static int brcm_sata_phy_probe(struct platform_device *pdev)
		struct brcm_sata_phy *priv;
		struct resource *res;
		struct phy_provider *provider;
		int count = 0;
		int ret, count = 0;

		if (of_get_child_count(dn) == 0)
		return -ENODEV;
		@@ -163,16 +163,19 @@ static int brcm_sata_phy_probe(struct platform_device *pdev)
		if (of_property_read_u32(child, "reg", &id)) {
		dev_err(dev, "missing reg property in node %s\n",
		child->name);
		return -EINVAL;
		ret = -EINVAL;
		goto put_child;
		}

		if (id >= MAX_PORTS) {
		dev_err(dev, "invalid reg: %u\n", id);
		return -EINVAL;
		ret = -EINVAL;
		goto put_child;
		}
		if (priv->phys[id].phy) {
		dev_err(dev, "already registered port %u\n", id);
		return -EINVAL;
		ret = -EINVAL;
		goto put_child;
		}

		port = &priv->phys[id];
		@@ -182,7 +185,8 @@ static int brcm_sata_phy_probe(struct platform_device *pdev)
		port->ssc_en = of_property_read_bool(child, "brcm,enable-ssc");
		if (IS_ERR(port->phy)) {
		dev_err(dev, "failed to create PHY\n");
		return PTR_ERR(port->phy);
		ret = PTR_ERR(port->phy);
		goto put_child;
		}

		phy_set_drvdata(port->phy, port);
		@@ -198,6 +202,9 @@ static int brcm_sata_phy_probe(struct platform_device *pdev)
		dev_info(dev, "registered %d port(s)\n", count);

		return 0;
		put_child:
		of_node_put(child);
		return ret;
		}

		static struct platform_driver brcm_sata_phy_driver = {

+15 −6

Original line number	Diff line number	Diff line
		@@ -636,8 +636,9 @@ EXPORT_SYMBOL_GPL(devm_of_phy_get);
		* @np: node containing the phy
		* @index: index of the phy
		*
		* Gets the phy using _of_phy_get(), and associates a device with it using
		* devres. On driver detach, release function is invoked on the devres data,
		* Gets the phy using _of_phy_get(), then gets a refcount to it,
		* and associates a device with it using devres. On driver detach,
		* release function is invoked on the devres data,
		* then, devres data is freed.
		*
		*/
		@@ -651,13 +652,21 @@ struct phy devm_of_phy_get_by_index(struct device dev, struct device_node *np,
		return ERR_PTR(-ENOMEM);

		phy = _of_phy_get(np, index);
		if (!IS_ERR(phy)) {
		*ptr = phy;
		devres_add(dev, ptr);
		} else {
		if (IS_ERR(phy)) {
		devres_free(ptr);
		return phy;
		}

		if (!try_module_get(phy->ops->owner)) {
		devres_free(ptr);
		return ERR_PTR(-EPROBE_DEFER);
		}

		get_device(&phy->dev);

		*ptr = phy;
		devres_add(dev, ptr);

		return phy;
		}
		EXPORT_SYMBOL_GPL(devm_of_phy_get_by_index);