Skip to content

Commit

Permalink
Merge remote-tracking branches 'asoc/topic/tegra', 'asoc/topic/tlv320…
Browse files Browse the repository at this point in the history 
…aic23' and 'asoc/topic/ux500' into asoc-next
  • Loading branch information
Mark Brown committed Apr 12, 2015
4 parents e343818 + 1b13fe7 + f580f8a + 5cf57f0 commit ff096ea
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 36 deletions.
4 changes: 2 additions & 2 deletions sound/soc/codecs/tlv320aic23-i2c.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ static int tlv320aic23_i2c_probe(struct i2c_client *i2c,
return tlv320aic23_probe(&i2c->dev, regmap);
}

static int __exit tlv320aic23_i2c_remove(struct i2c_client *i2c)
static int tlv320aic23_i2c_remove(struct i2c_client *i2c)
{
snd_soc_unregister_codec(&i2c->dev);
return 0;
Expand All @@ -56,7 +56,7 @@ static struct i2c_driver tlv320aic23_i2c_driver = {
.of_match_table = of_match_ptr(tlv320aic23_of_match),
},
.probe = tlv320aic23_i2c_probe,
.remove = __exit_p(tlv320aic23_i2c_remove),
.remove = tlv320aic23_i2c_remove,
.id_table = tlv320aic23_id,
};

Expand Down
5 changes: 1 addition & 4 deletions sound/soc/tegra/tegra_alc5632.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,6 @@ static const struct snd_kcontrol_new tegra_alc5632_controls[] = {

static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd)
{
struct snd_soc_dai *codec_dai = rtd->codec_dai;
struct snd_soc_codec *codec = codec_dai->codec;
struct snd_soc_dapm_context *dapm = &codec->dapm;
struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(rtd->card);

snd_soc_card_jack_new(rtd->card, "Headset Jack", SND_JACK_HEADSET,
Expand All @@ -118,7 +115,7 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd)
&tegra_alc5632_hp_jack_gpio);
}

snd_soc_dapm_force_enable_pin(dapm, "MICBIAS1");
snd_soc_dapm_force_enable_pin(&rtd->card->dapm, "MICBIAS1");

return 0;
}
Expand Down
6 changes: 1 addition & 5 deletions sound/soc/tegra/tegra_rt5677.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,6 @@ static const struct snd_kcontrol_new tegra_rt5677_controls[] = {

static int tegra_rt5677_asoc_init(struct snd_soc_pcm_runtime *rtd)
{
struct snd_soc_dai *codec_dai = rtd->codec_dai;
struct snd_soc_codec *codec = codec_dai->codec;
struct snd_soc_dapm_context *dapm = &codec->dapm;
struct tegra_rt5677 *machine = snd_soc_card_get_drvdata(rtd->card);

snd_soc_card_jack_new(rtd->card, "Headphone Jack", SND_JACK_HEADPHONE,
Expand All @@ -167,7 +164,7 @@ static int tegra_rt5677_asoc_init(struct snd_soc_pcm_runtime *rtd)
&tegra_rt5677_mic_jack_gpio);
}

snd_soc_dapm_force_enable_pin(dapm, "MICBIAS1");
snd_soc_dapm_force_enable_pin(&rtd->card->dapm, "MICBIAS1");

return 0;
}
Expand Down Expand Up @@ -329,7 +326,6 @@ static const struct of_device_id tegra_rt5677_of_match[] = {
static struct platform_driver tegra_rt5677_driver = {
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
.pm = &snd_soc_pm_ops,
.of_match_table = tegra_rt5677_of_match,
},
Expand Down
3 changes: 1 addition & 2 deletions sound/soc/tegra/tegra_wm8903.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,6 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd)
{
struct snd_soc_dai *codec_dai = rtd->codec_dai;
struct snd_soc_codec *codec = codec_dai->codec;
struct snd_soc_dapm_context *dapm = &codec->dapm;
struct snd_soc_card *card = rtd->card;
struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);

Expand All @@ -193,7 +192,7 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd)
wm8903_mic_detect(codec, &tegra_wm8903_mic_jack, SND_JACK_MICROPHONE,
0);

snd_soc_dapm_force_enable_pin(dapm, "MICBIAS");
snd_soc_dapm_force_enable_pin(&card->dapm, "MICBIAS");

return 0;
}
Expand Down
6 changes: 1 addition & 5 deletions sound/soc/tegra/tegra_wm9712.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,7 @@ static const struct snd_soc_dapm_widget tegra_wm9712_dapm_widgets[] = {

static int tegra_wm9712_init(struct snd_soc_pcm_runtime *rtd)
{
struct snd_soc_dai *codec_dai = rtd->codec_dai;
struct snd_soc_codec *codec = codec_dai->codec;
struct snd_soc_dapm_context *dapm = &codec->dapm;

return snd_soc_dapm_force_enable_pin(dapm, "Mic Bias");
return snd_soc_dapm_force_enable_pin(&rtd->card->dapm, "Mic Bias");
}

static struct snd_soc_dai_link tegra_wm9712_dai = {
Expand Down
36 changes: 18 additions & 18 deletions sound/soc/ux500/mop500_ab8500.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ struct snd_soc_ops mop500_ab8500_ops[] = {

int mop500_ab8500_machine_init(struct snd_soc_pcm_runtime *rtd)
{
struct snd_soc_codec *codec = rtd->codec;
struct snd_soc_dapm_context *dapm = &rtd->card->dapm;
struct device *dev = rtd->card->dev;
struct mop500_ab8500_drvdata *drvdata;
int ret;
Expand Down Expand Up @@ -407,23 +407,23 @@ int mop500_ab8500_machine_init(struct snd_soc_pcm_runtime *rtd)
return ret;
}

ret = snd_soc_dapm_disable_pin(&codec->dapm, "Earpiece");
ret |= snd_soc_dapm_disable_pin(&codec->dapm, "Speaker Left");
ret |= snd_soc_dapm_disable_pin(&codec->dapm, "Speaker Right");
ret |= snd_soc_dapm_disable_pin(&codec->dapm, "LineOut Left");
ret |= snd_soc_dapm_disable_pin(&codec->dapm, "LineOut Right");
ret |= snd_soc_dapm_disable_pin(&codec->dapm, "Vibra 1");
ret |= snd_soc_dapm_disable_pin(&codec->dapm, "Vibra 2");
ret |= snd_soc_dapm_disable_pin(&codec->dapm, "Mic 1");
ret |= snd_soc_dapm_disable_pin(&codec->dapm, "Mic 2");
ret |= snd_soc_dapm_disable_pin(&codec->dapm, "LineIn Left");
ret |= snd_soc_dapm_disable_pin(&codec->dapm, "LineIn Right");
ret |= snd_soc_dapm_disable_pin(&codec->dapm, "DMic 1");
ret |= snd_soc_dapm_disable_pin(&codec->dapm, "DMic 2");
ret |= snd_soc_dapm_disable_pin(&codec->dapm, "DMic 3");
ret |= snd_soc_dapm_disable_pin(&codec->dapm, "DMic 4");
ret |= snd_soc_dapm_disable_pin(&codec->dapm, "DMic 5");
ret |= snd_soc_dapm_disable_pin(&codec->dapm, "DMic 6");
ret = snd_soc_dapm_disable_pin(dapm, "Earpiece");
ret |= snd_soc_dapm_disable_pin(dapm, "Speaker Left");
ret |= snd_soc_dapm_disable_pin(dapm, "Speaker Right");
ret |= snd_soc_dapm_disable_pin(dapm, "LineOut Left");
ret |= snd_soc_dapm_disable_pin(dapm, "LineOut Right");
ret |= snd_soc_dapm_disable_pin(dapm, "Vibra 1");
ret |= snd_soc_dapm_disable_pin(dapm, "Vibra 2");
ret |= snd_soc_dapm_disable_pin(dapm, "Mic 1");
ret |= snd_soc_dapm_disable_pin(dapm, "Mic 2");
ret |= snd_soc_dapm_disable_pin(dapm, "LineIn Left");
ret |= snd_soc_dapm_disable_pin(dapm, "LineIn Right");
ret |= snd_soc_dapm_disable_pin(dapm, "DMic 1");
ret |= snd_soc_dapm_disable_pin(dapm, "DMic 2");
ret |= snd_soc_dapm_disable_pin(dapm, "DMic 3");
ret |= snd_soc_dapm_disable_pin(dapm, "DMic 4");
ret |= snd_soc_dapm_disable_pin(dapm, "DMic 5");
ret |= snd_soc_dapm_disable_pin(dapm, "DMic 6");

return ret;
}
Expand Down

0 comments on commit ff096ea

Please sign in to comment.