hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: rt5663: Use the set_jack() instead of the export function 

The patch replaces the export function with the new API set_jack().

Signed-off-by: Oder Chiou <oder_chiou@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Oder Chiou 2018-05-15 14:00:15 +08:00 committed by Mark Brown
parent 1cc0fe2479
commit 37a0491116
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sound/soc/codecs/rt5663.c
View File

@ -1857,7 +1857,7 @@ static irqreturn_t rt5663_irq(int irq, void *data)
} }
int rt5663_set_jack_detect(struct snd_soc_component *component, int rt5663_set_jack_detect(struct snd_soc_component *component,
struct snd_soc_jack *hs_jack) struct snd_soc_jack *hs_jack, void *data)
{ {
struct rt5663_priv *rt5663 = snd_soc_component_get_drvdata(component); struct rt5663_priv *rt5663 = snd_soc_component_get_drvdata(component);
@ -1867,7 +1867,6 @@ int rt5663_set_jack_detect(struct snd_soc_component *component,
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(rt5663_set_jack_detect);
static bool rt5663_check_jd_status(struct snd_soc_component *component) static bool rt5663_check_jd_status(struct snd_soc_component *component)
{ {
@ -3244,10 +3243,10 @@ static const struct snd_soc_component_driver soc_component_dev_rt5663 = {
.num_dapm_widgets = ARRAY_SIZE(rt5663_dapm_widgets), .num_dapm_widgets = ARRAY_SIZE(rt5663_dapm_widgets),
.dapm_routes = rt5663_dapm_routes, .dapm_routes = rt5663_dapm_routes,
.num_dapm_routes = ARRAY_SIZE(rt5663_dapm_routes), .num_dapm_routes = ARRAY_SIZE(rt5663_dapm_routes),
.set_jack = rt5663_set_jack_detect,
.use_pmdown_time = 1, .use_pmdown_time = 1,
.endianness = 1, .endianness = 1,
.non_legacy_dai_naming = 1, .non_legacy_dai_naming = 1,
}; };
static const struct regmap_config rt5663_v2_regmap = { static const struct regmap_config rt5663_v2_regmap = {

2
sound/soc/codecs/rt5663.h
View File

@ -1125,8 +1125,6 @@ enum {
RT5663_AD_STEREO_FILTER = 0x2, RT5663_AD_STEREO_FILTER = 0x2,
}; };
int rt5663_set_jack_detect(struct snd_soc_component *component,
struct snd_soc_jack *hs_jack);
int rt5663_sel_asrc_clk_src(struct snd_soc_component *component, int rt5663_sel_asrc_clk_src(struct snd_soc_component *component,
unsigned int filter_mask, unsigned int clk_src); unsigned int filter_mask, unsigned int clk_src);

3
sound/soc/intel/boards/kbl_rt5663_max98927.c
View File

@ -299,7 +299,8 @@ static int kabylake_rt5663_codec_init(struct snd_soc_pcm_runtime *rtd)
snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP);
snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);
rt5663_set_jack_detect(component, &ctx->kabylake_headset); snd_soc_component_set_jack(component, &ctx->kabylake_headset, NULL);
return ret; return ret;
} }

2
sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c
View File

@ -200,7 +200,7 @@ static int kabylake_rt5663_codec_init(struct snd_soc_pcm_runtime *rtd)
snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP); snd_jack_set_key(jack->jack, SND_JACK_BTN_2, KEY_VOLUMEUP);
snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN); snd_jack_set_key(jack->jack, SND_JACK_BTN_3, KEY_VOLUMEDOWN);
rt5663_set_jack_detect(component, &ctx->kabylake_headset); snd_soc_component_set_jack(component, &ctx->kabylake_headset, NULL);
ret = snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "DMIC"); ret = snd_soc_dapm_ignore_suspend(&rtd->card->dapm, "DMIC");
if (ret) if (ret)