Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753703Ab3EHHPZ (ORCPT ); Wed, 8 May 2013 03:15:25 -0400 Received: from mail-wg0-f51.google.com ([74.125.82.51]:40660 "EHLO mail-wg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753111Ab3EHHPX (ORCPT ); Wed, 8 May 2013 03:15:23 -0400 From: Fabio Baltieri To: Mark Brown , Liam Girdwood Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Linus Walleij , Lee Jones , Ola Lilja , Fabio Baltieri Subject: [PATCH 4/6] ASoC: ux500: Update tx tdm slots configuration Date: Wed, 8 May 2013 09:14:19 +0200 Message-Id: <1367997261-32048-5-git-send-email-fabio.baltieri@linaro.org> X-Mailer: git-send-email 1.8.2 In-Reply-To: <1367997261-32048-1-git-send-email-fabio.baltieri@linaro.org> References: <1367997261-32048-1-git-send-email-fabio.baltieri@linaro.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2605 Lines: 65 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 --- 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 -- 1.8.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/