On Thu, Nov 21, 2024 at 03:42:41PM +0100, Kory Maincent wrote:
> From: Kory Maincent (Dent Project) <kory.maincent@xxxxxxxxxxx>
>
> Previously, the regulator core resolved its supply only from the parent
> device or its children, ignoring the of_node specified in the
> regulator_config structure.
> This behavior causes issues in scenarios where multiple regulator devices
> are registered for components described as children of a controller, each
> with their own specific regulator supply.
>
> For instance, in a PSE controller with multiple PIs (Power Interfaces),
> each PI may have a distinct regulator supply. However, the regulator core
> would incorrectly use the PSE controller node or its first child to look up
> the regulator supply, rather than the node specified by the
> regulator_config->of_node for the PI.
>
> This update modifies the behavior to prioritize the of_node in
> regulator_config for resolving the supply. This ensures correct resolution
> of the power supply for each device. If no supply is found in the provided
> of_node, the core falls back to searching within the parent device as
> before.
>
> Signed-off-by: Kory Maincent <kory.maincent@xxxxxxxxxxx>
> ---
> It is weird that it wasn't seen before, maybe there was not any case
> were it can't find the supply_name from the parent device.
>
> Changes in v3:
> - New patch
> ---
> drivers/regulator/core.c | 42 ++++++++++++++++++++++++++++++------------
> 1 file changed, 30 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
> index 2948a7eca734..b49f751893b9 100644
> --- a/drivers/regulator/core.c
> +++ b/drivers/regulator/core.c
> @@ -1936,6 +1936,20 @@ static struct regulator_dev *regulator_lookup_by_name(const char *name)
> return dev ? dev_to_rdev(dev) : NULL;
> }
>
> +static struct regulator_dev *regulator_dt_lookup(struct device *dev,
> + const char *supply)
> +{
> + struct regulator_dev *r = NULL;
> +
> + if (dev && dev->of_node) {
> + r = of_regulator_dev_lookup(dev, supply);
> + if (PTR_ERR(r) == -ENODEV)
> + r = NULL;
> + }
> +
> + return r;
> +}
...
> static int regulator_resolve_supply(struct regulator_dev *rdev)
> {
> - struct regulator_dev *r;
> struct device *dev = rdev->dev.parent;
> + struct regulator_dev *r = NULL;
> struct ww_acquire_ctx ww_ctx;
> int ret = 0;
>
> @@ -2015,7 +2022,18 @@ static int regulator_resolve_supply(struct regulator_dev *rdev)
> if (rdev->supply)
> return 0;
>
> - r = regulator_dev_lookup(dev, rdev->supply_name);
> + /* first do a dt based lookup on the node described in the virtual
> + * device.
> + */
> + if (rdev->dev.of_node)
regulator_dt_lookup() is already doing dev.of_node check, this one can
be removed.
> + r = regulator_dt_lookup(&rdev->dev, rdev->supply_name);
> +
> + /* If regulator not found use usual search path in the parent
> + * device.
> + */
> + if (!r)
> + r = regulator_dev_lookup(dev, rdev->supply_name);
> +
> if (IS_ERR(r)) {
> ret = PTR_ERR(r);
>
With remove dev.of_node check:
Acked-by: Oleksij Rempel <o.rempel@xxxxxxxxxxxxxx>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
