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 05EBC277C9D; Sun, 1 Mar 2026 01:42:01 +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=1772329321; cv=none; b=f84oKdNPE1vw2Lem40wUvhJhhv2Knvd4tW8S97XyAaHrHSHVYBGBgYnQPw2kpK+BDtrZkU8BeJfEwffwPyhybMpPL7mK+ykuP9V8CGSojd8UXgH7IvtgR4UH7uqGFdXNFOadpjkAogDYAO43lDNqDljb4jocbbH0I9uMIAdSGso= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772329321; c=relaxed/simple; bh=r1RmxaTR2AFL9E8wMyerx+FjWiT/mCdxa46n6zel9EE=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=TnczV+vYvmhLRh+QthXPgXBLvx43GvewImrrBgbm/m0J5y+qtigVactHLOeOE65zkQ/3/OkoJgHHIsdqWF5VebiqZ0tsUXt/akGKiXIMMNKnTrEm8wqnJh16rPmkh/PjQxfeIIqi5m17kgk57CK3wo1zzGSrzDmyHnKEOYvZ8wM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=E4/8fDLw; 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="E4/8fDLw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 600DCC19421; Sun, 1 Mar 2026 01:42:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1772329320; bh=r1RmxaTR2AFL9E8wMyerx+FjWiT/mCdxa46n6zel9EE=; h=From:To:Cc:Subject:Date:From; b=E4/8fDLw0DtRF2vTqQkcvC4X1l72O32Kgc/TUtsoYbsZaQhyBYCazM4diDRgwX6rS aI6WpNYYgiuKS7VpgBUxYIZPp0CTJ1z4lBiYPwuVZS/hMc3UJWvWzCbrvOE2dnbAo3 eta8LuN7ilF0Lc+kceB/hC3sdm0/VkG7SBnNbzzjYNEOX1No3ZVGhX71f98WOPj5J4 TvsZuPevGTor0Js+rKhYUlAHCpqU8DaBbE77cyHqeexvqNG29fC3RsO/4cISKX9+Pa PoKoUGAAJKKgq5tgb4JuAQa9XZ0G4wChpflU+6hMKgbVb6MAyVFXCCZg3m8+MtStUT jvndjrpUgLHMw== From: Sasha Levin To: stable@vger.kernel.org, johan@kernel.org Cc: Kevin Hilman , linux-omap@vger.kernel.org Subject: FAILED: Patch "bus: omap-ocp2scp: fix OF populate on driver rebind" failed to apply to 6.1-stable tree Date: Sat, 28 Feb 2026 20:41:58 -0500 Message-ID: <20260301014159.1703747-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Hint: ignore X-stable: review Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 5eb63e9bb65d88abde647ced50fe6ad40c11de1a Mon Sep 17 00:00:00 2001 From: Johan Hovold Date: Fri, 19 Dec 2025 12:01:19 +0100 Subject: [PATCH] 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: 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 --- 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