Update ab8500-codec and mop500_ab8500 tx slot configuration to reflect the actual one used by STE. Also update a wrong comment in the process.
Signed-off-by: Fabio Baltieri fabio.baltieri@linaro.org --- sound/soc/codecs/ab8500-codec.c | 20 ++++++++++---------- sound/soc/ux500/mop500_ab8500.c | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/sound/soc/codecs/ab8500-codec.c b/sound/soc/codecs/ab8500-codec.c index 3126cac..7c026d4 100644 --- a/sound/soc/codecs/ab8500-codec.c +++ b/sound/soc/codecs/ab8500-codec.c @@ -2300,18 +2300,18 @@ static int ab8500_codec_set_dai_tdm_slot(struct snd_soc_dai *dai, case 0: break; case 1: - /* Slot 9 -> DA_IN1 & DA_IN3 */ - snd_soc_update_bits(codec, AB8500_DASLOTCONF1, mask, 11); - snd_soc_update_bits(codec, AB8500_DASLOTCONF3, mask, 11); - snd_soc_update_bits(codec, AB8500_DASLOTCONF2, mask, 11); - snd_soc_update_bits(codec, AB8500_DASLOTCONF4, mask, 11); + /* Slot 8 -> DA_IN1 to DA_IN4 */ + snd_soc_update_bits(codec, AB8500_DASLOTCONF1, mask, 8); + snd_soc_update_bits(codec, AB8500_DASLOTCONF3, mask, 8); + snd_soc_update_bits(codec, AB8500_DASLOTCONF2, mask, 8); + snd_soc_update_bits(codec, AB8500_DASLOTCONF4, mask, 8); break; case 2: - /* Slot 9 -> DA_IN1 & DA_IN3, Slot 11 -> DA_IN2 & DA_IN4 */ - snd_soc_update_bits(codec, AB8500_DASLOTCONF1, mask, 9); - snd_soc_update_bits(codec, AB8500_DASLOTCONF3, mask, 9); - snd_soc_update_bits(codec, AB8500_DASLOTCONF2, mask, 11); - snd_soc_update_bits(codec, AB8500_DASLOTCONF4, mask, 11); + /* Slot 8 -> DA_IN1 & DA_IN3, Slot 9 -> DA_IN2 & DA_IN4 */ + snd_soc_update_bits(codec, AB8500_DASLOTCONF1, mask, 8); + snd_soc_update_bits(codec, AB8500_DASLOTCONF3, mask, 8); + snd_soc_update_bits(codec, AB8500_DASLOTCONF2, mask, 9); + snd_soc_update_bits(codec, AB8500_DASLOTCONF4, mask, 9);
break; case 8: diff --git a/sound/soc/ux500/mop500_ab8500.c b/sound/soc/ux500/mop500_ab8500.c index 4606194..44899f7 100644 --- a/sound/soc/ux500/mop500_ab8500.c +++ b/sound/soc/ux500/mop500_ab8500.c @@ -28,8 +28,8 @@ #include "ux500_msp_dai.h" #include "../codecs/ab8500-codec.h"
-#define TX_SLOT_MONO 0x0008 -#define TX_SLOT_STEREO 0x000a +#define TX_SLOT_MONO 0x0001 +#define TX_SLOT_STEREO 0x0003 #define RX_SLOT_MONO 0x0001 #define RX_SLOT_STEREO 0x0003 #define TX_SLOT_8CH 0x00FF