phy: core: Add an exported of_phy_get function
Subsystems (2)
PATCH v2 1/2 phy: core: Add an exported of_phy_get function
From: Kamil Debski <[email protected]>
Previously the of_phy_get function took a struct device * and was declared static. It was impossible to call it from another driver and thus it was impossible to get phy defined for a given node. The old function was renamed to _of_phy_get and was left for internal use. of_phy_get function was added and it was exported. The function enables to get a phy for a given device tree node.
Signed-off-by Kamil Debski <[email protected]>
--- drivers/phy/phy-core.c | 41 ++++++++++++++++++++++++++++++++--------- include/linux/phy/phy.h | 1 + 2 files changed, 33 insertions(+), 9 deletions(-)
drivers/phy/phy-core.c +32 -9
@@ -240,8 +240,8 @@ out:EXPORT_SYMBOL_GPL (phy_power_off);/** -* of_phy_get() - lookup and obtain a reference to a phy by phandle -* @dev: device that requests this phy +* _of_phy_get() - lookup and obtain a reference to a phy by phandle +* @np: device_node for which to get the phy * @index: the index of the phy * * Returns the phy associated with the given phandle value,
@@ -250,20 +250,17 @@ EXPORT_SYMBOL_GPL(phy_power_off);* not yet loaded. This function uses of_xlate call back function provided * while registering the phy_provider to find the phy instance. */ -static struct phy *of_phy_get (struct device *dev,int index) +static struct phy *_of_phy_get (struct device_node *np,int index) {int ret;struct phy_provider *phy_provider;struct phy *phy =NULL ;struct of_phandle_args args; - ret =of_parse_phandle_with_args (dev->of_node,"phys" ,"#phy-cells" , + ret =of_parse_phandle_with_args (np,"phys" ,"#phy-cells" , index, &args); -if (ret) { -dev_dbg (dev,"failed to get phy in %s node\n" , - dev->of_node->full_name); +if (ret)return ERR_PTR (-ENODEV ); - }mutex_lock (&phy_provider_mutex); phy_provider =of_phy_provider_lookup (args.np);
@@ -283,6 +280,32 @@ err0: }/** +* of_phy_get() - lookup and obtain a reference to a phy using a device_node. +* @np: device_node for which to get the phy +* @index: the index of the phy +* +* Returns the phy driver, after getting a refcount to it; or +* -ENODEV if there is no such phy. The caller is responsible for +* calling phy_put() to release that count. +*/ +struct phy *of_phy_get (struct device_node *np,int index) +{ +struct phy *phy =NULL ; + + phy =_of_phy_get (np, index); +if (IS_ERR (phy)) +return phy; + +if (!try_module_get (phy->ops->owner)) +return ERR_PTR (-EPROBE_DEFER ); + +get_device (&phy->dev); + +return phy; +} +EXPORT_SYMBOL_GPL (of_phy_get); + +/** * phy_put() - release the PHY * @phy: the phy returned by phy_get() *
@@ -370,7 +393,7 @@ struct phy *phy_get(struct device *dev, const char *string)if (dev->of_node) { index =of_property_match_string (dev->of_node,"phy-names" , string); - phy =of_phy_get (dev, index); + phy =_of_phy_get (dev->of_node, index);if (IS_ERR (phy)) {dev_err (dev,"unable to find phy\n" );return phy;
include/linux/phy/phy.h +1 -0
@@ -131,6 +131,7 @@ struct phy *phy_get(struct device *dev, const char *string);struct phy *devm_phy_get (struct device *dev,const char *string);void phy_put (struct phy *phy);void devm_phy_put (struct device *dev,struct phy *phy); +struct phy *of_phy_get (struct device_node *np,int index);struct phy *of_phy_simple_xlate (struct device *dev,struct of_phandle_args *args); struct phy *phy_create(struct device *dev, const struct phy_ops *ops,
Signature · 6 lines
1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH v2 2/2 phy: core: Add devm_of_phy_get to phy-core
In reply to a message not in the archiveFrom: Kamil Debski <[email protected]>
Adding devm_of_phy_get will allow to get phys by supplying the device_node instead of by name.
Signed-off-by Kamil Debski <[email protected]>
--- drivers/phy/phy-core.c | 31 +++++++++++++++++++++++++++++++ include/linux/phy/phy.h | 2 ++ 2 files changed, 33 insertions(+)
drivers/phy/phy-core.c +31 -0
@@ -446,6 +446,37 @@ struct phy *devm_phy_get(struct device *dev, const char *string)EXPORT_SYMBOL_GPL (devm_phy_get);/** +* devm_of_phy_get() - lookup and obtain a reference to a phy. +* @dev: device that requests this phy +* @np: node containing the phy +* @index: the index of the phy +* +* Gets the phy using 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 (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); + +/** * phy_create() - create a new phy * @dev: device that is creating the new phy * @ops: function pointers for performing phy operations
include/linux/phy/phy.h +2 -0
@@ -129,6 +129,8 @@ int phy_power_on(struct phy *phy);int phy_power_off (struct phy *phy);struct phy *phy_get (struct device *dev,const char *string);struct phy *devm_phy_get (struct device *dev,const char *string); +struct phy *devm_of_phy_get (struct device *dev,struct device_node *np, +int index);void phy_put (struct phy *phy);void devm_phy_put (struct device *dev,struct phy *phy);struct phy *of_phy_get (struct device_node *np,int index);
Signature · 6 lines
1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html