soundwire: qcom: make reset optional for v1.6 controller
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Wed, 26 Oct 2022 11:02:08 +0000 (12:02 +0100)
committerVinod Koul <vkoul@kernel.org>
Fri, 28 Oct 2022 11:31:27 +0000 (17:01 +0530)
On Some Qualcomm SOCs like sc8280xp which uses v1.6 soundwire controller
reset is not mandatory, so make this an optional one.

Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20221026110210.6575-5-srinivas.kandagatla@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
drivers/soundwire/qcom.c

index 185d75e..49e6d74 100644 (file)
@@ -1321,8 +1321,8 @@ static int qcom_swrm_probe(struct platform_device *pdev)
        }
 
        if (data->sw_clk_gate_required) {
-               ctrl->audio_cgcr = devm_reset_control_get_exclusive(dev, "swr_audio_cgcr");
-               if (IS_ERR_OR_NULL(ctrl->audio_cgcr)) {
+               ctrl->audio_cgcr = devm_reset_control_get_optional_exclusive(dev, "swr_audio_cgcr");
+               if (IS_ERR(ctrl->audio_cgcr)) {
                        dev_err(dev, "Failed to get cgcr reset ctrl required for SW gating\n");
                        ret = PTR_ERR(ctrl->audio_cgcr);
                        goto err_init;