]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
ASoC: codecs: lpass-tx-macro: add support for SM8550
authorKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Mon, 27 Mar 2023 13:22:50 +0000 (15:22 +0200)
committerMark Brown <broonie@kernel.org>
Wed, 29 Mar 2023 11:31:41 +0000 (12:31 +0100)
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@linaro.org>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20230327132254.147975-7-krzysztof.kozlowski@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/codecs/lpass-tx-macro.c

index b044c9c6f89b3e60dcd724dfa864eaed36c9d709..ae01e464502c294b9a84b0f7b1ca1b1563892635 100644 (file)
@@ -1915,7 +1915,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 +1949,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 +1972,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 & LPASS_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))
@@ -2143,10 +2151,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 *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK,
+       }, {
+               .compatible = "qcom,sm8250-lpass-tx-macro",
+               .data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK,
+       }, {
+               .compatible = "qcom,sm8450-lpass-tx-macro",
+               .data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK,
+       }, {
+               .compatible = "qcom,sm8550-lpass-tx-macro",
+       }, {
+               .compatible = "qcom,sc8280xp-lpass-tx-macro",
+               .data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK,
+       },
        { }
 };
 MODULE_DEVICE_TABLE(of, tx_macro_dt_match);