lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ASoC: twl6040: Introduce SW only shadow register

Browse Source 
Software only shadow register to be used by the driver.
For example Earpiece path will need this shadow register.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Peter Ujfalusi
2011-09-22 11:05:48 +03:00
committed by Mark Brown
parent 5bf692d972
commit d17bf31832
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/mfd/twl6040.h
View File

@@ -68,8 +68,6 @@
#define TWL6040_REG_ACCCTL 0x2D #define TWL6040_REG_ACCCTL 0x2D
#define TWL6040_REG_STATUS 0x2E #define TWL6040_REG_STATUS 0x2E
#define TWL6040_CACHEREGNUM (TWL6040_REG_STATUS + 1)
/* INTID (0x03) fields */ /* INTID (0x03) fields */
#define TWL6040_THINT 0x01 #define TWL6040_THINT 0x01

19
sound/soc/codecs/twl6040.c
View File

@@ -57,6 +57,10 @@
#define TWL6040_HF_VOL_MASK 0x1F #define TWL6040_HF_VOL_MASK 0x1F
#define TWL6040_HF_VOL_SHIFT 0 #define TWL6040_HF_VOL_SHIFT 0
/* Shadow register used by the driver */
#define TWL6040_REG_SW_SHADOW 0x2F
#define TWL6040_CACHEREGNUM (TWL6040_REG_SW_SHADOW + 1)
struct twl6040_output { struct twl6040_output {
u16 active; u16 active;
u16 left_vol; u16 left_vol;
@@ -153,6 +157,8 @@ static const u8 twl6040_reg[TWL6040_CACHEREGNUM] = {
0x00, /* REG_HFOTRIM 0x2C */ 0x00, /* REG_HFOTRIM 0x2C */
0x09, /* REG_ACCCTL 0x2D */ 0x09, /* REG_ACCCTL 0x2D */
0x00, /* REG_STATUS 0x2E (ro) */ 0x00, /* REG_STATUS 0x2E (ro) */
0x00, /* REG_SW_SHADOW 0x2F - Shadow, non HW register */
}; };
/* List of registers to be restored after power up */ /* List of registers to be restored after power up */
@@ -236,8 +242,12 @@ static int twl6040_read_reg_volatile(struct snd_soc_codec *codec,
if (reg >= TWL6040_CACHEREGNUM) if (reg >= TWL6040_CACHEREGNUM)
return -EIO; return -EIO;
value = twl6040_reg_read(twl6040, reg); if (likely(reg < TWL6040_REG_SW_SHADOW)) {
twl6040_write_reg_cache(codec, reg, value); value = twl6040_reg_read(twl6040, reg);
twl6040_write_reg_cache(codec, reg, value);
} else {
value = twl6040_read_reg_cache(codec, reg);
}
return value; return value;
} }
@@ -254,7 +264,10 @@ static int twl6040_write(struct snd_soc_codec *codec,
return -EIO; return -EIO;
twl6040_write_reg_cache(codec, reg, value); twl6040_write_reg_cache(codec, reg, value);
return twl6040_reg_write(twl6040, reg, value); if (likely(reg < TWL6040_REG_SW_SHADOW))
return twl6040_reg_write(twl6040, reg, value);
else
return 0;
} }
static void twl6040_init_chip(struct snd_soc_codec *codec) static void twl6040_init_chip(struct snd_soc_codec *codec)