[3/9] ASoC: codecs: lpass-rx-macro: add support for SM8550
Commit Message
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>
---
sound/soc/codecs/lpass-rx-macro.c | 39 ++++++++++++++++++++++++-------
1 file changed, 31 insertions(+), 8 deletions(-)
Comments
Thanks Krzysztof for adding this support.
Few minor nits,
On 10/03/2023 13:21, Krzysztof Kozlowski wrote:
> 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>
> ---
> sound/soc/codecs/lpass-rx-macro.c | 39 ++++++++++++++++++++++++-------
> 1 file changed, 31 insertions(+), 8 deletions(-)
>
> diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c
> index a73a7d7a1c0a..e322d918db36 100644
> --- a/sound/soc/codecs/lpass-rx-macro.c
> +++ b/sound/soc/codecs/lpass-rx-macro.c
> @@ -395,6 +395,9 @@
> #define COMP_MAX_COEFF 25
> #define RX_NUM_CLKS_MAX 5
>
> +/* NPL clock is expected */
> +#define RX_MACRO_FLAG_HAS_NPL_CLOCK BIT(0)
We could probably rename it and move it to
sound/soc/codecs/lpass-macro-common.h as this equally applies to all the
codec macros.
Once done,
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> +
> struct comp_coeff_val {
> u8 lsb;
> u8 msb;
> @@ -3491,7 +3494,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 +3527,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 +3550,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 & RX_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))
> @@ -3655,10 +3666,22 @@ static int 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 *)RX_MACRO_FLAG_HAS_NPL_CLOCK,
> +
> + }, {
> + .compatible = "qcom,sm8250-lpass-rx-macro",
> + .data = (void *)RX_MACRO_FLAG_HAS_NPL_CLOCK,
> + }, {
> + .compatible = "qcom,sm8450-lpass-rx-macro",
> + .data = (void *)RX_MACRO_FLAG_HAS_NPL_CLOCK,
> + }, {
> + .compatible = "qcom,sm8550-lpass-rx-macro",
> + }, {
> + .compatible = "qcom,sc8280xp-lpass-rx-macro",
> + .data = (void *)RX_MACRO_FLAG_HAS_NPL_CLOCK,
> + },
> { }
> };
> MODULE_DEVICE_TABLE(of, rx_macro_dt_match);
On 11/03/2023 12:23, Srinivas Kandagatla wrote:
> Thanks Krzysztof for adding this support.
> Few minor nits,
>
> On 10/03/2023 13:21, Krzysztof Kozlowski wrote:
>> 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>
>> ---
>> sound/soc/codecs/lpass-rx-macro.c | 39 ++++++++++++++++++++++++-------
>> 1 file changed, 31 insertions(+), 8 deletions(-)
>>
>> diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c
>> index a73a7d7a1c0a..e322d918db36 100644
>> --- a/sound/soc/codecs/lpass-rx-macro.c
>> +++ b/sound/soc/codecs/lpass-rx-macro.c
>> @@ -395,6 +395,9 @@
>> #define COMP_MAX_COEFF 25
>> #define RX_NUM_CLKS_MAX 5
>>
>> +/* NPL clock is expected */
>> +#define RX_MACRO_FLAG_HAS_NPL_CLOCK BIT(0)
>
> We could probably rename it and move it to
> sound/soc/codecs/lpass-macro-common.h as this equally applies to all the
> codec macros.
>
>
> Once done,
>
> Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Sure, I'll move it there.
Best regards,
Krzysztof
@@ -395,6 +395,9 @@
#define COMP_MAX_COEFF 25
#define RX_NUM_CLKS_MAX 5
+/* NPL clock is expected */
+#define RX_MACRO_FLAG_HAS_NPL_CLOCK BIT(0)
+
struct comp_coeff_val {
u8 lsb;
u8 msb;
@@ -3491,7 +3494,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 +3527,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 +3550,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 & RX_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))
@@ -3655,10 +3666,22 @@ static int 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 *)RX_MACRO_FLAG_HAS_NPL_CLOCK,
+
+ }, {
+ .compatible = "qcom,sm8250-lpass-rx-macro",
+ .data = (void *)RX_MACRO_FLAG_HAS_NPL_CLOCK,
+ }, {
+ .compatible = "qcom,sm8450-lpass-rx-macro",
+ .data = (void *)RX_MACRO_FLAG_HAS_NPL_CLOCK,
+ }, {
+ .compatible = "qcom,sm8550-lpass-rx-macro",
+ }, {
+ .compatible = "qcom,sc8280xp-lpass-rx-macro",
+ .data = (void *)RX_MACRO_FLAG_HAS_NPL_CLOCK,
+ },
{ }
};
MODULE_DEVICE_TABLE(of, rx_macro_dt_match);