diff options
| author | Fabio Baltieri <fabio.baltieri@linaro.org> | 2013-05-08 09:14:16 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-12 22:06:10 +0400 |
| commit | b9600b4b1cf8b8f06b6a5d025eff160f41950485 (patch) | |
| tree | 949479529d7892af03cbf4a3ef2d65c129a3e499 /sound/soc/codecs/ab8500-codec.c | |
| parent | 2e8e3880a15efacd21d68f77546ccd09f5e99521 (diff) | |
| download | lwn-b9600b4b1cf8b8f06b6a5d025eff160f41950485.tar.gz lwn-b9600b4b1cf8b8f06b6a5d025eff160f41950485.zip | |
ASoC: ab8500-codec: Add missing ad_to_slot definitions
According to the AB8500 user manual AD to Slot register multiplexer
accept values from 0 to 15 where:
0 to 7 corresponds to AD_OUTx slots
8 to 11 corresponds to zero output
12 to 15 sets the output in tristate mode
Update enum_ad_to_slot_map array to reflect this definition.
This also allows alsamixer to properly display the default
configuration, as all controls are set to tristate (=12) at reset.
Signed-off-by: Fabio Baltieri <fabio.baltieri@linaro.org>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/ab8500-codec.c')
| -rw-r--r-- | sound/soc/codecs/ab8500-codec.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c index a153b168129b..3126cac7b7c8 100644 --- a/sound/soc/codecs/ab8500-codec.c +++ b/sound/soc/codecs/ab8500-codec.c @@ -1496,6 +1496,12 @@ static const char * const enum_ad_to_slot_map[] = {"AD_OUT1", "AD_OUT7", "AD_OUT8", "zeroes", + "zeroes", + "zeroes", + "zeroes", + "tristate", + "tristate", + "tristate", "tristate"}; static SOC_ENUM_SINGLE_DECL(soc_enum_adslot0map, AB8500_ADSLOTSEL1, AB8500_ADSLOTSELX_EVEN_SHIFT, |