Patch "remoteproc: mtk_scp: Only populate devices for SCP cores" has been added to the 6.13-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    remoteproc: mtk_scp: Only populate devices for SCP cores

to the 6.13-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     remoteproc-mtk_scp-only-populate-devices-for-scp-cor.patch
and it can be found in the queue-6.13 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit 3e65153366e89692cacab5887694808095c79775
Author: Chen-Yu Tsai <wenst@xxxxxxxxxxxx>
Date:   Wed Dec 11 15:20:07 2024 +0800

    remoteproc: mtk_scp: Only populate devices for SCP cores
    
    [ Upstream commit dbb9c372555c0b2a5a9264418bfba6d017752808 ]
    
    When multi-core SCP support was added, the driver was made to populate
    platform devices for all the sub-nodes. This ended up adding platform
    devices for the rpmsg sub-nodes as well, which never actually get used,
    since rpmsg devices are registered through the rpmsg interface.
    
    Limit of_platform_populate() to just populating the SCP cores with a
    compatible string match list.
    
    Fixes: 1fdbf0cdde98 ("remoteproc: mediatek: Probe SCP cluster on multi-core SCP")
    Cc: Tinghan Shen <tinghan.shen@xxxxxxxxxxxx>
    Signed-off-by: Chen-Yu Tsai <wenst@xxxxxxxxxxxx>
    Link: https://lore.kernel.org/r/20241211072009.120511-1-wenst@xxxxxxxxxxxx
    Signed-off-by: Mathieu Poirier <mathieu.poirier@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/remoteproc/mtk_scp.c b/drivers/remoteproc/mtk_scp.c
index 0f4a7065d0bd9..8206a17664818 100644
--- a/drivers/remoteproc/mtk_scp.c
+++ b/drivers/remoteproc/mtk_scp.c
@@ -1326,6 +1326,11 @@ static int scp_cluster_init(struct platform_device *pdev, struct mtk_scp_of_clus
 	return ret;
 }
 
+static const struct of_device_id scp_core_match[] = {
+	{ .compatible = "mediatek,scp-core" },
+	{}
+};
+
 static int scp_probe(struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
@@ -1357,13 +1362,15 @@ static int scp_probe(struct platform_device *pdev)
 	INIT_LIST_HEAD(&scp_cluster->mtk_scp_list);
 	mutex_init(&scp_cluster->cluster_lock);
 
-	ret = devm_of_platform_populate(dev);
+	ret = of_platform_populate(dev_of_node(dev), scp_core_match, NULL, dev);
 	if (ret)
 		return dev_err_probe(dev, ret, "Failed to populate platform devices\n");
 
 	ret = scp_cluster_init(pdev, scp_cluster);
-	if (ret)
+	if (ret) {
+		of_platform_depopulate(dev);
 		return ret;
+	}
 
 	return 0;
 }
@@ -1379,6 +1386,7 @@ static void scp_remove(struct platform_device *pdev)
 		rproc_del(scp->rproc);
 		scp_free(scp);
 	}
+	of_platform_depopulate(&pdev->dev);
 	mutex_destroy(&scp_cluster->cluster_lock);
 }