diff options
| author | Mark Brown <broonie@kernel.org> | 2021-10-29 22:00:00 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2021-10-29 22:00:00 +0100 |
| commit | 318a54c0ee4aaa3bfd69fdf505588510c7672c0c (patch) | |
| tree | fcd342658639851179ab88c0eb317e83b586eb71 /sound/soc/codecs/lpass-rx-macro.c | |
| parent | 8e14329645bc7d722e1ec913025b54199fafaee3 (diff) | |
| parent | 6195eb15f6d60dd92d1644dc11f1c1c2e84ebfeb (diff) | |
Merge remote-tracking branch 'asoc/for-5.16' into asoc-next
Diffstat (limited to 'sound/soc/codecs/lpass-rx-macro.c')
| -rw-r--r-- | sound/soc/codecs/lpass-rx-macro.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c index 196b06898eeb..2bed5cf229be 100644 --- a/sound/soc/codecs/lpass-rx-macro.c +++ b/sound/soc/codecs/lpass-rx-macro.c @@ -3531,7 +3531,7 @@ static int rx_macro_probe(struct platform_device *pdev) rx->clks[3].id = "npl"; rx->clks[4].id = "fsgen"; - ret = devm_clk_bulk_get(dev, RX_NUM_CLKS_MAX, rx->clks); + ret = devm_clk_bulk_get_optional(dev, RX_NUM_CLKS_MAX, rx->clks); if (ret) { dev_err(dev, "Error getting RX Clocks (%d)\n", ret); return ret; @@ -3577,6 +3577,7 @@ static int rx_macro_remove(struct platform_device *pdev) } static const struct of_device_id rx_macro_dt_match[] = { + { .compatible = "qcom,sc7280-lpass-rx-macro" }, { .compatible = "qcom,sm8250-lpass-rx-macro" }, { } }; |