Re: [PATCH 9/9] ASoC: codecs: lpass-wsa-macro: add support for SM8550

[Srinivas Kandagatla <srinivas.kandagatla@linaro.org>]

On 10/03/2023 13:22, Krzysztof Kozlowski wrote:
> Add support for the WSA 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-wsa-macro.c | 38 +++++++++++++++++++++++-------
>   1 file changed, 30 insertions(+), 8 deletions(-)
> 
> diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c
> index ba7480f3831e..5155362de111 100644
> --- a/sound/soc/codecs/lpass-wsa-macro.c
> +++ b/sound/soc/codecs/lpass-wsa-macro.c
> @@ -246,6 +246,9 @@
>   #define WSA_MACRO_EC_MIX_TX1_MASK 0x18
>   #define WSA_MACRO_MAX_DMA_CH_PER_PORT 0x2
>   
> +/* NPL clock is expected */
> +#define WSA_MACRO_FLAG_HAS_NPL_CLOCK		BIT(0)
> +


Same nit as 3/9

Once done,

Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>

--srini

>   enum {
>   	WSA_MACRO_GAIN_OFFSET_M1P5_DB,
>   	WSA_MACRO_GAIN_OFFSET_0_DB,
> @@ -2346,7 +2349,10 @@ static int wsa_macro_register_mclk_output(struct wsa_macro *wsa)
>   	struct clk_init_data init;
>   	int ret;
>   
> -	parent_clk_name = __clk_get_name(wsa->npl);
> +	if (wsa->npl)
> +		parent_clk_name = __clk_get_name(wsa->npl);
> +	else
> +		parent_clk_name = __clk_get_name(wsa->mclk);
>   
>   	init.name = "mclk";
>   	of_property_read_string(dev_of_node(dev), "clock-output-names",
> @@ -2379,9 +2385,12 @@ static int wsa_macro_probe(struct platform_device *pdev)
>   {
>   	struct device *dev = &pdev->dev;
>   	struct wsa_macro *wsa;
> +	kernel_ulong_t flags;
>   	void __iomem *base;
>   	int ret;
>   
> +	flags = (kernel_ulong_t)device_get_match_data(dev);
> +
>   	wsa = devm_kzalloc(dev, sizeof(*wsa), GFP_KERNEL);
>   	if (!wsa)
>   		return -ENOMEM;
> @@ -2398,9 +2407,11 @@ static int wsa_macro_probe(struct platform_device *pdev)
>   	if (IS_ERR(wsa->mclk))
>   		return PTR_ERR(wsa->mclk);
>   
> -	wsa->npl = devm_clk_get(dev, "npl");
> -	if (IS_ERR(wsa->npl))
> -		return PTR_ERR(wsa->npl);
> +	if (flags & WSA_MACRO_FLAG_HAS_NPL_CLOCK) {
> +		wsa->npl = devm_clk_get(dev, "npl");
> +		if (IS_ERR(wsa->npl))
> +			return PTR_ERR(wsa->npl);
> +	}
>   
>   	wsa->fsgen = devm_clk_get(dev, "fsgen");
>   	if (IS_ERR(wsa->fsgen))
> @@ -2553,10 +2564,21 @@ static const struct dev_pm_ops wsa_macro_pm_ops = {
>   };
>   
>   static const struct of_device_id wsa_macro_dt_match[] = {
> -	{.compatible = "qcom,sc7280-lpass-wsa-macro"},
> -	{.compatible = "qcom,sm8250-lpass-wsa-macro"},
> -	{.compatible = "qcom,sm8450-lpass-wsa-macro"},
> -	{.compatible = "qcom,sc8280xp-lpass-wsa-macro" },
> +	{
> +		.compatible = "qcom,sc7280-lpass-wsa-macro",
> +		.data = (void *)WSA_MACRO_FLAG_HAS_NPL_CLOCK,
> +	}, {
> +		.compatible = "qcom,sm8250-lpass-wsa-macro",
> +		.data = (void *)WSA_MACRO_FLAG_HAS_NPL_CLOCK,
> +	}, {
> +		.compatible = "qcom,sm8450-lpass-wsa-macro",
> +		.data = (void *)WSA_MACRO_FLAG_HAS_NPL_CLOCK,
> +	}, {
> +		.compatible = "qcom,sm8550-lpass-wsa-macro",
> +	}, {
> +		.compatible = "qcom,sc8280xp-lpass-wsa-macro",
> +		.data = (void *)WSA_MACRO_FLAG_HAS_NPL_CLOCK,
> +	},
>   	{}
>   };
>   MODULE_DEVICE_TABLE(of, wsa_macro_dt_match);