diff options
| author | Koen Kooi <koen@openembedded.org> | 2009-01-19 09:07:44 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2009-01-19 09:07:44 +0100 |
| commit | 1fbae05c3880ddf8b2b1e08142accc2d47ee5340 (patch) | |
| tree | 8a9cf6638787fcf5c32076a10730271a378b733e /packages/linux/linux-omap-2.6.28/revert-XCCR.patch | |
| parent | d75554b56020d36644123702fd4248236b20afad (diff) | |
linux-omap 2.6.28: update to head of 2.6.28 branch
Diffstat (limited to 'packages/linux/linux-omap-2.6.28/revert-XCCR.patch')
| -rw-r--r-- | packages/linux/linux-omap-2.6.28/revert-XCCR.patch | 45 |
1 files changed, 45 insertions, 0 deletions
diff --git a/packages/linux/linux-omap-2.6.28/revert-XCCR.patch b/packages/linux/linux-omap-2.6.28/revert-XCCR.patch new file mode 100644 index 0000000000..fe9a91fe21 --- /dev/null +++ b/packages/linux/linux-omap-2.6.28/revert-XCCR.patch @@ -0,0 +1,45 @@ +diff --git a/arch/arm/plat-omap/include/mach/mcbsp.h b/arch/arm/plat-omap/include/mach/mcbsp.h +index 113c246..c727e89 100644 +--- a/arch/arm/plat-omap/include/mach/mcbsp.h ++++ b/arch/arm/plat-omap/include/mach/mcbsp.h +@@ -235,16 +235,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 + +@@ -276,8 +271,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 e5842e3..6d70d2f 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); + |