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 879333AA516; Mon, 23 Mar 2026 14:53:18 +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=1774277598; cv=none; b=niGiNBz1z0bEtTW5gFvtAEZ8Ee/32AAPgijdYoV7fFWtOu5bau5YyCv9K2P1VoZ53ntP80ZN/K7S2Q4jfBwSZF3o0+pVEMccxp+dfTXjo6KutB828Oer+4KNE25VmVQ3v9avoCpPwrKrKEc4L69RgqcmLQujQKuljUGNUKmRTJk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774277598; c=relaxed/simple; bh=DanlgNqs5xtKR69OBij92v6JycwjZr2LkBs5D8YGhHs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fgm/TSMTf3k6fSaKTQNfQWK5gyVQSqu9qllEu/jIgVg25Kw9kod+wr73B6gIpktwgmNiS7Cc/KFJyHq7PbXlOAksptk9LOd+N1F95+EtQERkMYA/6+o9jREgM7F3Wra82VzghPi4PGjrWt6OzN1p+RA0kDpyz9bi08LkXprUk7A= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=oPfeeLtA; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="oPfeeLtA" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 09ED0C4CEF7; Mon, 23 Mar 2026 14:53:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1774277598; bh=DanlgNqs5xtKR69OBij92v6JycwjZr2LkBs5D8YGhHs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oPfeeLtAGi8DwGIHsQ0ileGd2qc6e/h209EmhRR8oOO48BMAILsniePj73KLz20pD iNn5ktmEl1VN0yMchIh/Z/Gpoo8sa/0gumnI0gwHFbmIzcUqzUO2FU7szjSVCRSHNH Lm46nAruAxLbea3u/nytI0+8GYxHg8Hkvogj/z4w= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Johan Hovold , Kevin Hilman , Sasha Levin Subject: [PATCH 6.6 043/567] bus: omap-ocp2scp: fix OF populate on driver rebind Date: Mon, 23 Mar 2026 14:39:23 +0100 Message-ID: <20260323134534.861710093@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260323134533.749096647@linuxfoundation.org> References: <20260323134533.749096647@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ 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 7d7479ba0a759..87e290a3dc817 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