Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf1cb7eb authored by Alistair Buxton's avatar Alistair Buxton
Browse files

OMAP7XX: McBSP: Add omap850 support 



This patch is part of a series which unifies all duplicated code between
omap730 and omap850. All cpu checks are converted to cpu_is_omap7xx() and
CONFIG_ARCH_OMAP850 is added to all CONFIG_ARCH_OMAP730 checks.

Signed-off-by: default avatarAlistair Buxton <a.j.buxton@gmail.com>
Reviewed-by: default avatarZebediah C. McClure <zmc@lurian.net>
parent 39a8b086

arch/arm/mach-omap1/mcbsp.c

+3 −3
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static struct omap_mcbsp_ops omap1_mcbsp_ops = { 
	.free		= omap1_mcbsp_free,

};



#ifdef CONFIG_ARCH_OMAP730

#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)

static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = {

	{

		.phys_base	= OMAP730_MCBSP1_BASE,
@@ -172,7 +172,7 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = { 


int __init omap1_mcbsp_init(void)

{

	if (cpu_is_omap730())

	if (cpu_is_omap7xx())

		omap_mcbsp_count = OMAP730_MCBSP_PDATA_SZ;

	if (cpu_is_omap15xx())

		omap_mcbsp_count = OMAP15XX_MCBSP_PDATA_SZ;
@@ -184,7 +184,7 @@ int __init omap1_mcbsp_init(void) 
	if (!mcbsp_ptr)

		return -ENOMEM;



	if (cpu_is_omap730())

	if (cpu_is_omap7xx())

		omap_mcbsp_register_board_cfg(omap730_mcbsp_pdata,

						OMAP730_MCBSP_PDATA_SZ);

arch/arm/plat-omap/include/mach/mcbsp.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
#define OMAP44XX_MCBSP3_BASE	0x49026000

#define OMAP44XX_MCBSP4_BASE	0x48074000



#if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP730)

#if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)



#define OMAP_MCBSP_REG_DRR2	0x00

#define OMAP_MCBSP_REG_DRR1	0x02