diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-11 13:00:31 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-11 13:00:31 -0400 |
| commit | ca62bed0bbf9baf88d8bb404d72dee3b44ef057e (patch) | |
| tree | 9f3c3ad80bb6b5127d0f0da4470bcfd6b072c54a /sound | |
| parent | f255e71f3d837782e815549f32840f911e67d2b1 (diff) | |
| parent | f1ca493b0b5e8f42d3b2dc8877860db2983f47b6 (diff) | |
Merge remote-tracking branch 'asoc/fix/wm8903' into tmp
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wm8903.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c index 134e41c870b9..f8a31ad0b203 100644 --- a/sound/soc/codecs/wm8903.c +++ b/sound/soc/codecs/wm8903.c | |||
| @@ -1083,6 +1083,8 @@ static const struct snd_soc_dapm_route wm8903_intercon[] = { | |||
| 1083 | { "ROP", NULL, "Right Speaker PGA" }, | 1083 | { "ROP", NULL, "Right Speaker PGA" }, |
| 1084 | { "RON", NULL, "Right Speaker PGA" }, | 1084 | { "RON", NULL, "Right Speaker PGA" }, |
| 1085 | 1085 | ||
| 1086 | { "Charge Pump", NULL, "CLK_DSP" }, | ||
| 1087 | |||
| 1086 | { "Left Headphone Output PGA", NULL, "Charge Pump" }, | 1088 | { "Left Headphone Output PGA", NULL, "Charge Pump" }, |
| 1087 | { "Right Headphone Output PGA", NULL, "Charge Pump" }, | 1089 | { "Right Headphone Output PGA", NULL, "Charge Pump" }, |
| 1088 | { "Left Line Output PGA", NULL, "Charge Pump" }, | 1090 | { "Left Line Output PGA", NULL, "Charge Pump" }, |