Skip to contentSkip to conversation

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

PATCH Applied Johan Hovold 3 participants 3 messages Dec 19, 2025 – Jan 14

Subsystems (2)
Stable branch OMAP2+ support
lore
Share & tools
lore

Johan Hovold

author
#0 lore raw

PATCH 1/1 bus: omap-ocp2scp: fix OF populate on driver rebind

Since commit c6e126de43e7 ("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 c6e126de43e7 ("of: Keep track of populated platform devices")
Cc [email protected] # 3.16
Signed-off-by Johan Hovold <[email protected]>
---
 drivers/bus/omap-ocp2scp.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)
drivers/bus/omap-ocp2scp.c +2 -11
index e4dfda7b3b10..eee5ad191ea9 100644
@@ -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
Signature · 1 line
2.51.2
maintainer
#1 lore raw
Quoted 11 lines · On Fri, 19 Dec 2025 12:01:19 +0100 Johan Hovold <[email protected]> wrote:

Since commit c6e126de43e7 ("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 c6e126de43e7 ("of: Keep track of populated platform devices")
Cc [email protected] # 3.16
Signed-off-by Johan Hovold <[email protected]>

Reviewed-by Andreas Kemnade <[email protected]>

maintainer Applied
#2 lore raw
In reply to Johan Hovold
Quoted 9 lines · Johan Hovold

Since commit c6e126de43e7 ("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.

[...]

Applied, thanks!

[1/1] bus: omap-ocp2scp: fix OF populate on driver rebind

      commit: 5eb63e9bb65d88abde647ced50fe6ad40c11de1a

Best regards,

Signature · 1 line
Kevin Hilman <[email protected]>