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

ASoC/MFD: twl6040: Combine bit definitions for Headset control registers

Browse Source 
Use one set of defines for the HS bits, since they are identical in both
control 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:54 +03:00
committed by Mark Brown
parent d13f1fe044
commit ab6cf13943
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -120,15 +120,10 @@
#define TWL6040_LPLLFIN 0x08 #define TWL6040_LPLLFIN 0x08
#define TWL6040_HPLLSEL 0x10 #define TWL6040_HPLLSEL 0x10
/* HSLCTL (0x10) fields */ /* HSLCTL/R (0x10/0x11) fields */
#define TWL6040_HSDACMODEL 0x02 #define TWL6040_HSDACMODE (1 << 1)
#define TWL6040_HSDRVMODEL 0x08 #define TWL6040_HSDRVMODE (1 << 3)
/* HSRCTL (0x11) fields */
#define TWL6040_HSDACMODER 0x02
#define TWL6040_HSDRVMODER 0x08
/* VIBCTLL (0x18) fields */ /* VIBCTLL (0x18) fields */

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

@@ -642,7 +642,7 @@ static int pga_event(struct snd_soc_dapm_widget *w,
static int headset_power_mode(struct snd_soc_codec *codec, int high_perf) static int headset_power_mode(struct snd_soc_codec *codec, int high_perf)
{ {
int hslctl, hsrctl; int hslctl, hsrctl;
int mask = TWL6040_HSDRVMODEL | TWL6040_HSDACMODEL; int mask = TWL6040_HSDRVMODE | TWL6040_HSDACMODE;
hslctl = twl6040_read_reg_cache(codec, TWL6040_REG_HSLCTL); hslctl = twl6040_read_reg_cache(codec, TWL6040_REG_HSLCTL);
hsrctl = twl6040_read_reg_cache(codec, TWL6040_REG_HSRCTL); hsrctl = twl6040_read_reg_cache(codec, TWL6040_REG_HSRCTL);