1 files changed, 52 insertions, 15 deletions

diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
index 3791838f4bd4..7d535dbb63ee 100644
--- a/drivers/phy/phy-core.c
+++ b/drivers/phy/phy-core.c
@@ -367,13 +367,21 @@ static struct phy *_of_phy_get(struct device_node *np, int index)
         phy_provider = of_phy_provider_lookup(args.np);
         if (IS_ERR(phy_provider) || !try_module_get(phy_provider->owner)) {
                 phy = ERR_PTR(-EPROBE_DEFER);
-                goto err0;
+                goto out_unlock;
+        }
+
+        if (!of_device_is_available(args.np)) {
+                dev_warn(phy_provider->dev, "Requested PHY is disabled\n");
+                phy = ERR_PTR(-ENODEV);
+                goto out_put_module;
         }
 
         phy = phy_provider->of_xlate(phy_provider->dev, &args);
+
+out_put_module:
         module_put(phy_provider->owner);
 
-err0:
+out_unlock:
         mutex_unlock(&phy_provider_mutex);
         of_node_put(args.np);
 
@@ -623,6 +631,38 @@ struct phy *devm_of_phy_get(struct device *dev, struct device_node *np,
 EXPORT_SYMBOL_GPL(devm_of_phy_get);
 
 /**
+ * devm_of_phy_get_by_index() - lookup and obtain a reference to a phy by index.
+ * @dev: device that requests this phy
+ * @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,
+ * then, devres data is freed.
+ *
+ */
+struct phy *devm_of_phy_get_by_index(struct device *dev, struct device_node *np,
+                                     int index)
+{
+        struct phy **ptr, *phy;
+
+        ptr = devres_alloc(devm_phy_release, sizeof(*ptr), GFP_KERNEL);
+        if (!ptr)
+                return ERR_PTR(-ENOMEM);
+
+        phy = _of_phy_get(np, index);
+        if (!IS_ERR(phy)) {
+                *ptr = phy;
+                devres_add(dev, ptr);
+        } else {
+                devres_free(ptr);
+        }
+
+        return phy;
+}
+EXPORT_SYMBOL_GPL(devm_of_phy_get_by_index);
+
+/**
  * phy_create() - create a new phy
  * @dev: device that is creating the new phy
  * @node: device node of the phy
@@ -651,16 +691,6 @@ struct phy *phy_create(struct device *dev, struct device_node *node,
                 goto free_phy;
         }
 
-        /* phy-supply */
-        phy->pwr = regulator_get_optional(dev, "phy");
-        if (IS_ERR(phy->pwr)) {
-                if (PTR_ERR(phy->pwr) == -EPROBE_DEFER) {
-                        ret = -EPROBE_DEFER;
-                        goto free_ida;
-                }
-                phy->pwr = NULL;
-        }
-
         device_initialize(&phy->dev);
         mutex_init(&phy->mutex);
 
@@ -674,6 +704,16 @@ struct phy *phy_create(struct device *dev, struct device_node *node,
         if (ret)
                 goto put_dev;
 
+        /* phy-supply */
+        phy->pwr = regulator_get_optional(&phy->dev, "phy");
+        if (IS_ERR(phy->pwr)) {
+                ret = PTR_ERR(phy->pwr);
+                if (ret == -EPROBE_DEFER)
+                        goto put_dev;
+
+                phy->pwr = NULL;
+        }
+
         ret = device_add(&phy->dev);
         if (ret)
                 goto put_dev;
@@ -689,9 +729,6 @@ put_dev:
         put_device(&phy->dev);  /* calls phy_release() which frees resources */
         return ERR_PTR(ret);
 
-free_ida:
-        ida_simple_remove(&phy_ida, phy->id);
-
 free_phy:
         kfree(phy);
         return ERR_PTR(ret);