Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 139af3b2 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Greg Kroah-Hartman
Browse files

regulator: max77620: Use device_set_of_node_from_dev() 



commit 6f55c5dd1118b3076d11d9cb17f5c5f4bc3a1162 upstream.

The MAX77620 driver fails to re-probe on deferred probe because driver
core tries to claim resources that are already claimed by the PINCTRL
device. Use device_set_of_node_from_dev() helper which marks OF node as
reused, skipping erroneous execution of pinctrl_bind_pins() for the PMIC
device on the re-probe.

Fixes: aea6cb99703e ("regulator: resolve supply after creating regulator")
Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Link: https://lore.kernel.org/r/20210523224243.13219-2-digetx@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c4e10f92

drivers/regulator/max77620-regulator.c

+7 −0
Original line number Diff line number Diff line
@@ -814,6 +814,13 @@ static int max77620_regulator_probe(struct platform_device *pdev) 
	config.dev = dev;

	config.driver_data = pmic;



	/*

	 * Set of_node_reuse flag to prevent driver core from attempting to

	 * claim any pinmux resources already claimed by the parent device.

	 * Otherwise PMIC driver will fail to re-probe.

	 */

	device_set_of_node_from_dev(&pdev->dev, pdev->dev.parent);



	for (id = 0; id < MAX77620_NUM_REGS; id++) {

		struct regulator_dev *rdev;

		struct regulator_desc *rdesc;