aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@nokia.com>2010-05-12 03:35:36 -0400
committerLiam Girdwood <lrg@slimlogic.co.uk>2010-05-12 04:58:26 -0400
commit36aeff6146925025033e2bcd45fa1e9725bc4599 (patch)
tree04b7b9d0b46bbf46f9bea820672bf2e714a099ae /sound/soc
parent6a2f1ee1f9bb5346644105c9355e9e06f6a847d3 (diff)
ASoC: TWL4030: Add control for digimic Left Right swap
The codec has support for swapping the left and right channels in the digimic interface. New kcontrol to handle this bit. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound/soc')
-rw-r--r--sound/soc/codecs/twl4030.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 0fe74d1e2c5f..6a34f562b563 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -1102,6 +1102,16 @@ static const struct soc_enum twl4030_vibradir_enum =
1102 ARRAY_SIZE(twl4030_vibradir_texts), 1102 ARRAY_SIZE(twl4030_vibradir_texts),
1103 twl4030_vibradir_texts); 1103 twl4030_vibradir_texts);
1104 1104
1105/* Digimic Left and right swapping */
1106static const char *twl4030_digimicswap_texts[] = {
1107 "Not swapped", "Swapped",
1108};
1109
1110static const struct soc_enum twl4030_digimicswap_enum =
1111 SOC_ENUM_SINGLE(TWL4030_REG_MISC_SET_1, 0,
1112 ARRAY_SIZE(twl4030_digimicswap_texts),
1113 twl4030_digimicswap_texts);
1114
1105static const struct snd_kcontrol_new twl4030_snd_controls[] = { 1115static const struct snd_kcontrol_new twl4030_snd_controls[] = {
1106 /* Codec operation mode control */ 1116 /* Codec operation mode control */
1107 SOC_ENUM_EXT("Codec Operation Mode", twl4030_op_modes_enum, 1117 SOC_ENUM_EXT("Codec Operation Mode", twl4030_op_modes_enum,
@@ -1178,6 +1188,8 @@ static const struct snd_kcontrol_new twl4030_snd_controls[] = {
1178 1188
1179 SOC_ENUM("Vibra H-bridge mode", twl4030_vibradirmode_enum), 1189 SOC_ENUM("Vibra H-bridge mode", twl4030_vibradirmode_enum),
1180 SOC_ENUM("Vibra H-bridge direction", twl4030_vibradir_enum), 1190 SOC_ENUM("Vibra H-bridge direction", twl4030_vibradir_enum),
1191
1192 SOC_ENUM("Digimic LR Swap", twl4030_digimicswap_enum),
1181}; 1193};
1182 1194
1183static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = { 1195static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {