Messages in this thread | | | Date | Wed, 8 May 2013 09:19:37 +0100 | From | Lee Jones <> | Subject | Re: [PATCH 5/6] ASoC: ux500: Swap even/odd AD slot definitions |
| |
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 <fabio.baltieri@linaro.org> > --- > 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.org>
-- 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/
| |