Unverified Commit 492fe974 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski Committed by Mark Brown
Browse files

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: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Reviewed-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20230313075445.17160-3-krzysztof.kozlowski@linaro.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0fc109f8

sound/soc/codecs/lpass-macro-common.h

+3 −0
Original line number Diff line number Diff line
@@ -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;

sound/soc/codecs/lpass-rx-macro.c

+28 −8
Original line number Diff line number Diff line
@@ -3491,7 +3491,10 @@ static int rx_macro_register_mclk_output(struct rx_macro *rx) 
	struct clk_init_data init;

	int ret;



	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);



	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);