On Mon, 31 Jan 2011 20:20:37 +0530 Kishon Vijay Abraham I <[email protected]> wrote:
> Information like base address and DMA channel nubers should no longer > be obtained using macros. These information should be obtained from > hwmod database. Hence the macros that define the base address are removed. > > Signed-off-by: Kishon Vijay Abraham I <[email protected]> > Signed-off-by: Charulatha V <[email protected]> > --- > arch/arm/mach-omap1/mcbsp.c | 64 +++++++++++++++--------------- > arch/arm/plat-omap/include/plat/mcbsp.h | 50 +----------------------- > 2 files changed, 33 insertions(+), 81 deletions(-) > > diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c > index 2b89ebd..d90f649 100644 > --- a/arch/arm/mach-omap1/mcbsp.c > +++ b/arch/arm/mach-omap1/mcbsp.c > @@ -83,14 +83,14 @@ struct resource omap7xx_mcbsp_res[][6] = { > { > { > .name = "mpu", > - .start = OMAP7XX_MCBSP1_BASE, > - .end = OMAP7XX_MCBSP1_BASE + SZ_256, > + .start = 0xfffb1000, > + .end = 0xfffb10ff, For these changes I don't see immediate reason as they reduce readability. Is this better to do outside of this set together with a patch that adds these into hwmod database etc? > -#define AUDIO_MCBSP_DATAWRITE (OMAP1510_MCBSP1_BASE + > OMAP_MCBSP_REG_DXR1) > -#define AUDIO_MCBSP_DATAREAD (OMAP1510_MCBSP1_BASE + OMAP_MCBSP_REG_DRR1) > - > -#define AUDIO_MCBSP OMAP_MCBSP1 > -#define AUDIO_DMA_TX OMAP_DMA_MCBSP1_TX > -#define AUDIO_DMA_RX OMAP_DMA_MCBSP1_RX > - > #else > > #define OMAP_MCBSP_REG_DRR2 0x00 > @@ -177,13 +136,6 @@ static struct platform_device omap_mcbsp##port_nr = { > \ > #define OMAP_ST_REG_SFIRCR 0x28 > #define OMAP_ST_REG_SSELCR 0x2C > > -#define AUDIO_MCBSP_DATAWRITE (OMAP24XX_MCBSP2_BASE + > OMAP_MCBSP_REG_DXR1) > -#define AUDIO_MCBSP_DATAREAD (OMAP24XX_MCBSP2_BASE + OMAP_MCBSP_REG_DRR1) > - > -#define AUDIO_MCBSP OMAP_MCBSP2 > -#define AUDIO_DMA_TX OMAP24XX_DMA_MCBSP2_TX > -#define AUDIO_DMA_RX OMAP24XX_DMA_MCBSP2_RX > - These looks things that can be removed immediately and independently from this set. -- Jarkko -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
