[PATCH v2 0/2] This series resends the self-contained ASoC changes from the earlier Hawi/Maili LPASS audio submission.

[PATCH v2 0/2] This series resends the self-contained ASoC changes from the earlier Hawi/Maili LPASS audio submission.

[Prasad Kumpatla]

Hi,

The original v1 series included bindings, devicetree and defconfig changes
which either depend on other LPASS macro/platform updates or need to be
handled with the corresponding platform enablement. Keep this revision scoped
to the two ASoC changes which are independent and can be reviewed/applied
separately.

The October 6 subset was incorrectly posted as v1. This v2 supersedes that
posting and keeps the revision history tied to the original September 23 v1
series.

Previous submissions:
v1:
  https://lore.kernel.org/all/20260923084627.748920-1-prasad.kumpatla@oss.qualcomm.com/
incorrectly-numbered subset:
  https://lore.kernel.org/all/20261006053717.3455143-1-prasad.kumpatla@oss.qualcomm.com/

---
Changes in v2:
- Correct the revision number. These patches were previously posted as part
  of the September 23 v1 Hawi/Maili audio series; the October 6 subset was
  incorrectly labelled v1.
- Drop the Maili LPASS macro binding and Hawi/Maili DTS patches from this
  series because they depend on other platform/audio changes still being
  reviewed.
- Drop the arm64 defconfig patch from this series. That patch belongs with
  the Hawi/Maili platform enablement and needs a separate rationale if it is
  reposted.
- Keep only the two independent ASoC patches.

Prasad Kumpatla (2):
  ASoC: codecs: wsa885x: Reset registers on teardown for B2B playback
  ASoC: qcom: sc8280xp: add Maili sound card configuration

 sound/soc/codecs/wsa885x.c | 11 ++++++++++-
 sound/soc/qcom/sc8280xp.c  | 11 ++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

-- 
2.34.1

[PATCH v2 1/2] ASoC: codecs: wsa885x: Reset registers on teardown for B2B playback

[Prasad Kumpatla]

During back-to-back speaker playback the PA sometimes fails to enable
because a few I2S/TDM and clock source registers retain their previous
state and are not reprogrammed on the next stream.

Reset the relevant I2S/TDM, clock source and bandgap override registers
in hw_free() so the codec is torn down cleanly and the speaker amplifier
comes up reliably on back-to-back use cases. Move the bandgap override
reset out of set_sysclk() into the teardown path where it belongs.

Signed-off-by: Prasad Kumpatla <prasad.kumpatla@oss.qualcomm.com>
---
 sound/soc/codecs/wsa885x.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/sound/soc/codecs/wsa885x.c b/sound/soc/codecs/wsa885x.c
index 1faa8541a872..5ffbf9e89fd9 100644
--- a/sound/soc/codecs/wsa885x.c
+++ b/sound/soc/codecs/wsa885x.c
@@ -896,7 +896,6 @@ static int wsa885x_codec_set_sysclk(struct snd_soc_dai *dai, int clk_id,
 
 	regmap_write(wsa885x->regmap, WSA885X_DIG_CTRL0_SYS_CLK_SEL, 0x00);
 	regmap_write(wsa885x->regmap, WSA885X_DIG_CTRL0_POWER_FSM_CTL1, 0x01);
-	regmap_write(wsa885x->regmap, WSA885X_ANA_TOP_BG_TVP_OVRD_CTL, 0x00);
 
 	return 0;
 }
@@ -1006,6 +1005,16 @@ static int wsa885x_codec_hw_free(struct snd_pcm_substream *substream,
 				 struct snd_soc_dai *dai)
 {
 	static const struct reg_sequence regs[] = {
+		{ WSA885X_DIG_CTRL1_I2S_RESET_CTL, 0x00 },
+		{ WSA885X_DIG_CTRL1_I2S_CFG0_TDM_TX, 0x00 },
+		{ WSA885X_DIG_CTRL1_I2S_CFG1_TDM_TX, 0x00 },
+		{ WSA885X_DIG_CTRL1_I2S_TDM_CTL1, 0x05 },
+		{ WSA885X_DIG_CTRL1_I2S_TDM_CTL0, 0x00 },
+		{ WSA885X_DIG_CTRL1_I2S_TDM_CH_TX, 0x00 },
+		{ WSA885X_DIG_CTRL1_I2S_CTL0, 0x06 },
+		{ WSA885X_DIG_CTRL1_I2S_TDM_CH_RX, 0x08 },
+		{ WSA885X_DIG_CTRL0_CLK_SOURCE_ENABLE, 0x00 },
+		{ WSA885X_ANA_TOP_BG_TVP_OVRD_CTL, 0x00 },
 		{ WSA885X_DIG_CTRL0_PA_FSM_CTL, 0x00 },
 	};
 	struct wsa885x_priv *wsa885x;
-- 
2.34.1

[PATCH v2 2/2] ASoC: qcom: sc8280xp: add Maili sound card configuration

[Prasad Kumpatla]

Maili ships its own firmware, so its topology file has to live in a
separate maili/ firmware directory. The topology load path is derived
from the sound card driver_name, so reusing the Hawi data would look
up the topology under hawi/ instead.

Add a dedicated maili_priv_data with driver_name "maili" for the
qcom,maili-sndcard compatible so the topology is loaded from the maili/
directory. It keeps the same DAPM widgets and enables codec sysclk,
MI2S BCLK and WCD jack detection for the Maili audio pipeline.

Reviewed-by: Ajay Kumar Nandam <ajay.nandam@oss.qualcomm.com>
Signed-off-by: Prasad Kumpatla <prasad.kumpatla@oss.qualcomm.com>
---
 sound/soc/qcom/sc8280xp.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/sound/soc/qcom/sc8280xp.c b/sound/soc/qcom/sc8280xp.c
index b5d367486d56..b97cafeb8e78 100644
--- a/sound/soc/qcom/sc8280xp.c
+++ b/sound/soc/qcom/sc8280xp.c
@@ -552,6 +552,15 @@ static const struct qcom_snd_soc_common kaanapali_priv_data = {
 	.wcd_jack = true,
 };
 
+static const struct qcom_snd_soc_common maili_priv_data = {
+	.driver_name = "maili",
+	.dapm_widgets = sc8280xp_dapm_widgets,
+	.num_dapm_widgets = ARRAY_SIZE(sc8280xp_dapm_widgets),
+	.codec_sysclk_set = true,
+	.mi2s_bclk_enable = true,
+	.wcd_jack = true,
+};
+
 static const struct qcom_snd_soc_common qcs9100_priv_data = {
 	.driver_name = "sa8775p",
 	.dapm_widgets = sc8280xp_dapm_widgets,
@@ -676,7 +685,7 @@ static const struct of_device_id snd_sc8280xp_dt_match[] = {
 	{ .compatible = "qcom,eliza-sndcard", .data = &eliza_priv_data },
 	{ .compatible = "qcom,hawi-sndcard", .data = &hawi_priv_data },
 	{ .compatible = "qcom,kaanapali-sndcard", .data = &kaanapali_priv_data },
-	{ .compatible = "qcom,maili-sndcard", .data = &hawi_priv_data },
+	{ .compatible = "qcom,maili-sndcard", .data = &maili_priv_data },
 	{ .compatible = "qcom,qcm6490-idp-sndcard", .data = &qcm6490_priv_data },
 	{ .compatible = "qcom,qcs615-sndcard", .data = &qcs615_priv_data },
 	{ .compatible = "qcom,qcs6490-rb3gen2-sndcard", .data = &qcs6490_priv_data },
-- 
2.34.1

Re: [PATCH v2 0/2] This series resends the self-contained ASoC changes from the earlier Hawi/Maili LPASS audio submission.

[Ajay Kumar Nandam]

On 10/9/2026 4:47 PM, Prasad Kumpatla wrote:
> Hi,
> 
> The original v1 series included bindings, devicetree and defconfig changes
> which either depend on other LPASS macro/platform updates or need to be
> handled with the corresponding platform enablement. Keep this revision scoped
> to the two ASoC changes which are independent and can be reviewed/applied
> separately.
> 
> The October 6 subset was incorrectly posted as v1. This v2 supersedes that
> posting and keeps the revision history tied to the original September 23 v1
> series.

LGTM

Reviewed-by: Ajay Kumar Nandam <ajay.nandam@oss.qualcomm.com>

Tested-by: Ajay Kumar Nandam <ajay.nandam@oss.qualcomm.com>


> 
> Previous submissions:
> v1:
>    https://lore.kernel.org/all/20260923084627.748920-1-prasad.kumpatla@oss.qualcomm.com/
> incorrectly-numbered subset:
>    https://lore.kernel.org/all/20261006053717.3455143-1-prasad.kumpatla@oss.qualcomm.com/
> 
> ---
> Changes in v2:
> - Correct the revision number. These patches were previously posted as part
>    of the September 23 v1 Hawi/Maili audio series; the October 6 subset was
>    incorrectly labelled v1.
> - Drop the Maili LPASS macro binding and Hawi/Maili DTS patches from this
>    series because they depend on other platform/audio changes still being
>    reviewed.
> - Drop the arm64 defconfig patch from this series. That patch belongs with
>    the Hawi/Maili platform enablement and needs a separate rationale if it is
>    reposted.
> - Keep only the two independent ASoC patches.
> 
> Prasad Kumpatla (2):
>    ASoC: codecs: wsa885x: Reset registers on teardown for B2B playback
>    ASoC: qcom: sc8280xp: add Maili sound card configuration
> 
>   sound/soc/codecs/wsa885x.c | 11 ++++++++++-
>   sound/soc/qcom/sc8280xp.c  | 11 ++++++++++-
>   2 files changed, 20 insertions(+), 2 deletions(-)
>