leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ASoC: rt5640: Allow snd_soc_component_set_jack() to override the codec IRQ

Browse Source 
On some boards where the firmware/fwnode information is in essence
read-only (x86 + ACPI boards) the i2c_client for the codec may contain
the wrong IRQ or no IRQ at all.

Since we only request the IRQ once snd_soc_component_set_jack() gets
called, allow machine drivers to override the IRQ with the proper one
through the data parameter to snd_soc_component_set_jack().

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20220106110128.66049-4-hdegoede@redhat.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Hans de Goede 2022-01-06 12:01:25 +01:00 committed by Mark Brown
parent a3b1aaf7ae
commit b35a9ab490
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sound/soc/codecs/rt5640.c
View File

@ -2452,7 +2452,8 @@ static void rt5640_disable_jack_detect(struct snd_soc_component *component)
} }
static void rt5640_enable_jack_detect(struct snd_soc_component *component, static void rt5640_enable_jack_detect(struct snd_soc_component *component,
struct snd_soc_jack *jack) struct snd_soc_jack *jack,
struct rt5640_set_jack_data *jack_data)
{ {
struct rt5640_priv *rt5640 = snd_soc_component_get_drvdata(component); struct rt5640_priv *rt5640 = snd_soc_component_get_drvdata(component);
int ret; int ret;
@ -2496,6 +2497,9 @@ static void rt5640_enable_jack_detect(struct snd_soc_component *component,
rt5640_enable_micbias1_ovcd_irq(component); rt5640_enable_micbias1_ovcd_irq(component);
} }
if (jack_data && jack_data->codec_irq_override)
rt5640->irq = jack_data->codec_irq_override;
ret = request_irq(rt5640->irq, rt5640_irq, ret = request_irq(rt5640->irq, rt5640_irq,
IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT, IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
"rt5640", rt5640); "rt5640", rt5640);
@ -2558,7 +2562,7 @@ static int rt5640_set_jack(struct snd_soc_component *component,
if (rt5640->jd_src == RT5640_JD_SRC_HDA_HEADER) if (rt5640->jd_src == RT5640_JD_SRC_HDA_HEADER)
rt5640_enable_hda_jack_detect(component, jack); rt5640_enable_hda_jack_detect(component, jack);
else else
rt5640_enable_jack_detect(component, jack); rt5640_enable_jack_detect(component, jack, data);
} else { } else {
rt5640_disable_jack_detect(component); rt5640_disable_jack_detect(component);
} }

4
sound/soc/codecs/rt5640.h
View File

@ -2153,6 +2153,10 @@ struct rt5640_priv {
unsigned int ovcd_sf; unsigned int ovcd_sf;
}; };
struct rt5640_set_jack_data {
int codec_irq_override;
};
int rt5640_dmic_enable(struct snd_soc_component *component, int rt5640_dmic_enable(struct snd_soc_component *component,
bool dmic1_data_pin, bool dmic2_data_pin); bool dmic1_data_pin, bool dmic2_data_pin);
int rt5640_sel_asrc_clk_src(struct snd_soc_component *component, int rt5640_sel_asrc_clk_src(struct snd_soc_component *component,