diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 12:56:46 (GMT) |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-12 12:56:46 (GMT) |
commit | 1f21be1e6904fb6602b7b3795909e3abcc6a69fc (patch) | |
tree | 9f3c3ad80bb6b5127d0f0da4470bcfd6b072c54a /sound/soc | |
parent | fdce39bd05e82b3a2b9d558089872a6809189b44 (diff) | |
parent | f1ca493b0b5e8f42d3b2dc8877860db2983f47b6 (diff) | |
download | linux-1f21be1e6904fb6602b7b3795909e3abcc6a69fc.tar.xz |
Merge remote-tracking branch 'asoc/fix/wm8903' into asoc-next
Diffstat (limited to 'sound/soc')
-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 134e41c..f8a31ad 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[] = { { "ROP", NULL, "Right Speaker PGA" }, { "RON", NULL, "Right Speaker PGA" }, + { "Charge Pump", NULL, "CLK_DSP" }, + { "Left Headphone Output PGA", NULL, "Charge Pump" }, { "Right Headphone Output PGA", NULL, "Charge Pump" }, { "Left Line Output PGA", NULL, "Charge Pump" }, |