Commit 5eb63e9b authored by Johan Hovold's avatar Johan Hovold Committed by Kevin Hilman
Browse files

bus: omap-ocp2scp: fix OF populate on driver rebind 



Since commit c6e126de ("of: Keep track of populated platform
devices") child devices will not be created by of_platform_populate()
if the devices had previously been deregistered individually so that the
OF_POPULATED flag is still set in the corresponding OF nodes.

Switch to using of_platform_depopulate() instead of open coding so that
the child devices are created if the driver is rebound.

Fixes: c6e126de ("of: Keep track of populated platform devices")
Cc: stable@vger.kernel.org      # 3.16
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://patch.msgid.link/20251219110119.23507-1-johan@kernel.org


Signed-off-by: default avatarKevin Hilman <khilman@baylibre.com>
parent 8f0b4cce

drivers/bus/omap-ocp2scp.c

+2 −11
Original line number Diff line number Diff line
@@ -17,15 +17,6 @@ 
#define OCP2SCP_TIMING 0x18

#define SYNC2_MASK 0xf



static int ocp2scp_remove_devices(struct device *dev, void *c)

{

	struct platform_device *pdev = to_platform_device(dev);



	platform_device_unregister(pdev);



	return 0;

}



static int omap_ocp2scp_probe(struct platform_device *pdev)

{

	int ret;
@@ -79,7 +70,7 @@ static int omap_ocp2scp_probe(struct platform_device *pdev) 
	pm_runtime_disable(&pdev->dev);



err0:

	device_for_each_child(&pdev->dev, NULL, ocp2scp_remove_devices);

	of_platform_depopulate(&pdev->dev);



	return ret;

}
@@ -87,7 +78,7 @@ static int omap_ocp2scp_probe(struct platform_device *pdev) 
static void omap_ocp2scp_remove(struct platform_device *pdev)

{

	pm_runtime_disable(&pdev->dev);

	device_for_each_child(&pdev->dev, NULL, ocp2scp_remove_devices);

	of_platform_depopulate(&pdev->dev);

}



#ifdef CONFIG_OF