Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: codecs: lpass-tx-macro: Add SM6115 support 

SM6115 has a TX macro, which surprisingly doesn't host a SWR master.
Conditionally skip the SWR reset sequence on this platform.

Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/20230825-topic-6115tx-v1-2-ebed201ad54b@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Konrad Dybcio 2023-08-25 19:23:13 +02:00 committed by Mark Brown
parent 9ff143aaab
commit 510c468842
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/codecs/lpass-macro-common.h
View File

@ -8,6 +8,8 @@
/* NPL clock is expected */ /* NPL clock is expected */
#define LPASS_MACRO_FLAG_HAS_NPL_CLOCK BIT(0) #define LPASS_MACRO_FLAG_HAS_NPL_CLOCK BIT(0)
/* The soundwire block should be internally reset at probe */
#define LPASS_MACRO_FLAG_RESET_SWR BIT(1)
struct lpass_macro { struct lpass_macro {
struct device *macro_pd; struct device *macro_pd;

14
sound/soc/codecs/lpass-tx-macro.c
View File

@ -2045,13 +2045,17 @@ static int tx_macro_probe(struct platform_device *pdev)
if (ret) if (ret)
goto err_fsgen; goto err_fsgen;
/* reset soundwire block */ /* reset soundwire block */
if (flags & LPASS_MACRO_FLAG_RESET_SWR)
regmap_update_bits(tx->regmap, CDC_TX_CLK_RST_CTRL_SWR_CONTROL, regmap_update_bits(tx->regmap, CDC_TX_CLK_RST_CTRL_SWR_CONTROL,
CDC_TX_SWR_RESET_MASK, CDC_TX_SWR_RESET_ENABLE); CDC_TX_SWR_RESET_MASK, CDC_TX_SWR_RESET_ENABLE);
regmap_update_bits(tx->regmap, CDC_TX_CLK_RST_CTRL_SWR_CONTROL, regmap_update_bits(tx->regmap, CDC_TX_CLK_RST_CTRL_SWR_CONTROL,
CDC_TX_SWR_CLK_EN_MASK, CDC_TX_SWR_CLK_EN_MASK,
CDC_TX_SWR_CLK_ENABLE); CDC_TX_SWR_CLK_ENABLE);
if (flags & LPASS_MACRO_FLAG_RESET_SWR)
regmap_update_bits(tx->regmap, CDC_TX_CLK_RST_CTRL_SWR_CONTROL, regmap_update_bits(tx->regmap, CDC_TX_CLK_RST_CTRL_SWR_CONTROL,
CDC_TX_SWR_RESET_MASK, 0x0); CDC_TX_SWR_RESET_MASK, 0x0);
@ -2158,18 +2162,22 @@ static const struct dev_pm_ops tx_macro_pm_ops = {
static const struct of_device_id tx_macro_dt_match[] = { static const struct of_device_id tx_macro_dt_match[] = {
{ {
.compatible = "qcom,sc7280-lpass-tx-macro", .compatible = "qcom,sc7280-lpass-tx-macro",
.data = (void *)(LPASS_MACRO_FLAG_HAS_NPL_CLOCK | LPASS_MACRO_FLAG_RESET_SWR),
}, {
.compatible = "qcom,sm6115-lpass-tx-macro",
.data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK, .data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK,
}, { }, {
.compatible = "qcom,sm8250-lpass-tx-macro", .compatible = "qcom,sm8250-lpass-tx-macro",
.data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK, .data = (void *)(LPASS_MACRO_FLAG_HAS_NPL_CLOCK | LPASS_MACRO_FLAG_RESET_SWR),
}, { }, {
.compatible = "qcom,sm8450-lpass-tx-macro", .compatible = "qcom,sm8450-lpass-tx-macro",
.data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK, .data = (void *)(LPASS_MACRO_FLAG_HAS_NPL_CLOCK | LPASS_MACRO_FLAG_RESET_SWR),
}, { }, {
.compatible = "qcom,sm8550-lpass-tx-macro", .compatible = "qcom,sm8550-lpass-tx-macro",
.data = (void *)LPASS_MACRO_FLAG_RESET_SWR,
}, { }, {
.compatible = "qcom,sc8280xp-lpass-tx-macro", .compatible = "qcom,sc8280xp-lpass-tx-macro",
.data = (void *)LPASS_MACRO_FLAG_HAS_NPL_CLOCK, .data = (void *)(LPASS_MACRO_FLAG_HAS_NPL_CLOCK | LPASS_MACRO_FLAG_RESET_SWR),
}, },
{ } { }
}; };