diff options
| author | Kristoffer KARLSSON <kristoffer.karlsson@stericsson.com> | 2012-02-28 16:43:07 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:05:07 +0200 |
| commit | 0c4bb4a439cc6792ba8cbd5a790bc72f19d149c0 (patch) | |
| tree | 842b6fe3f5832ff443f9012b3e95fb75eb4972df /sound | |
| parent | 6767a710af4d60ec91f7d813deec8da046acf56c (diff) | |
ASoC: Ux500: Disable HS Zero Cross control
HS gain is changed without zero cross control.
ST-Ericsson Linux next: NA
ST-Ericsson ID: 417037
ST-Ericsson FOSS-OUT ID: Trivial
Original Change-Id: Ie6f195a0353d3dc8704a1611c59b2d64c94e5dc0
Signed-off-by: Kristoffer KARLSSON <kristoffer.karlsson@stericsson.com>
Change-Id: I0b3912a493c9384e16161702584a41b7d23203e2
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/51049
Reviewed-by: Kristoffer KARLSSON <kristoffer.karlsson@stericsson.com>
Tested-by: Kristoffer KARLSSON <kristoffer.karlsson@stericsson.com>
Reviewed-by: QABUILD
Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/ab8500_audio.c | 2 | ||||
| -rw-r--r-- | sound/soc/codecs/ab8500_audio.h | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/sound/soc/codecs/ab8500_audio.c b/sound/soc/codecs/ab8500_audio.c index 34809d0adf4..256e8bff9d7 100644 --- a/sound/soc/codecs/ab8500_audio.c +++ b/sound/soc/codecs/ab8500_audio.c @@ -77,7 +77,7 @@ static const u8 ab8500_reg_cache[AB8500_CACHEREGNUM] = { 0x00, /* REG_ANACONF4 (0x08) */ 0x00, /* REG_DAPATHCONF (0x09) */ 0x40, /* REG_MUTECONF (0x0A) */ - 0x00, /* REG_SHORTCIRCONF (0x0B) */ + 0x01, /* REG_SHORTCIRCONF (0x0B) */ 0x01, /* REG_ANACONF5 (0x0C) */ 0x00, /* REG_ENVCPCONF (0x0D) */ 0x00, /* REG_SIGENVCONF (0x0E) */ diff --git a/sound/soc/codecs/ab8500_audio.h b/sound/soc/codecs/ab8500_audio.h index 72f7b383830..a046357b55a 100644 --- a/sound/soc/codecs/ab8500_audio.h +++ b/sound/soc/codecs/ab8500_audio.h @@ -329,8 +329,14 @@ int ab8500_audio_set_adcm(enum ab8500_audio_adcm req_adcm); #define REG_MUTECONF_MUTDACHSL 1 #define REG_MUTECONF_MUTDACHSR 0 - /* REG_SHORTCIRCONF */ +#define REG_SHORTCIRCONF_ENSHORTPWD 7 +#define REG_SHORTCIRCONF_EARSHORTDIS 6 +#define REG_SHORTCIRCONF_HSSHORTDIS 5 +#define REG_SHORTCIRCONF_HSPULLDEN 4 +#define REG_SHORTCIRCONF_HSOSCEN 2 +#define REG_SHORTCIRCONF_HSFADDIS 1 +#define REG_SHORTCIRCONF_HSZCDDIS 0 /* Zero cross should be disabled */ /* REG_ANACONF5 */ #define REG_ANACONF5_ENCPHS 7 |