From: Ajit Pandey <ajitp@codeaurora.org> To: alsa-devel@alsa-project.org, broonie@kernel.org, devicetree@vger.kernel.org, plai@codeaurora.org, bgoswami@codeaurora.org, srinivas.kandagatla@linaro.org Cc: linux-kernel@vger.kernel.org, tiwai@suse.com, Ajit Pandey <ajitp@codeaurora.org> Subject: [PATCH 04/11] ASoC: qcom: lpass-cpu: Make "ahbix-clk" an optional clock. Date: Sat, 11 Apr 2020 13:32:44 +0530 [thread overview] Message-ID: <1586592171-31644-5-git-send-email-ajitp@codeaurora.org> (raw) In-Reply-To: <1586592171-31644-1-git-send-email-ajitp@codeaurora.org> AHB-I/X bus clocks inside LPASS coreis not a mandatory clocks for newer lpass variants, hence make it an optional one. Signed-off-by: Ajit Pandey <ajitp@codeaurora.org> --- sound/soc/qcom/lpass-cpu.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c index 492f27b..f177932 100644 --- a/sound/soc/qcom/lpass-cpu.c +++ b/sound/soc/qcom/lpass-cpu.c @@ -504,26 +504,31 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) return ret; } - drvdata->ahbix_clk = devm_clk_get(&pdev->dev, "ahbix-clk"); + drvdata->ahbix_clk = devm_clk_get_optional(&pdev->dev, "ahbix-clk"); if (IS_ERR(drvdata->ahbix_clk)) { dev_err(&pdev->dev, "error getting ahbix-clk: %ld\n", PTR_ERR(drvdata->ahbix_clk)); return PTR_ERR(drvdata->ahbix_clk); } - ret = clk_set_rate(drvdata->ahbix_clk, LPASS_AHBIX_CLOCK_FREQUENCY); - if (ret) { - dev_err(&pdev->dev, "error setting rate on ahbix_clk: %d\n", - ret); - return ret; - } - dev_dbg(&pdev->dev, "set ahbix_clk rate to %lu\n", - clk_get_rate(drvdata->ahbix_clk)); + if (drvdata->ahbix_clk != NULL) { + ret = clk_set_rate(drvdata->ahbix_clk, + LPASS_AHBIX_CLOCK_FREQUENCY); + if (ret) { + dev_err(&pdev->dev, + "error setting rate on ahbix_clk: %d\n", ret); + return ret; + } - ret = clk_prepare_enable(drvdata->ahbix_clk); - if (ret) { - dev_err(&pdev->dev, "error enabling ahbix_clk: %d\n", ret); - return ret; + dev_dbg(&pdev->dev, "set ahbix_clk rate to %lu\n", + clk_get_rate(drvdata->ahbix_clk)); + + ret = clk_prepare_enable(drvdata->ahbix_clk); + if (ret) { + dev_err(&pdev->dev, + "error enabling ahbix_clk: %d\n", ret); + return ret; + } } ret = devm_snd_soc_register_component(&pdev->dev, -- 1.9.1
WARNING: multiple messages have this Message-ID (diff)
From: Ajit Pandey <ajitp@codeaurora.org> To: alsa-devel@alsa-project.org, broonie@kernel.org, devicetree@vger.kernel.org, plai@codeaurora.org, bgoswami@codeaurora.org, srinivas.kandagatla@linaro.org Cc: Ajit Pandey <ajitp@codeaurora.org>, linux-kernel@vger.kernel.org, tiwai@suse.com Subject: [PATCH 04/11] ASoC: qcom: lpass-cpu: Make "ahbix-clk" an optional clock. Date: Sat, 11 Apr 2020 13:32:44 +0530 [thread overview] Message-ID: <1586592171-31644-5-git-send-email-ajitp@codeaurora.org> (raw) In-Reply-To: <1586592171-31644-1-git-send-email-ajitp@codeaurora.org> AHB-I/X bus clocks inside LPASS coreis not a mandatory clocks for newer lpass variants, hence make it an optional one. Signed-off-by: Ajit Pandey <ajitp@codeaurora.org> --- sound/soc/qcom/lpass-cpu.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/sound/soc/qcom/lpass-cpu.c b/sound/soc/qcom/lpass-cpu.c index 492f27b..f177932 100644 --- a/sound/soc/qcom/lpass-cpu.c +++ b/sound/soc/qcom/lpass-cpu.c @@ -504,26 +504,31 @@ int asoc_qcom_lpass_cpu_platform_probe(struct platform_device *pdev) return ret; } - drvdata->ahbix_clk = devm_clk_get(&pdev->dev, "ahbix-clk"); + drvdata->ahbix_clk = devm_clk_get_optional(&pdev->dev, "ahbix-clk"); if (IS_ERR(drvdata->ahbix_clk)) { dev_err(&pdev->dev, "error getting ahbix-clk: %ld\n", PTR_ERR(drvdata->ahbix_clk)); return PTR_ERR(drvdata->ahbix_clk); } - ret = clk_set_rate(drvdata->ahbix_clk, LPASS_AHBIX_CLOCK_FREQUENCY); - if (ret) { - dev_err(&pdev->dev, "error setting rate on ahbix_clk: %d\n", - ret); - return ret; - } - dev_dbg(&pdev->dev, "set ahbix_clk rate to %lu\n", - clk_get_rate(drvdata->ahbix_clk)); + if (drvdata->ahbix_clk != NULL) { + ret = clk_set_rate(drvdata->ahbix_clk, + LPASS_AHBIX_CLOCK_FREQUENCY); + if (ret) { + dev_err(&pdev->dev, + "error setting rate on ahbix_clk: %d\n", ret); + return ret; + } - ret = clk_prepare_enable(drvdata->ahbix_clk); - if (ret) { - dev_err(&pdev->dev, "error enabling ahbix_clk: %d\n", ret); - return ret; + dev_dbg(&pdev->dev, "set ahbix_clk rate to %lu\n", + clk_get_rate(drvdata->ahbix_clk)); + + ret = clk_prepare_enable(drvdata->ahbix_clk); + if (ret) { + dev_err(&pdev->dev, + "error enabling ahbix_clk: %d\n", ret); + return ret; + } } ret = devm_snd_soc_register_component(&pdev->dev, -- 1.9.1
next prev parent reply other threads:[~2020-04-11 8:04 UTC|newest] Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-11 8:02 [PATCH 00/11] ASoC: QCOM: Add support for SC7180 lpass variant Ajit Pandey 2020-04-11 8:02 ` Ajit Pandey 2020-04-11 8:02 ` [PATCH 01/11] Documentation: device-tree: sound: Update lpass-cpu driver binding Ajit Pandey 2020-04-11 8:02 ` Ajit Pandey 2020-04-16 7:53 ` Srinivas Kandagatla 2020-04-25 14:05 ` Ajit Pandey 2020-04-11 8:02 ` [PATCH 02/11] ASoC: qcom: lpass: Add struct lpass_dai to store dai clocks pointer Ajit Pandey 2020-04-11 8:02 ` Ajit Pandey 2020-04-16 7:56 ` Srinivas Kandagatla 2020-04-25 14:11 ` Ajit Pandey 2020-04-11 8:02 ` [PATCH 03/11] ASoC: qcom: Add common array to initialize soc based core clocks Ajit Pandey 2020-04-11 8:02 ` Ajit Pandey 2020-04-11 8:02 ` Ajit Pandey [this message] 2020-04-11 8:02 ` [PATCH 04/11] ASoC: qcom: lpass-cpu: Make "ahbix-clk" an optional clock Ajit Pandey 2020-04-16 7:56 ` Srinivas Kandagatla 2020-04-11 8:02 ` [PATCH 05/11] ASoC: qcom: lpass: Add support for newer lpass version Ajit Pandey 2020-04-11 8:02 ` Ajit Pandey 2020-04-16 7:56 ` Srinivas Kandagatla 2020-04-25 14:14 ` Ajit Pandey 2020-04-11 8:02 ` [PATCH 06/11] dt-bindings: sound: Add bindings related to lpass-cpu configuration Ajit Pandey 2020-04-11 8:02 ` Ajit Pandey 2020-04-11 8:02 ` [PATCH 07/11] Documentation: dt-bindings: sound: Add details for new dai properties Ajit Pandey 2020-04-11 8:02 ` Ajit Pandey 2020-04-16 7:56 ` Srinivas Kandagatla 2020-04-16 7:56 ` Srinivas Kandagatla 2020-04-11 8:02 ` [PATCH 08/11] ASoC: qcom : lpass: Add support to configure dai's connection mode Ajit Pandey 2020-04-11 8:02 ` Ajit Pandey 2020-04-11 8:02 ` [PATCH 09/11] device-tree: bindings: sound: lpass-cpu: Add new compatible soc Ajit Pandey 2020-04-11 8:02 ` Ajit Pandey 2020-04-11 8:02 ` [PATCH 10/11] ASoC: qcom: lpass-sc7180: Add platform driver for lpass audio Ajit Pandey 2020-04-11 8:02 ` Ajit Pandey 2020-04-11 8:02 ` [PATCH 11/11] ASoC: qcom: lpass-platform: Replace card->dev with component->dev Ajit Pandey 2020-04-11 8:02 ` Ajit Pandey 2020-04-16 7:56 ` Srinivas Kandagatla
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1586592171-31644-5-git-send-email-ajitp@codeaurora.org \ --to=ajitp@codeaurora.org \ --cc=alsa-devel@alsa-project.org \ --cc=bgoswami@codeaurora.org \ --cc=broonie@kernel.org \ --cc=devicetree@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=plai@codeaurora.org \ --cc=srinivas.kandagatla@linaro.org \ --cc=tiwai@suse.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.