From: s.hauer@pengutronix.de (Sascha Hauer) Date: Mon, 30 Nov 2009 17:03:56 +0100 Subject: [PATCH 8/9 v2] MXC: Add a digital audio multiplexer driver In-Reply-To: References: <1258022525-21078-6-git-send-email-s.hauer@pengutronix.de> <1258022525-21078-7-git-send-email-s.hauer@pengutronix.de> <1258022525-21078-8-git-send-email-s.hauer@pengutronix.de> <1258022525-21078-9-git-send-email-s.hauer@pengutronix.de> <20091112150615.GA30179@pengutronix.de> <20091130121017.GN27548@pengutronix.de> <20091130123412.GP27548@pengutronix.de> Message-ID: <20091130160356.GT27548@pengutronix.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Mon, Nov 30, 2009 at 02:09:16PM +0100, javier Martin wrote: > From fa87b65915e78ad29a8e4f3f22b26ed0fa6dc7f5 Mon Sep 17 00:00:00 2001 > > > From: Sascha Hauer > > Date: Mon, 30 Nov 2009 13:31:29 +0100 > > Subject: [PATCH] i.MX27 audmux: Fix register offsets > > > > The PPCR registers start at 0x10, not 0xc. Fix this. > > > > Signed-off-by: Sascha Hauer > > --- > > arch/arm/plat-mxc/include/mach/audmux.h | 6 +++--- > > 1 files changed, 3 insertions(+), 3 deletions(-) > > > > diff --git a/arch/arm/plat-mxc/include/mach/audmux.h > > b/arch/arm/plat-mxc/include/mach/audmux.h > > index 5cd6466..dcc12d4 100644 > > --- a/arch/arm/plat-mxc/include/mach/audmux.h > > +++ b/arch/arm/plat-mxc/include/mach/audmux.h > > @@ -4,9 +4,9 @@ > > #define MX27_AUDMUX_HPCR1_SSI0 0 > > #define MX27_AUDMUX_HPCR2_SSI1 1 > > #define MX27_AUDMUX_HPCR3_SSI_PINS_4 2 > > -#define MX27_AUDMUX_PPCR1_SSI_PINS_1 3 > > -#define MX27_AUDMUX_PPCR2_SSI_PINS_2 4 > > -#define MX27_AUDMUX_PPCR3_SSI_PINS_3 5 > > +#define MX27_AUDMUX_PPCR1_SSI_PINS_1 4 > > +#define MX27_AUDMUX_PPCR2_SSI_PINS_2 5 > > +#define MX27_AUDMUX_PPCR3_SSI_PINS_3 6 > > > > Be careful, > I think this patch breaks some of the boards currently using > MXC_AUDMUX_V1_PCR_RXDSEL(x) and similar macros defined in mach/audmux.h (for > example pcm038). > For those macros the old AUDMUX register indexes are fine. > > I suggest fixing this inside audmux_v1.c instead of modifying mach/audmux.h. Ok. The AUDMUX V1 is used on i.MX21 and i.MX27 and both have this hole in the register space, so fixing it in the driver should be safe. How about this one then? Sascha