diff options
| author | roger nilsson <roger.xr.nilsson@stericsson.com> | 2011-11-09 13:15:31 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:05:00 +0200 |
| commit | 1c666609904fbf980c3e9aa0d05996f3d7239248 (patch) | |
| tree | 99e4957800b3332a2bb31f933c527f33fc38febb /sound | |
| parent | 22f5cda8231d0deed3bec25a0c842c968433d0f4 (diff) | |
ASoC: Ux500: Power toggle moved to DAPM re-visited
The toggling of power for the AB8500, including turning
audio regulator and audio clock on/off is now moved to
be a part of the DAPM-chain.
Some widgets were related to the wrong stream.
ST-Ericsson ID: 352421
ST-Ericsson Linux next: NA
ST-Ericsson FOSS-OUT ID: Trivial
Signed-off-by: roger nilsson <roger.xr.nilsson@stericsson.com>
Change-Id: Ibfb0361f2c34e7114fd5480735084a525eb402cf
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/37056
Reviewed-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com>
Tested-by: Roger NILSSON1 <roger.xr.nilsson@stericsson.com>
Reviewed-by: QATOOLS
Reviewed-by: QABUILD
Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/ab8500_audio.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/sound/soc/codecs/ab8500_audio.c b/sound/soc/codecs/ab8500_audio.c index 8d719e7950a..f3d49202b3c 100644 --- a/sound/soc/codecs/ab8500_audio.c +++ b/sound/soc/codecs/ab8500_audio.c @@ -883,7 +883,7 @@ static const struct snd_soc_dapm_widget ab8500_dapm_widgets[] = { /* DA/AD */ SND_SOC_DAPM_INPUT("ADC Input"), - SND_SOC_DAPM_DAC("ADC", "ab8500_0c", SND_SOC_NOPM, 0, 0), + SND_SOC_DAPM_ADC("ADC", "ab8500_0c", SND_SOC_NOPM, 0, 0), SND_SOC_DAPM_DAC("DAC", "ab8500_0p", SND_SOC_NOPM, 0, 0), SND_SOC_DAPM_OUTPUT("DAC Output"), @@ -905,9 +905,9 @@ static const struct snd_soc_dapm_widget ab8500_dapm_widgets[] = { SND_SOC_DAPM_SUPPLY("Charge Pump", REG_ANACONF5, REG_ANACONF5_ENCPHS, 0, NULL, 0), - SND_SOC_DAPM_DAC("DA1 Enable", "ab8500_0c", + SND_SOC_DAPM_DAC("DA1 Enable", "ab8500_0p", REG_DAPATHENA, REG_DAPATHENA_ENDA1, 0), - SND_SOC_DAPM_DAC("DA2 Enable", "ab8500_0c", + SND_SOC_DAPM_DAC("DA2 Enable", "ab8500_0p", REG_DAPATHENA, REG_DAPATHENA_ENDA2, 0), SND_SOC_DAPM_SWITCH("Headset Left", SND_SOC_NOPM, 0, 0, dapm_hsl_mute), @@ -916,17 +916,17 @@ static const struct snd_soc_dapm_widget ab8500_dapm_widgets[] = { SND_SOC_DAPM_PGA("HSL Digital Gain", SND_SOC_NOPM, 0, 0, NULL, 0), SND_SOC_DAPM_PGA("HSR Digital Gain", SND_SOC_NOPM, 0, 0, NULL, 0), - SND_SOC_DAPM_DAC("HSL DAC", "ab8500_0c", + SND_SOC_DAPM_DAC("HSL DAC", "ab8500_0p", REG_DAPATHCONF, REG_DAPATHCONF_ENDACHSL, 0), - SND_SOC_DAPM_DAC("HSR DAC", "ab8500_0c", + SND_SOC_DAPM_DAC("HSR DAC", "ab8500_0p", REG_DAPATHCONF, REG_DAPATHCONF_ENDACHSR, 0), SND_SOC_DAPM_MIXER("HSL DAC Mute", REG_MUTECONF, REG_MUTECONF_MUTDACHSL, INVERT, NULL, 0), SND_SOC_DAPM_MIXER("HSR DAC Mute", REG_MUTECONF, REG_MUTECONF_MUTDACHSR, INVERT, NULL, 0), - SND_SOC_DAPM_DAC("HSL DAC Driver", "ab8500_0c", + SND_SOC_DAPM_DAC("HSL DAC Driver", "ab8500_0p", REG_ANACONF3, REG_ANACONF3_ENDRVHSL, 0), - SND_SOC_DAPM_DAC("HSR DAC Driver", "ab8500_0c", + SND_SOC_DAPM_DAC("HSR DAC Driver", "ab8500_0p", REG_ANACONF3, REG_ANACONF3_ENDRVHSR, 0), SND_SOC_DAPM_MIXER("HSL Mute", REG_MUTECONF, REG_MUTECONF_MUTHSL, @@ -1132,8 +1132,6 @@ static const struct snd_soc_dapm_widget ab8500_dapm_widgets[] = { SND_SOC_DAPM_MIXER("AD4 Enable", REG_ADPATHENA, REG_ADPATHENA_ENAD34, 0, NULL, 0), - SND_SOC_DAPM_AIF_OUT("AD_OUT4", "ab8500_0c", 0, SND_SOC_NOPM, 0, 0), - /* LineIn Bypass path */ SND_SOC_DAPM_MIXER("LINL to HSL Gain", SND_SOC_NOPM, 0, 0, NULL, 0), |