Commit ce046e5d authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

thermal: max77620: fix pinmux conflict on reprobe

Use the new helper for reusing a device-tree node of another device
instead of managing the node references explicitly.

This also makes sure that the new of_node_reuse flag is set if the
device is ever reprobed, something which specifically now avoids driver
core from attempting to claim any pinmux resources already claimed by
the parent device.

Fixes: ec4664b3 ("thermal: max77620: Add thermal driver for reporting junction temp")
Cc: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c592fafb
...@@ -112,12 +112,10 @@ static int max77620_thermal_probe(struct platform_device *pdev) ...@@ -112,12 +112,10 @@ static int max77620_thermal_probe(struct platform_device *pdev)
} }
/* /*
* Drop any current reference to a device-tree node and get a * The reference taken to the parent's node which will be balanced on
* reference to the parent's node which will be balanced on reprobe or * reprobe or on platform-device release.
* on platform-device release.
*/ */
of_node_put(pdev->dev.of_node); device_set_of_node_from_dev(&pdev->dev, pdev->dev.parent);
pdev->dev.of_node = of_node_get(pdev->dev.parent->of_node);
mtherm->tz_device = devm_thermal_zone_of_sensor_register(&pdev->dev, 0, mtherm->tz_device = devm_thermal_zone_of_sensor_register(&pdev->dev, 0,
mtherm, &max77620_thermal_ops); mtherm, &max77620_thermal_ops);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment