Skip to content

Commit

Permalink
ASoC: rt5645: two jacks for hp and mic
Browse files Browse the repository at this point in the history 
Some OS need headphone and microphone to be separated.

Signed-off-by: Bard Liao <bardliao@realtek.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
  • Loading branch information
Bard Liao authored and Mark Brown committed Nov 14, 2014
1 parent 850577d commit 471f208
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
17 changes: 8 additions & 9 deletions sound/soc/codecs/rt5645.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2201,8 +2201,7 @@ static int rt5645_set_bias_level(struct snd_soc_codec *codec,
return 0;
}

static int rt5645_jack_detect(struct snd_soc_codec *codec,
struct snd_soc_jack *jack)
static int rt5645_jack_detect(struct snd_soc_codec *codec)
{
struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec);
int gpio_state, jack_type = 0;
Expand Down Expand Up @@ -2245,19 +2244,19 @@ static int rt5645_jack_detect(struct snd_soc_codec *codec,
snd_soc_dapm_sync(&codec->dapm);
}

snd_soc_jack_report(rt5645->jack, jack_type, SND_JACK_HEADSET);

snd_soc_jack_report(rt5645->hp_jack, jack_type, SND_JACK_HEADPHONE);
snd_soc_jack_report(rt5645->mic_jack, jack_type, SND_JACK_MICROPHONE);
return 0;
}

int rt5645_set_jack_detect(struct snd_soc_codec *codec,
struct snd_soc_jack *jack)
struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack)
{
struct rt5645_priv *rt5645 = snd_soc_codec_get_drvdata(codec);

rt5645->jack = jack;

rt5645_jack_detect(codec, rt5645->jack);
rt5645->hp_jack = hp_jack;
rt5645->mic_jack = mic_jack;
rt5645_jack_detect(codec);

return 0;
}
Expand All @@ -2268,7 +2267,7 @@ static void rt5645_jack_detect_work(struct work_struct *work)
struct rt5645_priv *rt5645 =
container_of(work, struct rt5645_priv, jack_detect_work.work);

rt5645_jack_detect(rt5645->codec, rt5645->jack);
rt5645_jack_detect(rt5645->codec);
}

static irqreturn_t rt5645_irq(int irq, void *data)
Expand Down
5 changes: 3 additions & 2 deletions sound/soc/codecs/rt5645.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2173,7 +2173,8 @@ struct rt5645_priv {
struct rt5645_platform_data pdata;
struct regmap *regmap;
struct i2c_client *i2c;
struct snd_soc_jack *jack;
struct snd_soc_jack *hp_jack;
struct snd_soc_jack *mic_jack;
struct delayed_work jack_detect_work;

int sysclk;
Expand All @@ -2188,6 +2189,6 @@ struct rt5645_priv {
};

int rt5645_set_jack_detect(struct snd_soc_codec *codec,
struct snd_soc_jack *jack);
struct snd_soc_jack *hp_jack, struct snd_soc_jack *mic_jack);

#endif /* __RT5645_H__ */

0 comments on commit 471f208

Please sign in to comment.