diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/tegra/tegra_max98090.c | 4 | ||||
-rw-r--r-- | sound/soc/tegra/tegra_rt5677.c | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sound/soc/tegra/tegra_max98090.c b/sound/soc/tegra/tegra_max98090.c index 6760f0ebc133..902da36581d1 100644 --- a/sound/soc/tegra/tegra_max98090.c +++ b/sound/soc/tegra/tegra_max98090.c | |||
@@ -133,10 +133,14 @@ static const struct snd_soc_dapm_widget tegra_max98090_dapm_widgets[] = { | |||
133 | SND_SOC_DAPM_HP("Headphones", NULL), | 133 | SND_SOC_DAPM_HP("Headphones", NULL), |
134 | SND_SOC_DAPM_SPK("Speakers", NULL), | 134 | SND_SOC_DAPM_SPK("Speakers", NULL), |
135 | SND_SOC_DAPM_MIC("Mic Jack", NULL), | 135 | SND_SOC_DAPM_MIC("Mic Jack", NULL), |
136 | SND_SOC_DAPM_MIC("Int Mic", NULL), | ||
136 | }; | 137 | }; |
137 | 138 | ||
138 | static const struct snd_kcontrol_new tegra_max98090_controls[] = { | 139 | static const struct snd_kcontrol_new tegra_max98090_controls[] = { |
140 | SOC_DAPM_PIN_SWITCH("Headphones"), | ||
139 | SOC_DAPM_PIN_SWITCH("Speakers"), | 141 | SOC_DAPM_PIN_SWITCH("Speakers"), |
142 | SOC_DAPM_PIN_SWITCH("Mic Jack"), | ||
143 | SOC_DAPM_PIN_SWITCH("Int Mic"), | ||
140 | }; | 144 | }; |
141 | 145 | ||
142 | static int tegra_max98090_asoc_init(struct snd_soc_pcm_runtime *rtd) | 146 | static int tegra_max98090_asoc_init(struct snd_soc_pcm_runtime *rtd) |
diff --git a/sound/soc/tegra/tegra_rt5677.c b/sound/soc/tegra/tegra_rt5677.c index 68d8b67e79c1..d082882547dd 100644 --- a/sound/soc/tegra/tegra_rt5677.c +++ b/sound/soc/tegra/tegra_rt5677.c | |||
@@ -329,7 +329,6 @@ static const struct of_device_id tegra_rt5677_of_match[] = { | |||
329 | static struct platform_driver tegra_rt5677_driver = { | 329 | static struct platform_driver tegra_rt5677_driver = { |
330 | .driver = { | 330 | .driver = { |
331 | .name = DRV_NAME, | 331 | .name = DRV_NAME, |
332 | .owner = THIS_MODULE, | ||
333 | .pm = &snd_soc_pm_ops, | 332 | .pm = &snd_soc_pm_ops, |
334 | .of_match_table = tegra_rt5677_of_match, | 333 | .of_match_table = tegra_rt5677_of_match, |
335 | }, | 334 | }, |