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 969A42FFFA4; Mon, 13 Apr 2026 16:20:26 +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=1776097226; cv=none; b=uF5IObLUearMyUUIHr35N21gyUA5s/mMRU2+6dL8Y0Wj7aVB2/gRmeqEnnritZzRRIEtrNGceFqSr90yDpuuMa7QPJn16P5kNpFxieFXkEmag/lDwa7LUVsQoto6dMY4iWIQA3hKmdWRhHuslGqqwI3liKmWYvvVUAItv58DKpw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776097226; c=relaxed/simple; bh=g5pEmTwL2Xdq/+Z6C7mWr+SJ8Li0k898Ah7Ujc0AH08=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=k24YUMS3T+yCNSB1KnR2uBr76Tz0cZ/oAjFrVY2B8tCb0+Sj7oaYcWOYGRRePfGiWr6+yLK73n3OZN65P9wjZ0rw190E2omqOIXQGB5PuB4wW2GNzJ/VOHt9M94Tj3pGlZKXQZx5BDlnjPqOtGf5+MEygbzFWy/RexGjnh9uYSE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=YjwUij8u; 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="YjwUij8u" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F327C2BCB0; Mon, 13 Apr 2026 16:20:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1776097226; bh=g5pEmTwL2Xdq/+Z6C7mWr+SJ8Li0k898Ah7Ujc0AH08=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YjwUij8uZcwdtVECs5IjA+t9Tkz5CBvLD0VLHptv3afuaQeBAMmNyb5tJHYR9dHnR NY13RMXO+P2j1OrM3sCh9jHAxZ9bBpGOK2viMOOj4cZ4D+kl2hffOyeFGl6rlVKcbP 8cpW/dWSayAumtQu83Zb07C5roeHa9YVJPYfa8hA= 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 5.15 022/570] bus: omap-ocp2scp: fix OF populate on driver rebind Date: Mon, 13 Apr 2026 17:52:33 +0200 Message-ID: <20260413155831.250500890@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260413155830.386096114@linuxfoundation.org> References: <20260413155830.386096114@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-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