lkml.org 
[lkml]   [2011]   [Feb]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[159/272] ASoC: Create an AIF1ADCDAT signal widget to match AIF2
    2.6.37-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Mark Brown <broonie@opensource.wolfsonmicro.com>

    commit 7f94de483f4e37e14d646ad6e85a3c82f66fb487 upstream.

    Due to the different routing for AIF1 and AIF2 we weren't using a
    single widget to represent the ADCDAT signal. For consistency add
    one.

    Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
    Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    sound/soc/codecs/wm8994.c | 14 ++++++++++----
    1 file changed, 10 insertions(+), 4 deletions(-)

    --- a/sound/soc/codecs/wm8994.c
    +++ b/sound/soc/codecs/wm8994.c
    @@ -2536,18 +2536,18 @@ SND_SOC_DAPM_SUPPLY("DSPINTCLK", WM8994_
    SND_SOC_DAPM_SUPPLY("AIF1CLK", WM8994_AIF1_CLOCKING_1, 0, 0, NULL, 0),
    SND_SOC_DAPM_SUPPLY("AIF2CLK", WM8994_AIF2_CLOCKING_1, 0, 0, NULL, 0),

    -SND_SOC_DAPM_AIF_OUT("AIF1ADC1L", "AIF1 Capture",
    +SND_SOC_DAPM_AIF_OUT("AIF1ADC1L", NULL,
    0, WM8994_POWER_MANAGEMENT_4, 9, 0),
    -SND_SOC_DAPM_AIF_OUT("AIF1ADC1R", "AIF1 Capture",
    +SND_SOC_DAPM_AIF_OUT("AIF1ADC1R", NULL,
    0, WM8994_POWER_MANAGEMENT_4, 8, 0),
    SND_SOC_DAPM_AIF_IN("AIF1DAC1L", NULL, 0,
    WM8994_POWER_MANAGEMENT_5, 9, 0),
    SND_SOC_DAPM_AIF_IN("AIF1DAC1R", NULL, 0,
    WM8994_POWER_MANAGEMENT_5, 8, 0),

    -SND_SOC_DAPM_AIF_OUT("AIF1ADC2L", "AIF1 Capture",
    +SND_SOC_DAPM_AIF_OUT("AIF1ADC2L", NULL,
    0, WM8994_POWER_MANAGEMENT_4, 11, 0),
    -SND_SOC_DAPM_AIF_OUT("AIF1ADC2R", "AIF1 Capture",
    +SND_SOC_DAPM_AIF_OUT("AIF1ADC2R", NULL,
    0, WM8994_POWER_MANAGEMENT_4, 10, 0),
    SND_SOC_DAPM_AIF_IN("AIF1DAC2L", NULL, 0,
    WM8994_POWER_MANAGEMENT_5, 11, 0),
    @@ -2588,6 +2588,7 @@ SND_SOC_DAPM_AIF_IN("AIF2DACR", NULL, 0,

    SND_SOC_DAPM_AIF_IN("AIF1DACDAT", "AIF1 Playback", 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_IN("AIF2DACDAT", "AIF2 Playback", 0, SND_SOC_NOPM, 0, 0),
    +SND_SOC_DAPM_AIF_OUT("AIF1ADCDAT", "AIF1 Capture", 0, SND_SOC_NOPM, 0, 0),
    SND_SOC_DAPM_AIF_OUT("AIF2ADCDAT", "AIF2 Capture", 0, SND_SOC_NOPM, 0, 0),

    SND_SOC_DAPM_MUX("AIF1DAC Mux", SND_SOC_NOPM, 0, 0, &aif1dac_mux),
    @@ -2783,6 +2784,11 @@ static const struct snd_soc_dapm_route i
    { "AIF2DAC2R Mixer", "Left Sidetone Switch", "Left Sidetone" },
    { "AIF2DAC2R Mixer", "Right Sidetone Switch", "Right Sidetone" },

    + { "AIF1ADCDAT", NULL, "AIF1ADC1L" },
    + { "AIF1ADCDAT", NULL, "AIF1ADC1R" },
    + { "AIF1ADCDAT", NULL, "AIF1ADC2L" },
    + { "AIF1ADCDAT", NULL, "AIF1ADC2R" },
    +
    { "AIF2ADCDAT", NULL, "AIF2ADC Mux" },

    /* AIF3 output */



    \
     
     \ /
      Last update: 2011-02-16 01:49    [W:0.022 / U:119.484 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site