Merge "interconnect: qcom: shima: Configure QoS during probe"

This commit is contained in:
qctecmdr 2021-02-15 06:09:14 -08:00 • committed by Gerrit - the friendly Code Review server
commit 6092c652b5

View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2020, The Linux Foundation. All rights reserved.
* Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
*
*/
@ -2548,6 +2548,13 @@ static int qnoc_probe(struct platform_device *pdev)
if (qp->num_clks < 0)
return qp->num_clks;
ret = clk_bulk_prepare_enable(qp->num_clks, qp->clks);
if (ret) {
dev_err(&pdev->dev, "failed to enable clocks\n");
return ret;
}
for (i = 0; i < num_nodes; i++) {
size_t j;
@ -2562,6 +2569,11 @@ static int qnoc_probe(struct platform_device *pdev)
goto err;
}
if (qnodes[i]->qosbox) {
qnodes[i]->noc_ops->set_qos(qnodes[i]);
qnodes[i]->qosbox->initialized = true;
}
node->name = qnodes[i]->name;
node->data = qnodes[i];
icc_node_add(node, provider);
@ -2577,6 +2589,8 @@ static int qnoc_probe(struct platform_device *pdev)
}
data->num_nodes = num_nodes;
clk_bulk_disable_unprepare(qp->num_clks, qp->clks);
for (i = 0; i < qp->num_bcms; i++)
qcom_icc_bcm_init(qp->bcms[i], &pdev->dev);