Skip to content

Commit

Permalink
Merge remote-tracking branch 'asoc/topic/tegra' into asoc-next
Browse files Browse the repository at this point in the history
  • Loading branch information
@broonie
broonie committed Jun 3, 2014
2 parents 39b47b5 + fb6b8e7 commit 3253944
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 14 deletions.
16 changes: 13 additions & 3 deletions sound/soc/tegra/tegra_alc5632.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,18 @@ static int tegra_alc5632_asoc_init(struct snd_soc_pcm_runtime *rtd)
return 0;
}

static int tegra_alc5632_card_remove(struct snd_soc_card *card)
{
struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(card);

if (gpio_is_valid(machine->gpio_hp_det)) {
snd_soc_jack_free_gpios(&tegra_alc5632_hs_jack, 1,
&tegra_alc5632_hp_jack_gpio);
}

return 0;
}

static struct snd_soc_dai_link tegra_alc5632_dai = {
.name = "ALC5632",
.stream_name = "ALC5632 PCM",
Expand All @@ -139,6 +151,7 @@ static struct snd_soc_dai_link tegra_alc5632_dai = {
static struct snd_soc_card snd_soc_tegra_alc5632 = {
.name = "tegra-alc5632",
.owner = THIS_MODULE,
.remove = tegra_alc5632_card_remove,
.dai_link = &tegra_alc5632_dai,
.num_links = 1,
.controls = tegra_alc5632_controls,
Expand Down Expand Up @@ -223,9 +236,6 @@ static int tegra_alc5632_remove(struct platform_device *pdev)
struct snd_soc_card *card = platform_get_drvdata(pdev);
struct tegra_alc5632 *machine = snd_soc_card_get_drvdata(card);

snd_soc_jack_free_gpios(&tegra_alc5632_hs_jack, 1,
&tegra_alc5632_hp_jack_gpio);

snd_soc_unregister_card(card);

tegra_asoc_utils_fini(&machine->util_data);
Expand Down
16 changes: 13 additions & 3 deletions sound/soc/tegra/tegra_max98090.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,18 @@ static int tegra_max98090_asoc_init(struct snd_soc_pcm_runtime *rtd)
return 0;
}

static int tegra_max98090_card_remove(struct snd_soc_card *card)
{
struct tegra_max98090 *machine = snd_soc_card_get_drvdata(card);

if (gpio_is_valid(machine->gpio_hp_det)) {
snd_soc_jack_free_gpios(&tegra_max98090_hp_jack, 1,
&tegra_max98090_hp_jack_gpio);
}

return 0;
}

static struct snd_soc_dai_link tegra_max98090_dai = {
.name = "max98090",
.stream_name = "max98090 PCM",
Expand All @@ -158,6 +170,7 @@ static struct snd_soc_dai_link tegra_max98090_dai = {
static struct snd_soc_card snd_soc_tegra_max98090 = {
.name = "tegra-max98090",
.owner = THIS_MODULE,
.remove = tegra_max98090_card_remove,
.dai_link = &tegra_max98090_dai,
.num_links = 1,
.controls = tegra_max98090_controls,
Expand Down Expand Up @@ -241,9 +254,6 @@ static int tegra_max98090_remove(struct platform_device *pdev)
struct snd_soc_card *card = platform_get_drvdata(pdev);
struct tegra_max98090 *machine = snd_soc_card_get_drvdata(card);

snd_soc_jack_free_gpios(&tegra_max98090_hp_jack, 1,
&tegra_max98090_hp_jack_gpio);

snd_soc_unregister_card(card);

tegra_asoc_utils_fini(&machine->util_data);
Expand Down
16 changes: 13 additions & 3 deletions sound/soc/tegra/tegra_rt5640.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,18 @@ static int tegra_rt5640_asoc_init(struct snd_soc_pcm_runtime *rtd)
return 0;
}

static int tegra_rt5640_card_remove(struct snd_soc_card *card)
{
struct tegra_rt5640 *machine = snd_soc_card_get_drvdata(card);

if (gpio_is_valid(machine->gpio_hp_det)) {
snd_soc_jack_free_gpios(&tegra_rt5640_hp_jack, 1,
&tegra_rt5640_hp_jack_gpio);
}

return 0;
}

static struct snd_soc_dai_link tegra_rt5640_dai = {
.name = "RT5640",
.stream_name = "RT5640 PCM",
Expand All @@ -141,6 +153,7 @@ static struct snd_soc_dai_link tegra_rt5640_dai = {
static struct snd_soc_card snd_soc_tegra_rt5640 = {
.name = "tegra-rt5640",
.owner = THIS_MODULE,
.remove = tegra_rt5640_card_remove,
.dai_link = &tegra_rt5640_dai,
.num_links = 1,
.controls = tegra_rt5640_controls,
Expand Down Expand Up @@ -224,9 +237,6 @@ static int tegra_rt5640_remove(struct platform_device *pdev)
struct snd_soc_card *card = platform_get_drvdata(pdev);
struct tegra_rt5640 *machine = snd_soc_card_get_drvdata(card);

snd_soc_jack_free_gpios(&tegra_rt5640_hp_jack, 1,
&tegra_rt5640_hp_jack_gpio);

snd_soc_unregister_card(card);

tegra_asoc_utils_fini(&machine->util_data);
Expand Down
11 changes: 6 additions & 5 deletions sound/soc/tegra/tegra_wm8903.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,12 @@ static int tegra_wm8903_remove(struct snd_soc_card *card)
struct snd_soc_pcm_runtime *rtd = &(card->rtd[0]);
struct snd_soc_dai *codec_dai = rtd->codec_dai;
struct snd_soc_codec *codec = codec_dai->codec;
struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);

if (gpio_is_valid(machine->gpio_hp_det)) {
snd_soc_jack_free_gpios(&tegra_wm8903_hp_jack, 1,
&tegra_wm8903_hp_jack_gpio);
}

wm8903_mic_detect(codec, NULL, 0, 0);

Expand All @@ -228,9 +234,7 @@ static struct snd_soc_card snd_soc_tegra_wm8903 = {
.owner = THIS_MODULE,
.dai_link = &tegra_wm8903_dai,
.num_links = 1,

.remove = tegra_wm8903_remove,

.controls = tegra_wm8903_controls,
.num_controls = ARRAY_SIZE(tegra_wm8903_controls),
.dapm_widgets = tegra_wm8903_dapm_widgets,
Expand Down Expand Up @@ -368,9 +372,6 @@ static int tegra_wm8903_driver_remove(struct platform_device *pdev)
struct snd_soc_card *card = platform_get_drvdata(pdev);
struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card);

snd_soc_jack_free_gpios(&tegra_wm8903_hp_jack, 1,
&tegra_wm8903_hp_jack_gpio);

snd_soc_unregister_card(card);

tegra_asoc_utils_fini(&machine->util_data);
Expand Down

0 comments on commit 3253944

Please sign in to comment.