mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 22:26:55 +00:00
Code Issues Releases Wiki Activity

ASoC: codecs: rt286: Reorganize jack detect handling

Browse source 
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>
This commit is contained in:
Cezary Rojewski 2022-06-09 15:35:32 +02:00 committed by Mark Brown
parent a43b4394bb
commit 3082afe097
No known key found for this signature in database
GPG key ID: 24D68B725D5487D0
4 changed files with 10 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
sound/soc/codecs/rt286.c
View file

@ -311,7 +311,8 @@ static void rt286_jack_detect_work(struct work_struct *work)
SND_JACK_MICROPHONE | SND_JACK_HEADPHONE); SND_JACK_MICROPHONE | SND_JACK_HEADPHONE);
} }
int rt286_mic_detect(struct snd_soc_component *component, struct snd_soc_jack *jack) static int rt286_mic_detect(struct snd_soc_component *component,
struct snd_soc_jack *jack, void *data)
{ {
struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component); struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
struct rt286_priv *rt286 = snd_soc_component_get_drvdata(component); struct rt286_priv *rt286 = snd_soc_component_get_drvdata(component);
@ -335,7 +336,6 @@ int rt286_mic_detect(struct snd_soc_component *component, struct snd_soc_jack *j
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(rt286_mic_detect);
static int is_mclk_mode(struct snd_soc_dapm_widget *source, static int is_mclk_mode(struct snd_soc_dapm_widget *source,
struct snd_soc_dapm_widget *sink) struct snd_soc_dapm_widget *sink)
@ -947,17 +947,11 @@ static int rt286_probe(struct snd_soc_component *component)
struct rt286_priv *rt286 = snd_soc_component_get_drvdata(component); struct rt286_priv *rt286 = snd_soc_component_get_drvdata(component);
rt286->component = component; rt286->component = component;
INIT_DELAYED_WORK(&rt286->jack_detect_work, rt286_jack_detect_work);
if (rt286->i2c->irq) { if (rt286->i2c->irq)
regmap_update_bits(rt286->regmap,
RT286_IRQ_CTRL, 0x2, 0x2);
INIT_DELAYED_WORK(&rt286->jack_detect_work,
rt286_jack_detect_work);
schedule_delayed_work(&rt286->jack_detect_work, schedule_delayed_work(&rt286->jack_detect_work,
msecs_to_jiffies(1250)); msecs_to_jiffies(50));
}
return 0; return 0;
} }
@ -1055,6 +1049,7 @@ static const struct snd_soc_component_driver soc_component_dev_rt286 = {
.suspend = rt286_suspend, .suspend = rt286_suspend,
.resume = rt286_resume, .resume = rt286_resume,
.set_bias_level = rt286_set_bias_level, .set_bias_level = rt286_set_bias_level,
.set_jack = rt286_mic_detect,
.controls = rt286_snd_controls, .controls = rt286_snd_controls,
.num_controls = ARRAY_SIZE(rt286_snd_controls), .num_controls = ARRAY_SIZE(rt286_snd_controls),
.dapm_widgets = rt286_dapm_widgets, .dapm_widgets = rt286_dapm_widgets,

2
sound/soc/codecs/rt286.h
View file

@ -196,7 +196,5 @@ enum {
RT286_AIFS, RT286_AIFS,
}; };
int rt286_mic_detect(struct snd_soc_component *component, struct snd_soc_jack *jack);
#endif /* __RT286_H__ */ #endif /* __RT286_H__ */

6
sound/soc/intel/boards/broadwell.c
View file

@ -75,7 +75,7 @@ static int broadwell_rt286_codec_init(struct snd_soc_pcm_runtime *rtd)
if (ret) if (ret)
return ret; return ret;
rt286_mic_detect(component, &broadwell_headset); snd_soc_component_set_jack(component, &broadwell_headset, NULL);
return 0; return 0;
} }
@ -235,7 +235,7 @@ static void broadwell_disable_jack(struct snd_soc_card *card)
if (!strcmp(component->name, "i2c-INT343A:00")) { if (!strcmp(component->name, "i2c-INT343A:00")) {
dev_dbg(component->dev, "disabling jack detect before going to suspend.\n"); 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; break;
} }
} }
@ -255,7 +255,7 @@ static int broadwell_resume(struct snd_soc_card *card){
if (!strcmp(component->name, "i2c-INT343A:00")) { if (!strcmp(component->name, "i2c-INT343A:00")) {
dev_dbg(component->dev, "enabling jack detect for resume.\n"); 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; break;
} }
} }

2
sound/soc/intel/boards/skl_rt286.c
View file

@ -133,7 +133,7 @@ static int skylake_rt286_codec_init(struct snd_soc_pcm_runtime *rtd)
if (ret) if (ret)
return ret; return ret;
rt286_mic_detect(component, &skylake_headset); snd_soc_component_set_jack(component, &skylake_headset, NULL);
snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "SoC DMIC"); snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "SoC DMIC");