diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2024-04-22 12:00:31 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2024-04-22 12:00:31 -0700 |
| commit | 09188d725d3713f6eac29b1748a8cd67e82c75ab (patch) | |
| tree | 6e152b07fb56989be95ba0a85fc181c4b4a9e01e | |
| parent | 410ed109e97725d82e9e9091a05eda7be64475e1 (diff) | |
| parent | f8981b0d529513a78d30ae659b74269ae40fa2ab (diff) | |
| download | renesas-drivers-09188d725d3713f6eac29b1748a8cd67e82c75ab.tar.gz | |
Merge branch 'clk-fixes' into clk-next
* clk-fixes:
clk: qcom: smd-rpm: Restore msm8976 num_clk
clk: qcom: gdsc: treat optional supplies as optional
| -rw-r--r-- | drivers/clk/qcom/clk-smd-rpm.c | 1 | ||||
| -rw-r--r-- | drivers/clk/qcom/gdsc.c | 11 |
2 files changed, 9 insertions, 3 deletions
diff --git a/drivers/clk/qcom/clk-smd-rpm.c b/drivers/clk/qcom/clk-smd-rpm.c index 8602c02047d048..45c5255bcd11ba 100644 --- a/drivers/clk/qcom/clk-smd-rpm.c +++ b/drivers/clk/qcom/clk-smd-rpm.c @@ -768,6 +768,7 @@ static struct clk_smd_rpm *msm8976_clks[] = { static const struct rpm_smd_clk_desc rpm_clk_msm8976 = { .clks = msm8976_clks, + .num_clks = ARRAY_SIZE(msm8976_clks), .icc_clks = bimc_pcnoc_snoc_smmnoc_icc_clks, .num_icc_clks = ARRAY_SIZE(bimc_pcnoc_snoc_smmnoc_icc_clks), }; diff --git a/drivers/clk/qcom/gdsc.c b/drivers/clk/qcom/gdsc.c index e7a4068b9f3906..df9618ab7eea1f 100644 --- a/drivers/clk/qcom/gdsc.c +++ b/drivers/clk/qcom/gdsc.c @@ -487,9 +487,14 @@ int gdsc_register(struct gdsc_desc *desc, if (!scs[i] || !scs[i]->supply) continue; - scs[i]->rsupply = devm_regulator_get(dev, scs[i]->supply); - if (IS_ERR(scs[i]->rsupply)) - return PTR_ERR(scs[i]->rsupply); + scs[i]->rsupply = devm_regulator_get_optional(dev, scs[i]->supply); + if (IS_ERR(scs[i]->rsupply)) { + ret = PTR_ERR(scs[i]->rsupply); + if (ret != -ENODEV) + return ret; + + scs[i]->rsupply = NULL; + } } data->num_domains = num; |