diff options
| author | Ravindra Lokhande <rlokhande@nvidia.com> | 2013-12-03 17:10:58 +0530 |
|---|---|---|
| committer | Sachin Nikam <snikam@nvidia.com> | 2014-01-06 06:06:47 -0800 |
| commit | 52500c114b541396fcf83677e114686d1d0b6795 (patch) | |
| tree | 6456fd5d639d017b2f7023d5573cbb2fd422dfb1 /sound/soc/codecs | |
| parent | fef644291bc9e06819887087ccd625f7d5c0f095 (diff) | |
ASoC: codecs: max97236: make ERS path default
As headset jacks are different on ERS and FFD, we need to check
board id for test value. Earlier FFD code path was default, changed
this default path to ERS now.
Bug 1413891
Change-Id: Ia9f851267777207000315f40d975700e2a239aa8
Signed-off-by: Ravindra Lokhande <rlokhande@nvidia.com>
Reviewed-on: http://git-master/r/337781
Reviewed-by: Chandrakanth Gorantla <cgorantla@nvidia.com>
Reviewed-by: Sumit Bhattacharya <sumitb@nvidia.com>
Reviewed-by: Scott Peterson <speterson@nvidia.com>
(cherry picked from commit 7056d13281a7ae3bfba7abc82ca6b3171d9b955e)
Reviewed-on: http://git-master/r/350623
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Diffstat (limited to 'sound/soc/codecs')
| -rw-r--r-- | sound/soc/codecs/max97236.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/sound/soc/codecs/max97236.c b/sound/soc/codecs/max97236.c index afa7036baf51..309288962bf2 100644 --- a/sound/soc/codecs/max97236.c +++ b/sound/soc/codecs/max97236.c @@ -595,11 +595,10 @@ static int max97236_jacksw_active(struct max97236_priv *max97236) int ret; /* Overwrite above code using board id */ - if ((board_info.board_id == BOARD_E1680) || - (board_info.board_id == BOARD_E1681)) { - test_value = 4; - } else { /* FFD */ + if (board_info.board_id == BOARD_E1690) { test_value = 0; + } else { /* ERS */ + test_value = 4; } regmap_read(max97236->regmap, M97236_REG_00_STATUS1, ®); @@ -1017,11 +1016,10 @@ int max97236_mic_detect(struct snd_soc_codec *codec, test_value = 0; #endif /* Overwrite above code using board id */ - if ((board_info.board_id == BOARD_E1680) || - (board_info.board_id == BOARD_E1681)) { - test_value = 4; - } else { /* FFD */ + if (board_info.board_id == BOARD_E1690) { test_value = 0; + } else { /* ERS */ + test_value = 4; } if ((reg & M97236_JACKSW_MASK) == test_value) { |