diff options
| author |   Cezary Rojewski <cezary.rojewski@intel.com> | 2022-06-09 15:35:32 +0200 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2022-06-10 13:32:17 +0100 |
| commit | 3082afe097cc5d794c28a629f3492a0133ee4891 (patch) | |
| tree | 46ca892e4b969f27988ba275bb292eb1dd9b366d /sound/soc/intel/boards/broadwell.c | |
| parent | ASoC: codecs: rt274: Always init jack_detect_work (diff) | |
| download | linux-dev-3082afe097cc5d794c28a629f3492a0133ee4891.tar.xz linux-dev-3082afe097cc5d794c28a629f3492a0133ee4891.zip | |
ASoC: codecs: rt286: Reorganize jack detect handling
Clean up in order to use and expose .set_jack callback.
Signed-off-by: Cezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@linux.intel.com>
Link: https://lore.kernel.org/r/20220609133541.3984886-3-amadeuszx.slawinski@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/intel/boards/broadwell.c')
| -rw-r--r-- | sound/soc/intel/boards/broadwell.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/intel/boards/broadwell.c b/sound/soc/intel/boards/broadwell.c index b29d77dfb281..48bf3241b3e6 100644 --- a/sound/soc/intel/boards/broadwell.c +++ b/sound/soc/intel/boards/broadwell.c @@ -75,7 +75,7 @@ static int broadwell_rt286_codec_init(struct snd_soc_pcm_runtime *rtd) if (ret) return ret; - rt286_mic_detect(component, &broadwell_headset); + snd_soc_component_set_jack(component, &broadwell_headset, NULL); return 0; } @@ -235,7 +235,7 @@ static void broadwell_disable_jack(struct snd_soc_card *card) if (!strcmp(component->name, "i2c-INT343A:00")) { dev_dbg(component->dev, "disabling jack detect before going to suspend.\n"); - rt286_mic_detect(component, NULL); + snd_soc_component_set_jack(component, NULL, NULL); break; } } @@ -255,7 +255,7 @@ static int broadwell_resume(struct snd_soc_card *card){ if (!strcmp(component->name, "i2c-INT343A:00")) { dev_dbg(component->dev, "enabling jack detect for resume.\n"); - rt286_mic_detect(component, &broadwell_headset); + snd_soc_component_set_jack(component, &broadwell_headset, NULL); break; } } |