From: Tony Lindgren Date: Thu, 22 Jan 2009 23:43:13 +0000 (-0800) Subject: Revert "ARM: OMAP3: Enable writing to XCCR and RCCR McBSP registers for OMAP 2430... X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=35cfb6774dc8d0f027dd112b55e31bc6a4f81b22;p=linux-2.6-omap-h63xx.git Revert "ARM: OMAP3: Enable writing to XCCR and RCCR McBSP registers for OMAP 2430/34xx" This reverts commit 3456ef483b5322ba4a7647f024e2c5b7846cd7e3. This needs it's counterpart in in /sound/soc/omap/omap-mcbsp.c, so let's try to get both of them merged in one series. Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/plat-omap/include/mach/mcbsp.h b/arch/arm/plat-omap/include/mach/mcbsp.h index 433e8106458..9c10fe7c9d7 100644 --- a/arch/arm/plat-omap/include/mach/mcbsp.h +++ b/arch/arm/plat-omap/include/mach/mcbsp.h @@ -231,16 +231,11 @@ #define XPBBLK(value) ((value)<<7) /* Bits 7:8 */ /*********************** McBSP XCCR bit definitions *************************/ -#define EXTCLKGATE 0x8000 -#define PPCONNECT 0x4000 -#define DXENDLY(value) ((value)<<12) /* Bits 12:13 */ -#define XFULL_CYCLE 0x0800 #define DILB 0x0020 #define XDMAEN 0x0008 #define XDISABLE 0x0001 /********************** McBSP RCCR bit definitions *************************/ -#define RFULL_CYCLE 0x0800 #define RDMAEN 0x0008 #define RDISABLE 0x0001 @@ -272,8 +267,6 @@ struct omap_mcbsp_reg_cfg { u16 rcerh; u16 xcerg; u16 xcerh; - u16 xccr; - u16 rccr; }; typedef enum { diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c index e5842e30e53..6d70d2f6fc0 100644 --- a/arch/arm/plat-omap/mcbsp.c +++ b/arch/arm/plat-omap/mcbsp.c @@ -173,10 +173,6 @@ void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg *config) OMAP_MCBSP_WRITE(io_base, MCR2, config->mcr2); OMAP_MCBSP_WRITE(io_base, MCR1, config->mcr1); OMAP_MCBSP_WRITE(io_base, PCR0, config->pcr0); - if (cpu_is_omap2430() || cpu_is_omap34xx()) { - OMAP_MCBSP_WRITE(io_base, XCCR, config->xccr); - OMAP_MCBSP_WRITE(io_base, RCCR, config->rccr); - } } EXPORT_SYMBOL(omap_mcbsp_config);