Skip to contentSkip to conversation

ASoC: hisilicon: Clean up hi6210-i2s

PATCH In review [email protected] 2 participants 4 messages Oct 29 – Nov 2

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover ASoC: hisilicon: Clean up hi6210-i2s

From: bui duc phuc <[email protected]>

Hi all,

This series cleans up bit handling and clock cleanup in the HiSilicon I2S driver.

Compile-tested only.

Best regards,
Phuc

bui duc phuc (2):
ASoC: hisilicon: Remove redundant bit clearing
ASoC: hisilicon: Disable clocks in reverse order

 sound/soc/hisilicon/hi6210-i2s.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
Signature · 1 line
2.43.0
#1 lore raw

PATCH 1/2 ASoC: hisilicon: Remove redundant bit clearing

From: bui duc phuc <[email protected]>

The S2_DOUT_RIGHT_SEL and S2_DOUT_TEST_SEL bits are cleared before being set again immediately afterward.

Remove the redundant bit-clearing operations.

---
 sound/soc/hisilicon/hi6210-i2s.c | 4 ----
 1 file changed, 4 deletions(-)
sound/soc/hisilicon/hi6210-i2s.c +0 -4
index 554356f060b0..1c9e235c3a81 100644
@@ -147,10 +147,6 @@ static int hi6210_i2s_startup(struct snd_pcm_substream *substream,
 	val = hi6210_read_reg(i2s, HII2S_MISC_CFG);
 	/* mux 11/12 = APB not i2s */
 	val &= ~HII2S_MISC_CFG__ST_DL_TEST_SEL;
-	/* BT R ch  0 = mixer op of DACR ch */
-	val &= ~HII2S_MISC_CFG__S2_DOUT_RIGHT_SEL;
-	val &= ~HII2S_MISC_CFG__S2_DOUT_TEST_SEL;
-
 	val |= HII2S_MISC_CFG__S2_DOUT_RIGHT_SEL;
 	/* BT L ch = 1 = mux 7 = "mixer output of DACL */
 	val |= HII2S_MISC_CFG__S2_DOUT_TEST_SEL;
Signature · 1 line
2.43.0
#2 lore raw

PATCH 2/2 ASoC: hisilicon: Disable clocks in reverse order

In reply to [email protected]

From: bui duc phuc <[email protected]>

Disable clocks in reverse order in hi6210_i2s_shutdown(), matching the clock cleanup order in hi6210_i2s_startup().

---
 sound/soc/hisilicon/hi6210-i2s.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/hisilicon/hi6210-i2s.c +2 -2
index 1c9e235c3a81..7cede2689ed9 100644
@@ -168,9 +168,9 @@ static void hi6210_i2s_shutdown(struct snd_pcm_substream *substream,
 				struct snd_soc_dai *cpu_dai)
 {
 	struct hi6210_i2s *i2s = dev_get_drvdata(cpu_dai->dev);
-	int n;
+	int n = i2s->clocks;
 
-	for (n = 0; n < i2s->clocks; n++)
+	while (n--)
 		clk_disable_unprepare(i2s->clk[n]);
 
 	regmap_write(i2s->sysctrl, SC_PERIPH_RSTEN1, BIT(5));
Signature · 1 line
2.43.0
maintainer
#3 lore raw
In reply to [email protected]
Quoted 10 lines · On Thu, 29 Oct 2026 15:01:07 +0700, [email protected] wrote:

ASoC: hisilicon: Clean up hi6210-i2s

From: bui duc phuc <[email protected]>

Hi all,

This series cleans up bit handling and clock cleanup in the HiSilicon I2S driver.

[...]

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-7.5

Thanks!

[1/2] ASoC: hisilicon: Remove redundant bit clearing

      https://git.kernel.org/broonie/sound/c/d80fa025854e
[2/2] ASoC: hisilicon: Disable clocks in reverse order
      https://git.kernel.org/broonie/sound/c/08c48bc3c675

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark