ASoC: codecs: lpass-rx-macro: add support for SM8550

Add support for the RX 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@linaro.org>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20230327132254.147975-4-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/codecs/lpass-macro-common.h b/sound/soc/codecs/lpass-macro-common.h
index f2cbf9fe2c6ef96c759771ba2c6bd6ded71effb1..4eb886565ea3677634f9978df976ee712da10356 100644 (file)
--- a/sound/soc/codecs/lpass-macro-common.h
+++ b/sound/soc/codecs/lpass-macro-common.h
@@ -6,6 +6,9 @@
 #ifndef __LPASS_MACRO_COMMON_H__
 #define __LPASS_MACRO_COMMON_H__
 
+/* NPL clock is expected */
+#define LPASS_MACRO_FLAG_HAS_NPL_CLOCK         BIT(0)
+
 struct lpass_macro {
        struct device *macro_pd;
        struct device *dcodec_pd;

diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c
index 9e0a4e8a46c3aaa299ddf2075b6fd5b282be3be9..532b19b1980db263ae15547cce529aa6a7c6e601 100644 (file)
--- a/sound/soc/codecs/lpass-rx-macro.c
+++ b/sound/soc/codecs/lpass-rx-macro.c
@@ -3491,7 +3491,10 @@ static int rx_macro_register_mclk_output(struct rx_macro *rx)
        struct clk_init_data init;
        int ret;
 
-       parent_clk_name = __clk_get_name(rx->npl);
+       if (rx->npl)
+               parent_clk_name = __clk_get_name(rx->npl);
+       else
+               parent_clk_name = __clk_get_name(rx->mclk);
 
        init.name = clk_name;
        init.ops = &swclk_gate_ops;
@@ -3521,10 +3524,13 @@ static const struct snd_soc_component_driver rx_macro_component_drv = {
 static int rx_macro_probe(struct platform_device *pdev)
 {
        struct device *dev = &pdev->dev;
+       kernel_ulong_t flags;
        struct rx_macro *rx;
        void __iomem *base;
        int ret;
 
+       flags = (kernel_ulong_t)device_get_match_data(dev);
+
        rx = devm_kzalloc(dev, sizeof(*rx), GFP_KERNEL);
        if (!rx)
                return -ENOMEM;
@@ -3541,9 +3547,11 @@ static int rx_macro_probe(struct platform_device *pdev)
        if (IS_ERR(rx->mclk))
                return PTR_ERR(rx->mclk);
 
-       rx->npl = devm_clk_get(dev, "npl");
-       if (IS_ERR(rx->npl))
-               return PTR_ERR(rx->npl);
+       if (flags & LPASS_MACRO_FLAG_HAS_NPL_CLOCK) {
+               rx->npl = devm_clk_get(dev, "npl");
+               if (IS_ERR(rx->npl))
+                       return PTR_ERR(rx->npl);
+       }
 
        rx->fsgen = devm_clk_get(dev, "fsgen");
        if (IS_ERR(rx->fsgen))
@@ -3653,10 +3661,22 @@ static void 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" },
-       { .compatible = "qcom,sm8450-lpass-rx-macro" },
-       { .compatible = "qcom,sc8280xp-lpass-rx-macro" },
+       {
+               .compatible = "qcom,sc7280-lpass-rx-macro",
+               .data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK,
+
+       }, {
+               .compatible = "qcom,sm8250-lpass-rx-macro",
+               .data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK,
+       }, {
+               .compatible = "qcom,sm8450-lpass-rx-macro",
+               .data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK,
+       }, {
+               .compatible = "qcom,sm8550-lpass-rx-macro",
+       }, {
+               .compatible = "qcom,sc8280xp-lpass-rx-macro",
+               .data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK,
+       },
        { }
 };
 MODULE_DEVICE_TABLE(of, rx_macro_dt_match);