From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CE1D148C3F4; Sat, 28 Feb 2026 17:42:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300568; cv=none; b=I97eXglwaG0bnv6v998kA/BTb8vjlRpolB+RpssV7LMyVGylCyvkCQIxJ69xqWCGk3KdmBRJNXz8YYhp67dddPcSOqqEVkB93AnVzHjRrGZ8jTR3uwm7UDEKhhae193gbsBJpqTwwX9EJXUTpen5PTassRK9Ujak2Yn5tq5IbBc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772300568; c=relaxed/simple; bh=yvWh03IwtFbL8rT7WKyGQQg09oQ6Fd3KWDBq24Cp3PA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AQOvY4WlECPflm878vtTv1sWytHTaKI34C7FTqx9elvRx1Qq2gUm0DaXplN0/JGJFTDrBPVQSkWUpVDJJWFlAPbQBFdXDuT7kQpzILIkENRWzwElO+xzJAa4c9E4oSQAl0gALIs6AXrICj3eOkJijS6yZMVj3qP1VsuEt5R5lmU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=ZMyB+tO8; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="ZMyB+tO8" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2662FC19424; Sat, 28 Feb 2026 17:42:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772300568; bh=yvWh03IwtFbL8rT7WKyGQQg09oQ6Fd3KWDBq24Cp3PA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZMyB+tO86aTxC+WcJUt0ePioyJ8WD3qvjygnGK55Fxjlll7TIv8Dvtm2YrQagxoPD O77UMBDa1JAK0/lOTpjeLomqyiRRCnDhSyLBjMFI1g2BHTiH5vwiIgAa75B0ZF0PWZ zc9Ui2NQEf4NDgNGzmmHJHBs/Hj+L5FHmYBTnZmQF9+sPTmCdGn5VIiG45Tx623Jna URyWu2NWK7zC+q5+/0/QbutyTeG8AbBS1tqt1VSrR1icbTNYvWl0ATS/kikCk99+u1 gML70EnuWp41IWt2hAUwxqu6w8f0Y3GKnOw9v3OEJPT/t3vNKf9uxF+aViHangZ7Np +taULbPNNNAuw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Johan Hovold , Kevin Hilman , Sasha Levin Subject: [PATCH 6.19 609/844] bus: omap-ocp2scp: fix OF populate on driver rebind Date: Sat, 28 Feb 2026 12:28:42 -0500 Message-ID: <20260228173244.1509663-610-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260228173244.1509663-1-sashal@kernel.org> References: <20260228173244.1509663-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit From: Johan Hovold [ Upstream commit 5eb63e9bb65d88abde647ced50fe6ad40c11de1a ] 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: stable@vger.kernel.org # 3.16 Signed-off-by: Johan Hovold Link: https://patch.msgid.link/20251219110119.23507-1-johan@kernel.org Signed-off-by: Kevin Hilman Signed-off-by: Sasha Levin --- drivers/bus/omap-ocp2scp.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/bus/omap-ocp2scp.c b/drivers/bus/omap-ocp2scp.c index e4dfda7b3b102..eee5ad191ea9c 100644 --- a/drivers/bus/omap-ocp2scp.c +++ b/drivers/bus/omap-ocp2scp.c @@ -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 -- 2.51.0