[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <492bc15c-a59c-92f5-3d57-d6bfcf03c4ce@linaro.org>
Date: Sat, 11 Mar 2023 11:24:41 +0000
From: Srinivas Kandagatla <srinivas.kandagatla@...aro.org>
To: Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>,
Andy Gross <agross@...nel.org>,
Bjorn Andersson <andersson@...nel.org>,
Konrad Dybcio <konrad.dybcio@...aro.org>,
Banajit Goswami <bgoswami@...cinc.com>,
Liam Girdwood <lgirdwood@...il.com>,
Mark Brown <broonie@...nel.org>,
Rob Herring <robh+dt@...nel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>,
Jaroslav Kysela <perex@...ex.cz>,
Takashi Iwai <tiwai@...e.com>, linux-arm-msm@...r.kernel.org,
alsa-devel@...a-project.org, devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org
Subject: Re: [PATCH 6/9] ASoC: codecs: lpass-tx-macro: add support for SM8550
On 10/03/2023 13:21, Krzysztof Kozlowski wrote:
> Add support for the TX macro codec on Qualcomm SM8550. SM8550 does not
> use NPL clock, thus add flags allowing to skip it.
>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>
> ---
> sound/soc/codecs/lpass-tx-macro.c | 38 ++++++++++++++++++++++++-------
> 1 file changed, 30 insertions(+), 8 deletions(-)
>
> diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c
> index 473d3cd39554..23371b21505e 100644
> --- a/sound/soc/codecs/lpass-tx-macro.c
> +++ b/sound/soc/codecs/lpass-tx-macro.c
> @@ -205,6 +205,9 @@
> #define TX_MACRO_AMIC_HPF_DELAY_MS 300
> #define MCLK_FREQ 19200000
>
> +/* NPL clock is expected */
> +#define TX_MACRO_FLAG_HAS_NPL_CLOCK BIT(0)
> +
Same nit as 3/9
Once done,
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@...aro.org>
--srini
> enum {
> TX_MACRO_AIF_INVALID = 0,
> TX_MACRO_AIF1_CAP,
> @@ -1915,7 +1918,10 @@ static int tx_macro_register_mclk_output(struct tx_macro *tx)
> struct clk_init_data init;
> int ret;
>
> - parent_clk_name = __clk_get_name(tx->npl);
> + if (tx->npl)
> + parent_clk_name = __clk_get_name(tx->npl);
> + else
> + parent_clk_name = __clk_get_name(tx->mclk);
>
> init.name = clk_name;
> init.ops = &swclk_gate_ops;
> @@ -1946,10 +1952,13 @@ static int tx_macro_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> struct device_node *np = dev->of_node;
> + kernel_ulong_t flags;
> struct tx_macro *tx;
> void __iomem *base;
> int ret, reg;
>
> + flags = (kernel_ulong_t)device_get_match_data(dev);
> +
> tx = devm_kzalloc(dev, sizeof(*tx), GFP_KERNEL);
> if (!tx)
> return -ENOMEM;
> @@ -1966,9 +1975,11 @@ static int tx_macro_probe(struct platform_device *pdev)
> if (IS_ERR(tx->mclk))
> return PTR_ERR(tx->mclk);
>
> - tx->npl = devm_clk_get(dev, "npl");
> - if (IS_ERR(tx->npl))
> - return PTR_ERR(tx->npl);
> + if (flags & TX_MACRO_FLAG_HAS_NPL_CLOCK) {
> + tx->npl = devm_clk_get(dev, "npl");
> + if (IS_ERR(tx->npl))
> + return PTR_ERR(tx->npl);
> + }
>
> tx->fsgen = devm_clk_get(dev, "fsgen");
> if (IS_ERR(tx->fsgen))
> @@ -2145,10 +2156,21 @@ static const struct dev_pm_ops tx_macro_pm_ops = {
> };
>
> static const struct of_device_id tx_macro_dt_match[] = {
> - { .compatible = "qcom,sc7280-lpass-tx-macro" },
> - { .compatible = "qcom,sm8250-lpass-tx-macro" },
> - { .compatible = "qcom,sm8450-lpass-tx-macro" },
> - { .compatible = "qcom,sc8280xp-lpass-tx-macro" },
> + {
> + .compatible = "qcom,sc7280-lpass-tx-macro",
> + .data = (void *)TX_MACRO_FLAG_HAS_NPL_CLOCK,
> + }, {
> + .compatible = "qcom,sm8250-lpass-tx-macro",
> + .data = (void *)TX_MACRO_FLAG_HAS_NPL_CLOCK,
> + }, {
> + .compatible = "qcom,sm8450-lpass-tx-macro",
> + .data = (void *)TX_MACRO_FLAG_HAS_NPL_CLOCK,
> + }, {
> + .compatible = "qcom,sm8550-lpass-tx-macro",
> + }, {
> + .compatible = "qcom,sc8280xp-lpass-tx-macro",
> + .data = (void *)TX_MACRO_FLAG_HAS_NPL_CLOCK,
> + },
> { }
> };
> MODULE_DEVICE_TABLE(of, tx_macro_dt_match);
Powered by blists - more mailing lists