Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753353Ab3EHITq (ORCPT ); Wed, 8 May 2013 04:19:46 -0400 Received: from mail-ea0-f176.google.com ([209.85.215.176]:39865 "EHLO mail-ea0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753235Ab3EHITn (ORCPT ); Wed, 8 May 2013 04:19:43 -0400 Date: Wed, 8 May 2013 09:19:37 +0100 From: Lee Jones To: Fabio Baltieri Cc: Mark Brown , Liam Girdwood , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Linus Walleij , Ola Lilja Subject: Re: [PATCH 5/6] ASoC: ux500: Swap even/odd AD slot definitions Message-ID: <20130508081937.GJ3102@gmail.com> References: <1367997261-32048-1-git-send-email-fabio.baltieri@linaro.org> <1367997261-32048-6-git-send-email-fabio.baltieri@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <1367997261-32048-6-git-send-email-fabio.baltieri@linaro.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3259 Lines: 71 On Wed, 08 May 2013, Fabio Baltieri wrote: > AD slots definitions for ab8500 codec were erroneously swapped between > even and odd channels. Fix this by swapping the definitions to be > coherent with the channel number. > > Signed-off-by: Fabio Baltieri > --- > sound/soc/codecs/ab8500-codec.h | 36 ++++++++++++++++++------------------ > 1 file changed, 18 insertions(+), 18 deletions(-) > > diff --git a/sound/soc/codecs/ab8500-codec.h b/sound/soc/codecs/ab8500-codec.h > index 114f69a..306d0bc 100644 > --- a/sound/soc/codecs/ab8500-codec.h > +++ b/sound/soc/codecs/ab8500-codec.h > @@ -348,25 +348,25 @@ > > /* AB8500_ADSLOTSELX */ > #define AB8500_ADSLOTSELX_AD_OUT1_TO_SLOT_ODD 0x00 > -#define AB8500_ADSLOTSELX_AD_OUT2_TO_SLOT_ODD 0x01 > -#define AB8500_ADSLOTSELX_AD_OUT3_TO_SLOT_ODD 0x02 > -#define AB8500_ADSLOTSELX_AD_OUT4_TO_SLOT_ODD 0x03 > -#define AB8500_ADSLOTSELX_AD_OUT5_TO_SLOT_ODD 0x04 > -#define AB8500_ADSLOTSELX_AD_OUT6_TO_SLOT_ODD 0x05 > -#define AB8500_ADSLOTSELX_AD_OUT7_TO_SLOT_ODD 0x06 > -#define AB8500_ADSLOTSELX_AD_OUT8_TO_SLOT_ODD 0x07 > -#define AB8500_ADSLOTSELX_ZEROES_TO_SLOT_ODD 0x08 > -#define AB8500_ADSLOTSELX_TRISTATE_TO_SLOT_ODD 0x0F > +#define AB8500_ADSLOTSELX_AD_OUT2_TO_SLOT_ODD 0x10 > +#define AB8500_ADSLOTSELX_AD_OUT3_TO_SLOT_ODD 0x20 > +#define AB8500_ADSLOTSELX_AD_OUT4_TO_SLOT_ODD 0x30 > +#define AB8500_ADSLOTSELX_AD_OUT5_TO_SLOT_ODD 0x40 > +#define AB8500_ADSLOTSELX_AD_OUT6_TO_SLOT_ODD 0x50 > +#define AB8500_ADSLOTSELX_AD_OUT7_TO_SLOT_ODD 0x60 > +#define AB8500_ADSLOTSELX_AD_OUT8_TO_SLOT_ODD 0x70 > +#define AB8500_ADSLOTSELX_ZEROES_TO_SLOT_ODD 0x80 > +#define AB8500_ADSLOTSELX_TRISTATE_TO_SLOT_ODD 0xF0 > #define AB8500_ADSLOTSELX_AD_OUT1_TO_SLOT_EVEN 0x00 > -#define AB8500_ADSLOTSELX_AD_OUT2_TO_SLOT_EVEN 0x10 > -#define AB8500_ADSLOTSELX_AD_OUT3_TO_SLOT_EVEN 0x20 > -#define AB8500_ADSLOTSELX_AD_OUT4_TO_SLOT_EVEN 0x30 > -#define AB8500_ADSLOTSELX_AD_OUT5_TO_SLOT_EVEN 0x40 > -#define AB8500_ADSLOTSELX_AD_OUT6_TO_SLOT_EVEN 0x50 > -#define AB8500_ADSLOTSELX_AD_OUT7_TO_SLOT_EVEN 0x60 > -#define AB8500_ADSLOTSELX_AD_OUT8_TO_SLOT_EVEN 0x70 > -#define AB8500_ADSLOTSELX_ZEROES_TO_SLOT_EVEN 0x80 > -#define AB8500_ADSLOTSELX_TRISTATE_TO_SLOT_EVEN 0xF0 > +#define AB8500_ADSLOTSELX_AD_OUT2_TO_SLOT_EVEN 0x01 > +#define AB8500_ADSLOTSELX_AD_OUT3_TO_SLOT_EVEN 0x02 > +#define AB8500_ADSLOTSELX_AD_OUT4_TO_SLOT_EVEN 0x03 > +#define AB8500_ADSLOTSELX_AD_OUT5_TO_SLOT_EVEN 0x04 > +#define AB8500_ADSLOTSELX_AD_OUT6_TO_SLOT_EVEN 0x05 > +#define AB8500_ADSLOTSELX_AD_OUT7_TO_SLOT_EVEN 0x06 > +#define AB8500_ADSLOTSELX_AD_OUT8_TO_SLOT_EVEN 0x07 > +#define AB8500_ADSLOTSELX_ZEROES_TO_SLOT_EVEN 0x08 > +#define AB8500_ADSLOTSELX_TRISTATE_TO_SLOT_EVEN 0x0F > #define AB8500_ADSLOTSELX_EVEN_SHIFT 0 > #define AB8500_ADSLOTSELX_ODD_SHIFT 4 Acked-by: Lee Jones -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog -- 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/