lkml.org 
[lkml]   [2015]   [Jan]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 11/11] ASoC: tegra: add sink for the internal mic to tegra_max98090
    Date
    This is used in the Tegra-based Chromebooks.

    Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
    ---
    Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt | 1 +
    sound/soc/tegra/tegra_max98090.c | 2 ++
    2 files changed, 3 insertions(+)

    diff --git a/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt b/Documentation/devicetree/bindings/sound/nvidia,tegra-audio-max98090.txt
    index c949abc..c3495be 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:
    * Headphones
    * Speakers
    * Mic Jack
    + * Int Mic

    - nvidia,i2s-controller : The phandle of the Tegra I2S controller that's
    connected to the CODEC.
    diff --git a/sound/soc/tegra/tegra_max98090.c b/sound/soc/tegra/tegra_max98090.c
    index 8df71a4..29ea87c 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[] = {
    SND_SOC_DAPM_HP("Headphones", NULL),
    SND_SOC_DAPM_SPK("Speakers", NULL),
    SND_SOC_DAPM_MIC("Mic Jack", NULL),
    + SND_SOC_DAPM_MIC("Int Mic", NULL),
    };

    static const struct snd_kcontrol_new tegra_max98090_controls[] = {
    SOC_DAPM_PIN_SWITCH("Headphones"),
    SOC_DAPM_PIN_SWITCH("Speakers"),
    + SOC_DAPM_PIN_SWITCH("Int Mic"),
    };

    static int tegra_max98090_asoc_init(struct snd_soc_pcm_runtime *rtd)
    --
    1.9.3


    \
     
     \ /
      Last update: 2015-01-15 17:41    [W:5.231 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site