diff options
| author | Johan Bohlin <johan.bohlin@stericsson.com> | 2012-02-21 14:05:33 +0100 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-05-22 11:05:06 +0200 |
| commit | 85d6cc09d321f313f4c10bb0011b76475cf7e407 (patch) | |
| tree | 3f0d7e8e598cb75b7e17c2d5e1863c274cd60aa7 /sound/soc/ux500 | |
| parent | b6b7e8e064cfd15b9358de9a61160d609b830bc4 (diff) | |
ASoC: Ux500: Adds d2d support for linein to headset & speaker
Adds support for device to device connections between linein to
headset and linein to speaker. This modification required that some
playback and capture switches needed to be removed, therefore to make
it homogenous all input/output playback/capture switches were removed.
ST-Ericsson ID: 358725
ST-Ericsson Linux next: Not tested
ST-Ericsson FOSS-OUT ID: Trivial
Change-Id: I9bbd795b3fba76d6f008a07436bcb4c5c5d6e804
Signed-off-by: Johan Bohlin <johan.bohlin@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/50085
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Reviewed-by: QABUILD
Reviewed-by: QATEST
Reviewed-by: Ola LILJA2 <ola.o.lilja@stericsson.com>
Diffstat (limited to 'sound/soc/ux500')
| -rw-r--r-- | sound/soc/ux500/ux500_ab8500.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sound/soc/ux500/ux500_ab8500.c b/sound/soc/ux500/ux500_ab8500.c index 452564f3e5c..4f1a3170d74 100644 --- a/sound/soc/ux500/ux500_ab8500.c +++ b/sound/soc/ux500/ux500_ab8500.c @@ -575,6 +575,10 @@ static const struct snd_soc_dapm_route ux500_ab8500_dapm_intercon[] = { {"DAC", NULL, "AUDIO Regulator"}, {"ADC", NULL, "AUDIO Regulator"}, + /* Power AB8500 audio-block when LineIn is active */ + {"LINL Enable", NULL, "AUDIO Regulator"}, + {"LINR Enable", NULL, "AUDIO Regulator"}, + /* Power configured regulator when an analog mic is enabled */ {"MIC1A Input", NULL, "AMIC1A Regulator"}, {"MIC1B Input", NULL, "AMIC1B Regulator"}, |