ASoC: uda134x: Explicitly handle in-data addresses

The UDA134X family extends the rather limited L3 register set by using part
of the register value as additional address bits.

These extra address bits are currently stored in the default register cache
and rely on them remaining constant. While this works it is rather
idiomatic and slightly confusing. Change it so that the additional address
bits are explicitly added when writing a register.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Mark Brown <broonie@kernel.org>

1 files changed, 3 insertions, 2 deletions

diff --git a/sound/soc/codecs/uda134x.c b/sound/soc/codecs/uda134x.c
index a89f98a773d6..d47da0ec8f47 100644
--- a/sound/soc/codecs/uda134x.c
+++ b/sound/soc/codecs/uda134x.c
@@ -39,12 +39,11 @@ struct uda134x_priv {
         struct snd_pcm_substream *slave_substream;
 };
 
-/* In-data addresses are hard-coded into the reg-cache values */
 static const char uda134x_reg[UDA134X_REGS_NUM] = {
         /* Extended address registers */
         0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00,
         /* Status, data regs */
-        0x00, 0x83, 0x00, 0x40, 0x80, 0xC0, 0x00,
+        0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00,
 };
 
 /*
@@ -99,12 +98,14 @@ static int uda134x_write(struct snd_soc_codec *codec, unsigned int reg,
         case UDA134X_STATUS0:
         case UDA134X_STATUS1:
                 addr = UDA134X_STATUS_ADDR;
+                data |= (reg - UDA134X_STATUS0) << 7;
                 break;
         case UDA134X_DATA000:
         case UDA134X_DATA001:
         case UDA134X_DATA010:
         case UDA134X_DATA011:
                 addr = UDA134X_DATA0_ADDR;
+                data |= (reg - UDA134X_DATA000) << 6;
                 break;
         case UDA134X_DATA1:
                 addr = UDA134X_DATA1_ADDR;