ASoC: max98095: Convert codec->hw_write to snd_soc_write

PATCH Superseded Axel Lin 3 participants 3 messages Oct 14, 2011

Subsystems (2)

Sound ASoC

lore

Share & tools

lore

Axel Lin

author

2011-10-14 03:43 UTC #0 lore raw

PATCH 1/1 ASoC: max98095: Convert codec->hw_write to snd_soc_write

codec->hw_write is broken now, convert codec->hw_write to snd_soc_write.

Signed-off-by Axel Lin <[email protected]>

---
Hi,
I don't have this hardware, I'd appreciate if someone can test this patch.

Thanks,
Axel

 sound/soc/codecs/max98095.c |   26 ++++----------------------
 1 files changed, 4 insertions(+), 22 deletions(-)

sound/soc/codecs/max98095.c +4 ~~-22~~

index 6982f74..85f9379 100644
@@ -610,24 +610,6 @@ static int max98095_volatile(struct snd_soc_codec *codec, unsigned int reg)
 }
 
 /*
- * Filter coefficients are in a separate register segment
- * and they share the address space of the normal registers.
- * The coefficient registers do not need or share the cache.
- */
-static int max98095_hw_write(struct snd_soc_codec *codec, unsigned int reg,
-			     unsigned int value)
-{
-	u8 data[2];
-
-	data[0] = reg;
-	data[1] = value;
-	if (codec->hw_write(codec->control_data, data, 2) == 2)
-		return 0;
-	else
-		return -EIO;
-}
-
-/*
  * Load equalizer DSP coefficient configurations registers
  */
 static void m98095_eq_band(struct snd_soc_codec *codec, unsigned int dai,

@@ -647,8 +629,8 @@ static void m98095_eq_band(struct snd_soc_codec *codec, unsigned int dai,
 
 	/* Step through the registers and coefs */
 	for (i = 0; i < M98095_COEFS_PER_BAND; i++) {
-		max98095_hw_write(codec, eq_reg++, M98095_BYTE1(coefs[i]));
-		max98095_hw_write(codec, eq_reg++, M98095_BYTE0(coefs[i]));
+		snd_soc_write(codec, eq_reg++, M98095_BYTE1(coefs[i]));
+		snd_soc_write(codec, eq_reg++, M98095_BYTE0(coefs[i]));
 	}
 }

@@ -672,8 +654,8 @@ static void m98095_biquad_band(struct snd_soc_codec *codec, unsigned int dai,
 
 	/* Step through the registers and coefs */
 	for (i = 0; i < M98095_COEFS_PER_BAND; i++) {
-		max98095_hw_write(codec, bq_reg++, M98095_BYTE1(coefs[i]));
-		max98095_hw_write(codec, bq_reg++, M98095_BYTE0(coefs[i]));
+		snd_soc_write(codec, bq_reg++, M98095_BYTE1(coefs[i]));
+		snd_soc_write(codec, bq_reg++, M98095_BYTE0(coefs[i]));
 	}
 }

Signature · 1 line

1.7.4.1

Peter Hsiang

2011-10-14 17:41 UTC #1 lore raw

Quoted 3 lines · Axel Lin

codec->hw_write is broken now, convert codec->hw_write to snd_soc_write.

The hardware has 2 banks of registers sharing a section in I2C register space. The 1st bank is the primary one and is cached.
The 2nd bank is for loading coefficients only and they do not need cache. These coefficients registers are therefore direct writes. Changing this to a cached write will overwrite the cache.

Peter

Mark Brown

2011-10-14 19:03 UTC #2 lore raw

Quoted 9 lines · Peter Hsiang

Quoted 2 lines · Axel Lin
codec->hw_write is broken now, convert codec->hw_write to snd_soc_write.
The hardware has 2 banks of registers sharing a section in I2C register space. The 1st bank is the primary one and is cached.
The 2nd bank is for loading coefficients only and they do not need cache. These coefficients registers are therefore direct writes. Changing this to a cached write will overwrite the cache.

Writes to the cached region should be done within a cache_bypass flag to deal with this.