Hi Arun,
On Fri, Mar 20, 2015 at 02:25:25PM -0700, Arun Ramamurthy wrote:
> Multi-port phy's may have per-port power supplies. Let's change phy core
> to first attempt to look up the supply at the port level, and then, if
> not found, check parent device.
>
> Reviewed-by: Ray Jui <rjui@xxxxxxxxxxxx>
> Reviewed-by: Scott Branden <sbranden@xxxxxxxxxxxx>
> Signed-off-by: Dmitry Torokhov <dtor@xxxxxxxxxxxx>
> Signed-off-by: Arun Ramamurthy <arun.ramamurthy@xxxxxxxxxxxx>
>
This should have had:
From: Dmitry Torokhov <dtor@xxxxxxxxxxxx>
as first line of the body of e-mail as the patch was authored by me.
Thanks.
---
> drivers/phy/phy-core.c | 30 ++++++++++++++++++++----------
> 1 file changed, 20 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/phy/phy-core.c b/drivers/phy/phy-core.c
> index a12d353..b43bb6b 100644
> --- a/drivers/phy/phy-core.c
> +++ b/drivers/phy/phy-core.c
> @@ -650,16 +650,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);
>
> @@ -673,6 +663,26 @@ struct phy *phy_create(struct device *dev, struct device_node *node,
> if (ret)
> goto put_dev;
>
> + /*
> + * Locate phy-supply. We first try individual port and then,
> + * if supply is not found, try parent device.
> + */
> + phy->pwr = regulator_get_optional(&phy->dev, "phy");
> + if (IS_ERR(phy->pwr)) {
> + ret = PTR_ERR(phy->pwr);
> + if (ret == -EPROBE_DEFER)
> + goto free_ida;
> +
> + phy->pwr = regulator_get_optional(phy->dev.parent, "phy");
> + if (IS_ERR(phy->pwr)) {
> + ret = PTR_ERR(phy->pwr);
> + if (ret == -EPROBE_DEFER)
> + goto free_ida;
> +
> + phy->pwr = NULL;
> + }
> + }
> +
> ret = device_add(&phy->dev);
> if (ret)
> goto put_dev;
> --
> 2.3.2
>
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
