From: Konrad Dybcio Date: Fri, 7 Apr 2023 20:14:49 +0000 (+0200) Subject: interconnect: qcom: rpm: Don't use clk_get_optional for bus clocks anymore X-Git-Tag: v6.5-rc1~77^2~13^2^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1ff7aedcdcdd4fe02201269ab428b09491e5cf6e;p=thirdparty%2Flinux.git interconnect: qcom: rpm: Don't use clk_get_optional for bus clocks anymore Commit dd42ec8ea5b9 ("interconnect: qcom: rpm: Use _optional func for provider clocks") relaxed the requirements around probing bus clocks. This was a decent solution for making sure MSM8996 would still boot with old DTs, but now that there's a proper fix in place that both old and new DTs will be happy about, revert back to the safer variant of the function. Fixes: dd42ec8ea5b9 ("interconnect: qcom: rpm: Use _optional func for provider clocks") Signed-off-by: Konrad Dybcio Link: https://lore.kernel.org/r/20230228-topic-qos-v8-7-ee696a2c15a9@linaro.org Signed-off-by: Georgi Djakov --- diff --git a/drivers/interconnect/qcom/icc-rpm.c b/drivers/interconnect/qcom/icc-rpm.c index bebc7928af247..f4627c4a1bdd0 100644 --- a/drivers/interconnect/qcom/icc-rpm.c +++ b/drivers/interconnect/qcom/icc-rpm.c @@ -481,7 +481,7 @@ int qnoc_probe(struct platform_device *pdev) } regmap_done: - ret = devm_clk_bulk_get_optional(dev, qp->num_bus_clks, qp->bus_clks); + ret = devm_clk_bulk_get(dev, qp->num_bus_clks, qp->bus_clks); if (ret) return ret;