diff options
| author | Stefan Binding <sbinding@opensource.cirrus.com> | 2022-09-27 14:14:40 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-09-27 15:00:00 +0200 |
| commit | 45560891506fae31be66f2a73693c5c8bd7dbedb (patch) | |
| tree | 84870c2b30e3573ab7e5c2fc61764111fafb46ff /sound | |
| parent | ASoC: apple: mca: Adjust timing of component unregister (diff) | |
| download | linux-45560891506fae31be66f2a73693c5c8bd7dbedb.tar.xz linux-45560891506fae31be66f2a73693c5c8bd7dbedb.zip | |
ASoC: cs42l42: Fallback to headphones for type detect
After tip sense detects a jack insertion, if automatic
type detection, and manual type detection fails, then
fall back to assume the jack connected belongs to
headphones.
Signed-off-by: Stefan Binding <sbinding@opensource.cirrus.com>
Link: https://lore.kernel.org/r/20220927121440.2506632-1-sbinding@opensource.cirrus.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/cs42l42.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sound/soc/codecs/cs42l42.c b/sound/soc/codecs/cs42l42.c index bdc7e6bed6ac..2fefbcf7bd13 100644 --- a/sound/soc/codecs/cs42l42.c +++ b/sound/soc/codecs/cs42l42.c @@ -1199,14 +1199,11 @@ static void cs42l42_manual_hs_type_detect(struct cs42l42_private *cs42l42) cs42l42->hs_type = CS42L42_PLUG_OMTP; hs_det_sw = CS42L42_HSDET_SW_TYPE2; break; - case CS42L42_HSDET_COMP_TYPE3: + /* Detect Type 3 and Type 4 Headsets as Headphones */ + default: cs42l42->hs_type = CS42L42_PLUG_HEADPHONE; hs_det_sw = CS42L42_HSDET_SW_TYPE3; break; - default: - cs42l42->hs_type = CS42L42_PLUG_INVALID; - hs_det_sw = CS42L42_HSDET_SW_TYPE4; - break; } } |