From e918936480c555e33c411da64c137354d2c14eaa Mon Sep 17 00:00:00 2001 From: Dmitry Baryshkov Date: Mon, 29 May 2023 11:26:49 +0300 Subject: [PATCH 07/12] icc: qcom: populate child device nodes In some cases, the ICC node is split into the main device entry and several child devices. Allow using this configuration. Signed-off-by: Dmitry Baryshkov --- kernel/drivers/interconnect/qcom/icc-rpm.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/kernel/drivers/interconnect/qcom/icc-rpm.c b/kernel/drivers/interconnect/qcom/icc-rpm.c index 4469fb7902e1..c211b82af3f5 100644 --- a/kernel/drivers/interconnect/qcom/icc-rpm.c +++ b/kernel/drivers/interconnect/qcom/icc-rpm.c @@ -356,8 +356,13 @@ int qnoc_probe(struct platform_device *pdev) void __iomem *mmio; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) + if (!res) { + /* Try parent's regmap */ + qp->regmap = dev_get_regmap(dev->parent, NULL); + if (qp->regmap) + goto regmap_done; return -ENODEV; + } mmio = devm_ioremap_resource(dev, res); @@ -373,6 +378,7 @@ int qnoc_probe(struct platform_device *pdev) } } +regmap_done: ret = devm_clk_bulk_get_optional(dev, qp->num_clks, qp->bus_clks); if (ret) return ret; @@ -424,6 +430,10 @@ int qnoc_probe(struct platform_device *pdev) platform_set_drvdata(pdev, qp); + /* Populate child NoC devices if any */ + if (of_get_child_count(dev->of_node) > 0) + return of_platform_populate(dev->of_node, NULL, NULL, dev); + return 0; err: icc_nodes_remove(provider); -- 2.39.2