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

Commit 3cf32bba authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Tony Lindgren
Browse files

OMAP: McBSP: Convert McBSP to platform device model 



Implement McBSP as platform device and add support for
registering through platform device layer using resource
structures.

Later in this patch series, OMAP2+ McBSP driver would be modified to
use hwmod framework after populating the omap2+ hwmod database.

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: default avatarJarkko Nikula <jhnikula@gmail.com>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent cd503802

arch/arm/mach-omap1/mcbsp.c

+259 −68
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ 
 *

 *

 * Multichannel mode not supported.

 * Multichannel mode not supported.

 */

 */

#include <linux/ioport.h>

#include <linux/module.h>

#include <linux/module.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/clk.h>

#include <linux/clk.h>
@@ -78,100 +79,288 @@ static struct omap_mcbsp_ops omap1_mcbsp_ops = { 
};

};





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

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

struct resource omap7xx_mcbsp_res[][6] = {

	{

		{

			.start = OMAP7XX_MCBSP1_BASE,

			.end   = OMAP7XX_MCBSP1_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_7XX_McBSP1RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_7XX_McBSP1TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP_DMA_MCBSP1_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP_DMA_MCBSP1_TX,

			.flags = IORESOURCE_DMA,

		},

	},

	{

		{

			.start = OMAP7XX_MCBSP2_BASE,

			.end   = OMAP7XX_MCBSP2_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_7XX_McBSP2RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_7XX_McBSP2TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP_DMA_MCBSP3_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP_DMA_MCBSP3_TX,

			.flags = IORESOURCE_DMA,

		},

	},

};



static struct omap_mcbsp_platform_data omap7xx_mcbsp_pdata[] = {

static struct omap_mcbsp_platform_data omap7xx_mcbsp_pdata[] = {

	{

	{

		.phys_base	= OMAP7XX_MCBSP1_BASE,

		.dma_rx_sync	= OMAP_DMA_MCBSP1_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP1_TX,

		.rx_irq		= INT_7XX_McBSP1RX,

		.tx_irq		= INT_7XX_McBSP1TX,

		.ops		= &omap1_mcbsp_ops,

		.ops		= &omap1_mcbsp_ops,

	},

	},

	{

	{

		.phys_base	= OMAP7XX_MCBSP2_BASE,

		.dma_rx_sync	= OMAP_DMA_MCBSP3_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP3_TX,

		.rx_irq		= INT_7XX_McBSP2RX,

		.tx_irq		= INT_7XX_McBSP2TX,

		.ops		= &omap1_mcbsp_ops,

		.ops		= &omap1_mcbsp_ops,

	},

	},

};

};

#define OMAP7XX_MCBSP_PDATA_SZ		ARRAY_SIZE(omap7xx_mcbsp_pdata)

#define OMAP7XX_MCBSP_RES_SZ		ARRAY_SIZE(omap7xx_mcbsp_res[1])

#define OMAP7XX_MCBSP_REG_NUM		(OMAP_MCBSP_REG_XCERH / sizeof(u16) + 1)

#define OMAP7XX_MCBSP_COUNT		ARRAY_SIZE(omap7xx_mcbsp_res)

#else

#else

#define omap7xx_mcbsp_res		NULL

#define omap7xx_mcbsp_pdata		NULL

#define omap7xx_mcbsp_pdata		NULL

#define OMAP7XX_MCBSP_PDATA_SZ		0

#define OMAP7XX_MCBSP_RES_SZ		0

#define OMAP7XX_MCBSP_REG_NUM		0

#define OMAP7XX_MCBSP_COUNT		0

#endif

#endif





#ifdef CONFIG_ARCH_OMAP15XX

#ifdef CONFIG_ARCH_OMAP15XX

struct resource omap15xx_mcbsp_res[][6] = {

	{

		{

			.start = OMAP1510_MCBSP1_BASE,

			.end   = OMAP1510_MCBSP1_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_McBSP1RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_McBSP1TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP_DMA_MCBSP1_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP_DMA_MCBSP1_TX,

			.flags = IORESOURCE_DMA,

		},

	},

	{

		{

			.start = OMAP1510_MCBSP2_BASE,

			.end   = OMAP1510_MCBSP2_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_1510_SPI_RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_1510_SPI_TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP_DMA_MCBSP2_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP_DMA_MCBSP2_TX,

			.flags = IORESOURCE_DMA,

		},

	},

	{

		{

			.start = OMAP1510_MCBSP3_BASE,

			.end   = OMAP1510_MCBSP3_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_McBSP3RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_McBSP3TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP_DMA_MCBSP3_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP_DMA_MCBSP3_TX,

			.flags = IORESOURCE_DMA,

		},

	},

};



static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = {

static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = {

	{

	{

		.phys_base	= OMAP1510_MCBSP1_BASE,

		.dma_rx_sync	= OMAP_DMA_MCBSP1_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP1_TX,

		.rx_irq		= INT_McBSP1RX,

		.tx_irq		= INT_McBSP1TX,

		.ops		= &omap1_mcbsp_ops,

		.ops		= &omap1_mcbsp_ops,

	},

	},

	{

	{

		.phys_base	= OMAP1510_MCBSP2_BASE,

		.dma_rx_sync	= OMAP_DMA_MCBSP2_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP2_TX,

		.rx_irq		= INT_1510_SPI_RX,

		.tx_irq		= INT_1510_SPI_TX,

		.ops		= &omap1_mcbsp_ops,

		.ops		= &omap1_mcbsp_ops,

	},

	},

	{

	{

		.phys_base	= OMAP1510_MCBSP3_BASE,

		.dma_rx_sync	= OMAP_DMA_MCBSP3_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP3_TX,

		.rx_irq		= INT_McBSP3RX,

		.tx_irq		= INT_McBSP3TX,

		.ops		= &omap1_mcbsp_ops,

		.ops		= &omap1_mcbsp_ops,

	},

	},

};

};

#define OMAP15XX_MCBSP_PDATA_SZ		ARRAY_SIZE(omap15xx_mcbsp_pdata)

#define OMAP15XX_MCBSP_RES_SZ		ARRAY_SIZE(omap15xx_mcbsp_res[1])

#define OMAP15XX_MCBSP_REG_NUM		(OMAP_MCBSP_REG_XCERH / sizeof(u16) + 1)

#define OMAP15XX_MCBSP_COUNT		ARRAY_SIZE(omap15xx_mcbsp_res)

#else

#else

#define omap15xx_mcbsp_res		NULL

#define omap15xx_mcbsp_pdata		NULL

#define omap15xx_mcbsp_pdata		NULL

#define OMAP15XX_MCBSP_PDATA_SZ		0

#define OMAP15XX_MCBSP_RES_SZ		0

#define OMAP15XX_MCBSP_REG_NUM		0

#define OMAP15XX_MCBSP_COUNT		0

#endif

#endif





#ifdef CONFIG_ARCH_OMAP16XX

#ifdef CONFIG_ARCH_OMAP16XX

struct resource omap16xx_mcbsp_res[][6] = {

	{

		{

			.start = OMAP1610_MCBSP1_BASE,

			.end   = OMAP1610_MCBSP1_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_McBSP1RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_McBSP1TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP_DMA_MCBSP1_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP_DMA_MCBSP1_TX,

			.flags = IORESOURCE_DMA,

		},

	},

	{

		{

			.start = OMAP1610_MCBSP2_BASE,

			.end   = OMAP1610_MCBSP2_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_1610_McBSP2_RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_1610_McBSP2_TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP_DMA_MCBSP2_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP_DMA_MCBSP2_TX,

			.flags = IORESOURCE_DMA,

		},

	},

	{

		{

			.start = OMAP1610_MCBSP3_BASE,

			.end   = OMAP1610_MCBSP3_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_McBSP3RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_McBSP3TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP_DMA_MCBSP3_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP_DMA_MCBSP3_TX,

			.flags = IORESOURCE_DMA,

		},

	},

};



static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = {

static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = {

	{

	{

		.phys_base	= OMAP1610_MCBSP1_BASE,

		.dma_rx_sync	= OMAP_DMA_MCBSP1_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP1_TX,

		.rx_irq		= INT_McBSP1RX,

		.tx_irq		= INT_McBSP1TX,

		.ops		= &omap1_mcbsp_ops,

		.ops		= &omap1_mcbsp_ops,

	},

	},

	{

	{

		.phys_base	= OMAP1610_MCBSP2_BASE,

		.dma_rx_sync	= OMAP_DMA_MCBSP2_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP2_TX,

		.rx_irq		= INT_1610_McBSP2_RX,

		.tx_irq		= INT_1610_McBSP2_TX,

		.ops		= &omap1_mcbsp_ops,

		.ops		= &omap1_mcbsp_ops,

	},

	},

	{

	{

		.phys_base	= OMAP1610_MCBSP3_BASE,

		.dma_rx_sync	= OMAP_DMA_MCBSP3_RX,

		.dma_tx_sync	= OMAP_DMA_MCBSP3_TX,

		.rx_irq		= INT_McBSP3RX,

		.tx_irq		= INT_McBSP3TX,

		.ops		= &omap1_mcbsp_ops,

		.ops		= &omap1_mcbsp_ops,

	},

	},

};

};

#define OMAP16XX_MCBSP_PDATA_SZ		ARRAY_SIZE(omap16xx_mcbsp_pdata)

#define OMAP16XX_MCBSP_RES_SZ		ARRAY_SIZE(omap16xx_mcbsp_res[1])

#define OMAP16XX_MCBSP_REG_NUM		(OMAP_MCBSP_REG_XCERH / sizeof(u16) + 1)

#define OMAP16XX_MCBSP_COUNT		ARRAY_SIZE(omap16xx_mcbsp_res)

#else

#else

#define omap16xx_mcbsp_res		NULL

#define omap16xx_mcbsp_pdata		NULL

#define omap16xx_mcbsp_pdata		NULL

#define OMAP16XX_MCBSP_PDATA_SZ		0

#define OMAP16XX_MCBSP_RES_SZ		0

#define OMAP16XX_MCBSP_REG_NUM		0

#define OMAP16XX_MCBSP_COUNT		0

#endif

#endif





static int __init omap1_mcbsp_init(void)

static int __init omap1_mcbsp_init(void)
@@ -179,16 +368,12 @@ static int __init omap1_mcbsp_init(void) 
	if (!cpu_class_is_omap1())

	if (!cpu_class_is_omap1())

		return -ENODEV;

		return -ENODEV;





	if (cpu_is_omap7xx()) {

	if (cpu_is_omap7xx())

		omap_mcbsp_count = OMAP7XX_MCBSP_PDATA_SZ;

		omap_mcbsp_count = OMAP7XX_MCBSP_COUNT;

		omap_mcbsp_cache_size = OMAP7XX_MCBSP_REG_NUM * sizeof(u16);

	else if (cpu_is_omap15xx())

	} else if (cpu_is_omap15xx()) {

		omap_mcbsp_count = OMAP15XX_MCBSP_COUNT;

		omap_mcbsp_count = OMAP15XX_MCBSP_PDATA_SZ;

	else if (cpu_is_omap16xx())

		omap_mcbsp_cache_size = OMAP15XX_MCBSP_REG_NUM * sizeof(u16);

		omap_mcbsp_count = OMAP16XX_MCBSP_COUNT;

	} else if (cpu_is_omap16xx()) {

		omap_mcbsp_count = OMAP16XX_MCBSP_PDATA_SZ;

		omap_mcbsp_cache_size = OMAP16XX_MCBSP_REG_NUM * sizeof(u16);

	}





	mcbsp_ptr = kzalloc(omap_mcbsp_count * sizeof(struct omap_mcbsp *),

	mcbsp_ptr = kzalloc(omap_mcbsp_count * sizeof(struct omap_mcbsp *),

								GFP_KERNEL);

								GFP_KERNEL);
@@ -196,16 +381,22 @@ static int __init omap1_mcbsp_init(void) 
		return -ENOMEM;

		return -ENOMEM;





	if (cpu_is_omap7xx())

	if (cpu_is_omap7xx())

		omap_mcbsp_register_board_cfg(omap7xx_mcbsp_pdata,

		omap_mcbsp_register_board_cfg(omap7xx_mcbsp_res[0],

						OMAP7XX_MCBSP_PDATA_SZ);

					OMAP7XX_MCBSP_RES_SZ,

					omap7xx_mcbsp_pdata,

					OMAP7XX_MCBSP_COUNT);





	if (cpu_is_omap15xx())

	if (cpu_is_omap15xx())

		omap_mcbsp_register_board_cfg(omap15xx_mcbsp_pdata,

		omap_mcbsp_register_board_cfg(omap15xx_mcbsp_res[0],

						OMAP15XX_MCBSP_PDATA_SZ);

					OMAP15XX_MCBSP_RES_SZ,

					omap15xx_mcbsp_pdata,

					OMAP15XX_MCBSP_COUNT);





	if (cpu_is_omap16xx())

	if (cpu_is_omap16xx())

		omap_mcbsp_register_board_cfg(omap16xx_mcbsp_pdata,

		omap_mcbsp_register_board_cfg(omap16xx_mcbsp_res[0],

						OMAP16XX_MCBSP_PDATA_SZ);

					OMAP16XX_MCBSP_RES_SZ,

					omap16xx_mcbsp_pdata,

					OMAP16XX_MCBSP_COUNT);





	return omap_mcbsp_init();

	return omap_mcbsp_init();

}

}

arch/arm/mach-omap2/mcbsp.c

+495 −118

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/plat-omap/devices.c

+6 −4
Original line number Original line Diff line number Diff line
@@ -35,8 +35,8 @@ 




static struct platform_device **omap_mcbsp_devices;

static struct platform_device **omap_mcbsp_devices;





void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,

void omap_mcbsp_register_board_cfg(struct resource *res, int res_count,

					int size)

			struct omap_mcbsp_platform_data *config, int size)

{

{

	int i;

	int i;
@@ -54,6 +54,8 @@ void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config, 
		new_mcbsp = platform_device_alloc("omap-mcbsp", i + 1);

		new_mcbsp = platform_device_alloc("omap-mcbsp", i + 1);

		if (!new_mcbsp)

		if (!new_mcbsp)

			continue;

			continue;

		platform_device_add_resources(new_mcbsp, &res[i * res_count],

					res_count);

		new_mcbsp->dev.platform_data = &config[i];

		new_mcbsp->dev.platform_data = &config[i];

		ret = platform_device_add(new_mcbsp);

		ret = platform_device_add(new_mcbsp);

		if (ret) {

		if (ret) {
@@ -65,8 +67,8 @@ void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config, 
}

}





#else

#else

void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,

void omap_mcbsp_register_board_cfg(struct resource *res, int res_count,

					int size)

			struct omap_mcbsp_platform_data *config, int size)

{  }

{  }

#endif

#endif

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

+9 −5
Original line number Original line Diff line number Diff line
@@ -63,9 +63,12 @@ static struct platform_device omap_mcbsp##port_nr = { \ 
#define OMAP34XX_MCBSP4_BASE	0x49026000

#define OMAP34XX_MCBSP4_BASE	0x49026000

#define OMAP34XX_MCBSP5_BASE	0x48096000

#define OMAP34XX_MCBSP5_BASE	0x48096000





#define OMAP44XX_MCBSP1_BASE	0x49022000

#define OMAP44XX_MCBSP1_BASE	0x40122000

#define OMAP44XX_MCBSP2_BASE	0x49024000

#define OMAP44XX_MCBSP1_DMA_BASE	0x49022000

#define OMAP44XX_MCBSP3_BASE	0x49026000

#define OMAP44XX_MCBSP2_BASE	0x40124000

#define OMAP44XX_MCBSP2_DMA_BASE	0x49024000

#define OMAP44XX_MCBSP3_BASE	0x40126000

#define OMAP44XX_MCBSP3_DMA_BASE	0x49026000

#define OMAP44XX_MCBSP4_BASE	0x48096000

#define OMAP44XX_MCBSP4_BASE	0x48096000





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

#if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
@@ -431,6 +434,7 @@ struct omap_mcbsp_st_data { 
struct omap_mcbsp {

struct omap_mcbsp {

	struct device *dev;

	struct device *dev;

	unsigned long phys_base;

	unsigned long phys_base;

	unsigned long phys_dma_base;

	void __iomem *io_base;

	void __iomem *io_base;

	u8 id;

	u8 id;

	u8 free;

	u8 free;
@@ -474,8 +478,8 @@ extern int omap_mcbsp_count, omap_mcbsp_cache_size; 
#define id_to_mcbsp_ptr(id)		mcbsp_ptr[id];

#define id_to_mcbsp_ptr(id)		mcbsp_ptr[id];





int omap_mcbsp_init(void);

int omap_mcbsp_init(void);

void omap_mcbsp_register_board_cfg(struct omap_mcbsp_platform_data *config,

void omap_mcbsp_register_board_cfg(struct resource *res, int res_count,

					int size);

			struct omap_mcbsp_platform_data *config, int size);

void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg * config);

void omap_mcbsp_config(unsigned int id, const struct omap_mcbsp_reg_cfg * config);

#ifdef CONFIG_ARCH_OMAP3

#ifdef CONFIG_ARCH_OMAP3

void omap_mcbsp_set_tx_threshold(unsigned int id, u16 threshold);

void omap_mcbsp_set_tx_threshold(unsigned int id, u16 threshold);

arch/arm/plat-omap/mcbsp.c

+49 −10
Original line number Original line Diff line number Diff line
@@ -1649,7 +1649,8 @@ static const struct attribute_group sidetone_attr_group = { 




static int __devinit omap_st_add(struct omap_mcbsp *mcbsp)

static int __devinit omap_st_add(struct omap_mcbsp *mcbsp)

{

{

	struct omap_mcbsp_platform_data *pdata = mcbsp->pdata;

	struct platform_device *pdev;

	struct resource *res;

	struct omap_mcbsp_st_data *st_data;

	struct omap_mcbsp_st_data *st_data;

	int err;

	int err;
@@ -1659,7 +1660,10 @@ static int __devinit omap_st_add(struct omap_mcbsp *mcbsp) 
		goto err1;

		goto err1;

	}

	}





	st_data->io_base_st = ioremap(pdata->phys_base_st, SZ_4K);

	pdev = container_of(mcbsp->dev, struct platform_device, dev);



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "sidetone");

	st_data->io_base_st = ioremap(res->start, resource_size(res));

	if (!st_data->io_base_st) {

	if (!st_data->io_base_st) {

		err = -ENOMEM;

		err = -ENOMEM;

		goto err2;

		goto err2;
@@ -1748,6 +1752,7 @@ static int __devinit omap_mcbsp_probe(struct platform_device *pdev) 
	struct omap_mcbsp_platform_data *pdata = pdev->dev.platform_data;

	struct omap_mcbsp_platform_data *pdata = pdev->dev.platform_data;

	struct omap_mcbsp *mcbsp;

	struct omap_mcbsp *mcbsp;

	int id = pdev->id - 1;

	int id = pdev->id - 1;

	struct resource *res;

	int ret = 0;

	int ret = 0;





	if (!pdata) {

	if (!pdata) {
@@ -1777,25 +1782,59 @@ static int __devinit omap_mcbsp_probe(struct platform_device *pdev) 
	mcbsp->dma_tx_lch = -1;

	mcbsp->dma_tx_lch = -1;

	mcbsp->dma_rx_lch = -1;

	mcbsp->dma_rx_lch = -1;





	mcbsp->phys_base = pdata->phys_base;

	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mpu");

	mcbsp->io_base = ioremap(pdata->phys_base, SZ_4K);

	if (!res) {

		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

		if (!res) {

			dev_err(&pdev->dev, "%s:mcbsp%d has invalid memory"

					"resource\n", __func__, pdev->id);

			ret = -ENOMEM;

			goto exit;

		}

	}

	mcbsp->phys_base = res->start;

	omap_mcbsp_cache_size = resource_size(res);

	mcbsp->io_base = ioremap(res->start, resource_size(res));

	if (!mcbsp->io_base) {

	if (!mcbsp->io_base) {

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto err_ioremap;

		goto err_ioremap;

	}

	}





	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "dma");

	if (!res)

		mcbsp->phys_dma_base = mcbsp->phys_base;

	else

		mcbsp->phys_dma_base = res->start;



	/* Default I/O is IRQ based */

	/* Default I/O is IRQ based */

	mcbsp->io_type = OMAP_MCBSP_IRQ_IO;

	mcbsp->io_type = OMAP_MCBSP_IRQ_IO;

	mcbsp->tx_irq = pdata->tx_irq;



	mcbsp->rx_irq = pdata->rx_irq;

	mcbsp->tx_irq = platform_get_irq_byname(pdev, "tx");

	mcbsp->dma_rx_sync = pdata->dma_rx_sync;

	mcbsp->rx_irq = platform_get_irq_byname(pdev, "rx");

	mcbsp->dma_tx_sync = pdata->dma_tx_sync;



	res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "rx");

	if (!res) {

		dev_err(&pdev->dev, "%s:mcbsp%d has invalid rx DMA channel\n",

					__func__, pdev->id);

		ret = -ENODEV;

		goto err_res;

	}

	mcbsp->dma_rx_sync = res->start;



	res = platform_get_resource_byname(pdev, IORESOURCE_DMA, "tx");

	if (!res) {

		dev_err(&pdev->dev, "%s:mcbsp%d has invalid tx DMA channel\n",

					__func__, pdev->id);

		ret = -ENODEV;

		goto err_res;

	}

	mcbsp->dma_tx_sync = res->start;





	mcbsp->iclk = clk_get(&pdev->dev, "ick");

	mcbsp->iclk = clk_get(&pdev->dev, "ick");

	if (IS_ERR(mcbsp->iclk)) {

	if (IS_ERR(mcbsp->iclk)) {

		ret = PTR_ERR(mcbsp->iclk);

		ret = PTR_ERR(mcbsp->iclk);

		dev_err(&pdev->dev, "unable to get ick: %d\n", ret);

		dev_err(&pdev->dev, "unable to get ick: %d\n", ret);

		goto err_iclk;

		goto err_res;

	}

	}





	mcbsp->fclk = clk_get(&pdev->dev, "fck");

	mcbsp->fclk = clk_get(&pdev->dev, "fck");
@@ -1817,7 +1856,7 @@ static int __devinit omap_mcbsp_probe(struct platform_device *pdev) 




err_fclk:

err_fclk:

	clk_put(mcbsp->iclk);

	clk_put(mcbsp->iclk);

err_iclk:

err_res:

	iounmap(mcbsp->io_base);

	iounmap(mcbsp->io_base);

err_ioremap:

err_ioremap:

	kfree(mcbsp);

	kfree(mcbsp);