diff options
| -rw-r--r-- | Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt | 1 | ||||
| -rw-r--r-- | sound/soc/tegra/tegra_max98090.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt index c949abc2992f..c3495beba358 100644 --- a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt +++ b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt | |||
| @@ -18,6 +18,7 @@ Required properties: | |||
| 18 | * Headphones | 18 | * Headphones |
| 19 | * Speakers | 19 | * Speakers |
| 20 | * Mic Jack | 20 | * Mic Jack |
| 21 | * Int Mic | ||
| 21 | 22 | ||
| 22 | - nvidia,i2s-controller : The phandle of the Tegra I2S controller that's | 23 | - nvidia,i2s-controller : The phandle of the Tegra I2S controller that's |
| 23 | connected to the CODEC. | 24 | connected to the CODEC. |
diff --git a/sound/soc/tegra/tegra_max98090.c b/sound/soc/tegra/tegra_max98090.c index 8df71a436f11..29ea87cd852e 100644 --- a/sound/soc/tegra/tegra_max98090.c +++ b/sound/soc/tegra/tegra_max98090.c | |||
| @@ -133,11 +133,13 @@ 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[] = { |
| 139 | SOC_DAPM_PIN_SWITCH("Headphones"), | 140 | SOC_DAPM_PIN_SWITCH("Headphones"), |
| 140 | SOC_DAPM_PIN_SWITCH("Speakers"), | 141 | SOC_DAPM_PIN_SWITCH("Speakers"), |
| 142 | SOC_DAPM_PIN_SWITCH("Int Mic"), | ||
| 141 | }; | 143 | }; |
| 142 | 144 | ||
| 143 | static int tegra_max98090_asoc_init(struct snd_soc_pcm_runtime *rtd) | 145 | static int tegra_max98090_asoc_init(struct snd_soc_pcm_runtime *rtd) |
