aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-26 11:43:44 -0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-09-26 14:16:26 -0400
commitc922cc4c1cc3c0253adec36bb7088eab7c2269c5 (patch)
treee0408919dd5300f19928946fe2113f217131a871 /sound
parent9bb684442cf48c0e0736f5902f112c4f39ee3677 (diff)
ASoC: arizona: Add more DSP options for mixer input muxes
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/arizona.c36
-rw-r--r--sound/soc/codecs/arizona.h2
2 files changed, 37 insertions, 1 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c
index c167c896eaee..5764960087bc 100644
--- a/sound/soc/codecs/arizona.c
+++ b/sound/soc/codecs/arizona.c
@@ -119,6 +119,24 @@ const char *arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS] = {
119 "DSP1.4", 119 "DSP1.4",
120 "DSP1.5", 120 "DSP1.5",
121 "DSP1.6", 121 "DSP1.6",
122 "DSP2.1",
123 "DSP2.2",
124 "DSP2.3",
125 "DSP2.4",
126 "DSP2.5",
127 "DSP2.6",
128 "DSP3.1",
129 "DSP3.2",
130 "DSP3.3",
131 "DSP3.4",
132 "DSP3.5",
133 "DSP3.6",
134 "DSP4.1",
135 "DSP4.2",
136 "DSP4.3",
137 "DSP4.4",
138 "DSP4.5",
139 "DSP4.6",
122 "ASRC1L", 140 "ASRC1L",
123 "ASRC1R", 141 "ASRC1R",
124 "ASRC2L", 142 "ASRC2L",
@@ -180,6 +198,24 @@ int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS] = {
180 0x6b, 198 0x6b,
181 0x6c, 199 0x6c,
182 0x6d, 200 0x6d,
201 0x70, /* DSP2.1 */
202 0x71,
203 0x72,
204 0x73,
205 0x74,
206 0x75,
207 0x78, /* DSP3.1 */
208 0x79,
209 0x7a,
210 0x7b,
211 0x7c,
212 0x7d,
213 0x80, /* DSP4.1 */
214 0x81,
215 0x82,
216 0x83,
217 0x84,
218 0x85,
183 0x90, /* ASRC1L */ 219 0x90, /* ASRC1L */
184 0x91, 220 0x91,
185 0x92, 221 0x92,
diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h
index eb66b52777c9..36ec64946120 100644
--- a/sound/soc/codecs/arizona.h
+++ b/sound/soc/codecs/arizona.h
@@ -61,7 +61,7 @@ struct arizona_priv {
61 struct arizona_dai_priv dai[ARIZONA_MAX_DAI]; 61 struct arizona_dai_priv dai[ARIZONA_MAX_DAI];
62}; 62};
63 63
64#define ARIZONA_NUM_MIXER_INPUTS 57 64#define ARIZONA_NUM_MIXER_INPUTS 75
65 65
66extern const unsigned int arizona_mixer_tlv[]; 66extern const unsigned int arizona_mixer_tlv[];
67extern const char *arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS]; 67extern const char *arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS];