UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ASoC: rt5651: Add rt5651_jack_inserted() helper 

Add rt5651_jack_inserted() helper to get the jack-detect switch status,
This is a preparation patch for rewriting the jack type-detection to
make it more reliable.

Tested-by: Carlo Caione <carlo@endlessm.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Hans de Goede 2018-03-04 15:35:56 +01:00 committed by Mark Brown
parent 4b4a373c02
commit 0fe9474598
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
sound/soc/codecs/rt5651.c
View File

@ -1597,6 +1597,31 @@ static bool rt5651_micbias1_ovcd(struct snd_soc_component *component)
return (val & RT5651_MB1_OC_CLR); return (val & RT5651_MB1_OC_CLR);
} }
static bool rt5651_jack_inserted(struct snd_soc_component *component)
{
struct rt5651_priv *rt5651 = snd_soc_component_get_drvdata(component);
int val;
val = snd_soc_component_read32(component, RT5651_INT_IRQ_ST);
dev_dbg(component->dev, "irq status %#04x\n", val);
switch (rt5651->jd_src) {
case RT5651_JD1_1:
val &= 0x1000;
break;
case RT5651_JD1_2:
val &= 0x2000;
break;
case RT5651_JD2:
val &= 0x4000;
break;
default:
break;
}
return val == 0;
}
static irqreturn_t rt5651_irq(int irq, void *data) static irqreturn_t rt5651_irq(int irq, void *data)
{ {
struct rt5651_priv *rt5651 = data; struct rt5651_priv *rt5651 = data;
@ -1927,27 +1952,13 @@ static void rt5651_jack_detect_work(struct work_struct *work)
{ {
struct rt5651_priv *rt5651 = struct rt5651_priv *rt5651 =
container_of(work, struct rt5651_priv, jack_detect_work.work); container_of(work, struct rt5651_priv, jack_detect_work.work);
int report, jack_inserted;
int report, val = 0;
if (!rt5651->component) if (!rt5651->component)
return; return;
switch (rt5651->jd_src) { jack_inserted = rt5651_jack_inserted(rt5651->component);
case RT5651_JD1_1: report = rt5651_jack_detect(rt5651->component, jack_inserted);
val = snd_soc_component_read32(rt5651->component, RT5651_INT_IRQ_ST) & 0x1000;
break;
case RT5651_JD1_2:
val = snd_soc_component_read32(rt5651->component, RT5651_INT_IRQ_ST) & 0x2000;
break;
case RT5651_JD2:
val = snd_soc_component_read32(rt5651->component, RT5651_INT_IRQ_ST) & 0x4000;
break;
default:
break;
}
report = rt5651_jack_detect(rt5651->component, !val);
snd_soc_jack_report(rt5651->hp_jack, report, SND_JACK_HEADSET); snd_soc_jack_report(rt5651->hp_jack, report, SND_JACK_HEADSET);
} }