Re: [PATCH 2/2] McBSP preamble patch for 34xx support,

[Tony Lindgren <tony@atomide.com>]

Hi,

* chandra shekhar <x0044955@ti.com> [080808 09:07]:
> Hi,
> 
> this patch modifies the read write function to do
> 16/32 bit read write depending on CPU.
> 
> Regards,
> Chandra Shekhar
> 
> Signed-off-by: Chandra Shekhar< x0044955@ti.com>
> ---
>  arch/arm/mach-omap1/mcbsp.c       |    1 +
>  arch/arm/mach-omap2/mcbsp.c       |    3 +++
>  arch/arm/plat-omap/mcbsp.c        |   24 +++++++++++++++++++++++-
>  include/asm-arm/arch-omap/mcbsp.h |    5 +----
>  4 files changed, 28 insertions(+), 5 deletions(-)
> 
> Index: linux-omap-2.6/arch/arm/mach-omap1/mcbsp.c
> ===================================================================
> --- linux-omap-2.6.orig/arch/arm/mach-omap1/mcbsp.c	2008-08-07
> 16:40:14.000000000 +0530
> +++ linux-omap-2.6/arch/arm/mach-omap1/mcbsp.c	2008-08-07 16:46:30.000000000 +0530
> @@ -248,6 +248,7 @@
>  								GFP_KERNEL);
>  	if (!mcbsp_ptr)
>  		return -ENOMEM;
> +	mcbsp_32_bit_ops = 0;
> 
>  	if (cpu_is_omap730())
>  		omap_mcbsp_register_board_cfg(omap730_mcbsp_pdata,
> Index: linux-omap-2.6/arch/arm/mach-omap2/mcbsp.c
> ===================================================================
> --- linux-omap-2.6.orig/arch/arm/mach-omap2/mcbsp.c	2008-08-07
> 16:41:17.000000000 +0530
> +++ linux-omap-2.6/arch/arm/mach-omap2/mcbsp.c	2008-08-07 16:50:53.000000000 +0530
> @@ -232,6 +232,7 @@
> 
>  	if (cpu_is_omap24xx())
>  		omap_mcbsp_count = OMAP24XX_MCBSP_PDATA_SZ;
> +
>  	if (cpu_is_omap34xx())
>  		omap_mcbsp_count = OMAP34XX_MCBSP_PDATA_SZ;
> 
> @@ -246,6 +247,8 @@
>  	if (cpu_is_omap34xx())
>  		omap_mcbsp_register_board_cfg(omap34xx_mcbsp_pdata,
>  						OMAP34XX_MCBSP_PDATA_SZ);
> +	if (!cpu_is_omap2420())
> +		mcbsp_32_bit_ops = 1;
> 
>  	return omap_mcbsp_init();
>  }
> Index: linux-omap-2.6/arch/arm/plat-omap/mcbsp.c
> ===================================================================
> --- linux-omap-2.6.orig/arch/arm/plat-omap/mcbsp.c	2008-08-07
> 16:39:51.000000000 +0530
> +++ linux-omap-2.6/arch/arm/plat-omap/mcbsp.c	2008-08-07 16:45:00.000000000 +0530
> @@ -29,9 +29,31 @@
> 
>  struct omap_mcbsp **mcbsp_ptr;
>  int omap_mcbsp_count;
> +int mcbsp_32_bit_ops;
> +
> +void omap_mcbsp_write(u32 io_base, u16 reg, u32 val)
> +{
> +	if (!mcbsp_32_bit_ops)
> +		__raw_writew((u16)val, io_base + reg);
> +	else
> +		__raw_writel(val, io_base + reg);
> +}
> +
> +int omap_mcbsp_read(u32 io_base, u16 reg)
> +{
> +	if (!mcbsp_32_bit_ops)
> +		return __raw_readw(io_base + reg);
> +	else
> +		return __raw_readl(io_base + reg);
> +}
> +

The 16 vs 32-bit test above would be better done with cpu_is_omap2420()
than setting mcbsp_32_bit_ops. If 2420 is not selected, the test gets
optimized out as cpu_is_omap2420() is defined as 0.

Regards,

Tony


> +#define OMAP_MCBSP_READ(base, reg) \
> +			omap_mcbsp_read(base, OMAP_MCBSP_REG_##reg)
> +#define OMAP_MCBSP_WRITE(base, reg, val) \
> +			omap_mcbsp_write(base, OMAP_MCBSP_REG_##reg, val)
> 
>  #define omap_mcbsp_check_valid_id(id)	(id < omap_mcbsp_count)
> -#define id_to_mcbsp_ptr(id)			mcbsp_ptr[id];
> +#define id_to_mcbsp_ptr(id)		mcbsp_ptr[id];
> 
>  static void omap_mcbsp_dump_reg(u8 id)
>  {
> Index: linux-omap-2.6/include/asm-arm/arch-omap/mcbsp.h
> ===================================================================
> --- linux-omap-2.6.orig/include/asm-arm/arch-omap/mcbsp.h	2008-08-07
> 16:41:17.000000000 +0530
> +++ linux-omap-2.6/include/asm-arm/arch-omap/mcbsp.h	2008-08-07
> 16:45:00.000000000 +0530
> @@ -139,10 +139,6 @@
> 
>  #endif
> 
> -#define OMAP_MCBSP_READ(base, reg)		__raw_readw((base) + OMAP_MCBSP_REG_##reg)
> -#define OMAP_MCBSP_WRITE(base, reg, val)	__raw_writew((val), (base) +
> OMAP_MCBSP_REG_##reg)
> -
> -
>  /************************** McBSP SPCR1 bit definitions ***********************/
>  #define RRST			0x0001
>  #define RRDY			0x0002
> @@ -369,6 +365,7 @@
>  };
>  extern struct omap_mcbsp **mcbsp_ptr;
>  extern int omap_mcbsp_count;
> +extern int mcbsp_32_bit_ops;
> 
>  int omap_mcbsp_init(void);
>  void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html