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

Commit 64bcbd33 authored by Kishon Vijay Abraham I's avatar Kishon Vijay Abraham I Committed by Tony Lindgren
Browse files

OMAP2+: McBSP: hwmod adaptation for McBSP 



Modify OMAP2+ McBSP to use omap hwmod framework APIs

Signed-off-by: default avatarKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: default avatarCharulatha V <charu@ti.com>
Signed-off-by: default avatarShubhrajyoti D <shubhrajyoti@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 8b1906f1

arch/arm/mach-omap2/mcbsp.c

+45 −550
Original line number Original line Diff line number Diff line
@@ -22,10 +22,10 @@ 
#include <plat/dma.h>

#include <plat/dma.h>

#include <plat/cpu.h>

#include <plat/cpu.h>

#include <plat/mcbsp.h>

#include <plat/mcbsp.h>

#include <plat/omap_device.h>





#include "control.h"

#include "control.h"







/* McBSP internal signal muxing functions */

/* McBSP internal signal muxing functions */





void omap2_mcbsp1_mux_clkr_src(u8 mux)

void omap2_mcbsp1_mux_clkr_src(u8 mux)
@@ -101,573 +101,68 @@ int omap2_mcbsp_set_clks_src(u8 id, u8 fck_src_id) 
}

}

EXPORT_SYMBOL(omap2_mcbsp_set_clks_src);

EXPORT_SYMBOL(omap2_mcbsp_set_clks_src);







struct omap_device_pm_latency omap2_mcbsp_latency[] = {

/* Platform data */



#ifdef CONFIG_SOC_OMAP2420

struct resource omap2420_mcbsp_res[][6] = {

	{

		{

			.start = OMAP24XX_MCBSP1_BASE,

			.end   = OMAP24XX_MCBSP1_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_24XX_MCBSP1_IRQ_RX,

			.flags = IORESOURCE_IRQ,

		},

	{

	{

			.name  = "tx",

		.deactivate_func = omap_device_idle_hwmods,

			.start = INT_24XX_MCBSP1_IRQ_TX,

		.activate_func   = omap_device_enable_hwmods,

			.flags = IORESOURCE_IRQ,

		.flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,

		},

		{

			.name  = "rx",

			.start = OMAP24XX_DMA_MCBSP1_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP24XX_DMA_MCBSP1_TX,

			.flags = IORESOURCE_DMA,

		},

	},

	{

		{

			.start = OMAP24XX_MCBSP2_BASE,

			.end   = OMAP24XX_MCBSP2_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_24XX_MCBSP2_IRQ_RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_24XX_MCBSP2_IRQ_TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP24XX_DMA_MCBSP2_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP24XX_DMA_MCBSP2_TX,

			.flags = IORESOURCE_DMA,

		},

	},

	},

};

};

#define OMAP2420_MCBSP_RES_SZ		ARRAY_SIZE(omap2420_mcbsp_res[1])

#define OMAP2420_MCBSP_COUNT		ARRAY_SIZE(omap2420_mcbsp_res)

#else

#define omap2420_mcbsp_res		NULL

#define OMAP2420_MCBSP_RES_SZ		0

#define OMAP2420_MCBSP_COUNT		0

#endif



#define omap2420_mcbsp_pdata		NULL





#ifdef CONFIG_SOC_OMAP2430

static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused)

struct resource omap2430_mcbsp_res[][6] = {

	{

		{

			.start = OMAP24XX_MCBSP1_BASE,

			.end   = OMAP24XX_MCBSP1_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_24XX_MCBSP1_IRQ_RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_24XX_MCBSP1_IRQ_TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP24XX_DMA_MCBSP1_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP24XX_DMA_MCBSP1_TX,

			.flags = IORESOURCE_DMA,

		},

	},

	{

		{

			.start = OMAP24XX_MCBSP2_BASE,

			.end   = OMAP24XX_MCBSP2_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_24XX_MCBSP2_IRQ_RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_24XX_MCBSP2_IRQ_TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP24XX_DMA_MCBSP2_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP24XX_DMA_MCBSP2_TX,

			.flags = IORESOURCE_DMA,

		},

	},

	{

		{

			.start = OMAP2430_MCBSP3_BASE,

			.end   = OMAP2430_MCBSP3_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_24XX_MCBSP3_IRQ_RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_24XX_MCBSP3_IRQ_TX,

			.flags = IORESOURCE_IRQ,

		},

{

{

			.name  = "rx",

	int id, count = 1;

			.start = OMAP24XX_DMA_MCBSP3_RX,

	char *name = "omap-mcbsp";

			.flags = IORESOURCE_DMA,

	struct omap_hwmod *oh_device[2];

		},

	struct omap_mcbsp_platform_data *pdata = NULL;

		{

	struct omap_device *od;

			.name  = "tx",

			.start = OMAP24XX_DMA_MCBSP3_TX,

			.flags = IORESOURCE_DMA,

		},

	},

	{

		{

			.start = OMAP2430_MCBSP4_BASE,

			.end   = OMAP2430_MCBSP4_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_24XX_MCBSP4_IRQ_RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_24XX_MCBSP4_IRQ_TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP24XX_DMA_MCBSP4_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP24XX_DMA_MCBSP4_TX,

			.flags = IORESOURCE_DMA,

		},

	},

	{

		{

			.start = OMAP2430_MCBSP5_BASE,

			.end   = OMAP2430_MCBSP5_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_24XX_MCBSP5_IRQ_RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_24XX_MCBSP5_IRQ_TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP24XX_DMA_MCBSP5_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP24XX_DMA_MCBSP5_TX,

			.flags = IORESOURCE_DMA,

		},

	},

};

#define OMAP2430_MCBSP_RES_SZ		ARRAY_SIZE(omap2430_mcbsp_res[1])

#define OMAP2430_MCBSP_COUNT		ARRAY_SIZE(omap2430_mcbsp_res)

#else

#define omap2430_mcbsp_res		NULL

#define OMAP2430_MCBSP_RES_SZ		0

#define OMAP2430_MCBSP_COUNT		0

#endif





#define omap2430_mcbsp_pdata		NULL

	sscanf(oh->name, "mcbsp%d", &id);





#ifdef CONFIG_ARCH_OMAP3

	pdata = kzalloc(sizeof(struct omap_mcbsp_platform_data), GFP_KERNEL);

struct resource omap34xx_mcbsp_res[][7] = {

	if (!pdata) {

	{

		pr_err("%s: No memory for mcbsp\n", __func__);

		{

		return -ENOMEM;

			.start = OMAP34XX_MCBSP1_BASE,

	}

			.end   = OMAP34XX_MCBSP1_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_24XX_MCBSP1_IRQ_RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_24XX_MCBSP1_IRQ_TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP24XX_DMA_MCBSP1_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP24XX_DMA_MCBSP1_TX,

			.flags = IORESOURCE_DMA,

		},

	},

	{

		{

			.start = OMAP34XX_MCBSP2_BASE,

			.end   = OMAP34XX_MCBSP2_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "sidetone",

			.start = OMAP34XX_MCBSP2_ST_BASE,

			.end   = OMAP34XX_MCBSP2_ST_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_24XX_MCBSP2_IRQ_RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_24XX_MCBSP2_IRQ_TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP24XX_DMA_MCBSP2_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP24XX_DMA_MCBSP2_TX,

			.flags = IORESOURCE_DMA,

		},

	},

	{

		{

			.start = OMAP34XX_MCBSP3_BASE,

			.end   = OMAP34XX_MCBSP3_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "sidetone",

			.start = OMAP34XX_MCBSP3_ST_BASE,

			.end   = OMAP34XX_MCBSP3_ST_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_24XX_MCBSP3_IRQ_RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_24XX_MCBSP3_IRQ_TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP24XX_DMA_MCBSP3_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP24XX_DMA_MCBSP3_TX,

			.flags = IORESOURCE_DMA,

		},

	},

	{

		{

			.start = OMAP34XX_MCBSP4_BASE,

			.end   = OMAP34XX_MCBSP4_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_24XX_MCBSP4_IRQ_RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_24XX_MCBSP4_IRQ_TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP24XX_DMA_MCBSP4_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP24XX_DMA_MCBSP4_TX,

			.flags = IORESOURCE_DMA,

		},

	},

	{

		{

			.start = OMAP34XX_MCBSP5_BASE,

			.end   = OMAP34XX_MCBSP5_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = INT_24XX_MCBSP5_IRQ_RX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = INT_24XX_MCBSP5_IRQ_TX,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP24XX_DMA_MCBSP5_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP24XX_DMA_MCBSP5_TX,

			.flags = IORESOURCE_DMA,

		},

	},

};





static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {

	if (oh->class->rev == MCBSP_CONFIG_TYPE3) {

	{

		if (id == 2)

		.buffer_size	= 0x80, /* The FIFO has 128 locations */

			/* The FIFO has 1024 + 256 locations */

	},

			pdata->buffer_size = 0x500;

	{

		else

		.buffer_size	= 0x500, /* The FIFO has 1024 + 256 locations */

			/* The FIFO has 128 locations */

	},

			pdata->buffer_size = 0x80;

	{

	}

		.buffer_size	= 0x80, /* The FIFO has 128 locations */

	},

	{

		.buffer_size	= 0x80, /* The FIFO has 128 locations */

	},

	{

		.buffer_size	= 0x80, /* The FIFO has 128 locations */

	},

};

#define OMAP34XX_MCBSP_RES_SZ		ARRAY_SIZE(omap34xx_mcbsp_res[1])

#define OMAP34XX_MCBSP_COUNT		ARRAY_SIZE(omap34xx_mcbsp_res)

#else

#define omap34xx_mcbsp_pdata		NULL

#define omap34XX_mcbsp_res		NULL

#define OMAP34XX_MCBSP_RES_SZ		0

#define OMAP34XX_MCBSP_COUNT		0

#endif





struct resource omap44xx_mcbsp_res[][6] = {

	oh_device[0] = oh;

	{



		{

	if (oh->dev_attr) {

			.name  = "mpu",

		oh_device[1] = omap_hwmod_lookup((

			.start = OMAP44XX_MCBSP1_BASE,

		(struct omap_mcbsp_dev_attr *)(oh->dev_attr))->sidetone);

			.end   = OMAP44XX_MCBSP1_BASE + SZ_256,

		count++;

			.flags = IORESOURCE_MEM,

	}

		},

	od = omap_device_build_ss(name, id, oh_device, count, pdata,

		{

				sizeof(*pdata), omap2_mcbsp_latency,

			.name  = "dma",

				ARRAY_SIZE(omap2_mcbsp_latency), false);

			.start = OMAP44XX_MCBSP1_DMA_BASE,

	kfree(pdata);

			.end   = OMAP44XX_MCBSP1_DMA_BASE + SZ_256,

	if (IS_ERR(od))  {

			.flags = IORESOURCE_MEM,

		pr_err("%s: Cant build omap_device for %s:%s.\n", __func__,

		},

					name, oh->name);

		{

		return PTR_ERR(od);

			.name  = "rx",

	}

			.start = 0,

	omap_mcbsp_count++;

			.flags = IORESOURCE_IRQ,

	return 0;

		},

}

		{

			.name  = "tx",

			.start = OMAP44XX_IRQ_MCBSP1,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP44XX_DMA_MCBSP1_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP44XX_DMA_MCBSP1_TX,

			.flags = IORESOURCE_DMA,

		},

	},

	{

		{

			.name  = "mpu",

			.start = OMAP44XX_MCBSP2_BASE,

			.end   = OMAP44XX_MCBSP2_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "dma",

			.start = OMAP44XX_MCBSP2_DMA_BASE,

			.end   = OMAP44XX_MCBSP2_DMA_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = 0,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = OMAP44XX_IRQ_MCBSP2,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP44XX_DMA_MCBSP2_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP44XX_DMA_MCBSP2_TX,

			.flags = IORESOURCE_DMA,

		},

	},

	{

		{

			.name  = "mpu",

			.start = OMAP44XX_MCBSP3_BASE,

			.end   = OMAP44XX_MCBSP3_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "dma",

			.start = OMAP44XX_MCBSP3_DMA_BASE,

			.end   = OMAP44XX_MCBSP3_DMA_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = 0,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = OMAP44XX_IRQ_MCBSP3,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP44XX_DMA_MCBSP3_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP44XX_DMA_MCBSP3_TX,

			.flags = IORESOURCE_DMA,

		},

	},

	{

		{

			.start = OMAP44XX_MCBSP4_BASE,

			.end   = OMAP44XX_MCBSP4_BASE + SZ_256,

			.flags = IORESOURCE_MEM,

		},

		{

			.name  = "rx",

			.start = 0,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "tx",

			.start = OMAP44XX_IRQ_MCBSP4,

			.flags = IORESOURCE_IRQ,

		},

		{

			.name  = "rx",

			.start = OMAP44XX_DMA_MCBSP4_RX,

			.flags = IORESOURCE_DMA,

		},

		{

			.name  = "tx",

			.start = OMAP44XX_DMA_MCBSP4_TX,

			.flags = IORESOURCE_DMA,

		},

	},

};

#define omap44xx_mcbsp_pdata		NULL

#define OMAP44XX_MCBSP_RES_SZ		ARRAY_SIZE(omap44xx_mcbsp_res[1])

#define OMAP44XX_MCBSP_COUNT		ARRAY_SIZE(omap44xx_mcbsp_res)





static int __init omap2_mcbsp_init(void)

static int __init omap2_mcbsp_init(void)

{

{

	if (cpu_is_omap2420())

	omap_hwmod_for_each_by_class("mcbsp", omap_init_mcbsp, NULL);

		omap_mcbsp_count = OMAP2420_MCBSP_COUNT;

	else if (cpu_is_omap2430())

		omap_mcbsp_count = OMAP2430_MCBSP_COUNT;

	else if (cpu_is_omap34xx())

		omap_mcbsp_count = OMAP34XX_MCBSP_COUNT;

	else if (cpu_is_omap44xx())

		omap_mcbsp_count = OMAP44XX_MCBSP_COUNT;





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

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

								GFP_KERNEL);

								GFP_KERNEL);

	if (!mcbsp_ptr)

	if (!mcbsp_ptr)

		return -ENOMEM;

		return -ENOMEM;





	if (cpu_is_omap2420())

		omap_mcbsp_register_board_cfg(omap2420_mcbsp_res[0],

					OMAP2420_MCBSP_RES_SZ,

					omap2420_mcbsp_pdata,

					OMAP2420_MCBSP_COUNT);

	if (cpu_is_omap2430())

		omap_mcbsp_register_board_cfg(omap2430_mcbsp_res[0],

					OMAP2420_MCBSP_RES_SZ,

					omap2430_mcbsp_pdata,

					OMAP2430_MCBSP_COUNT);

	if (cpu_is_omap34xx())

		omap_mcbsp_register_board_cfg(omap34xx_mcbsp_res[0],

					OMAP34XX_MCBSP_RES_SZ,

					omap34xx_mcbsp_pdata,

					OMAP34XX_MCBSP_COUNT);

	if (cpu_is_omap44xx())

		omap_mcbsp_register_board_cfg(omap44xx_mcbsp_res[0],

					OMAP44XX_MCBSP_RES_SZ,

					omap44xx_mcbsp_pdata,

					OMAP44XX_MCBSP_COUNT);



	return omap_mcbsp_init();

	return omap_mcbsp_init();

}

}

arch_initcall(omap2_mcbsp_init);
 
arch_initcall(omap2_mcbsp_init);

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -421,8 +421,8 @@ struct omap_mcbsp_platform_data { 
#ifdef CONFIG_ARCH_OMAP3

#ifdef CONFIG_ARCH_OMAP3

	/* Sidetone block for McBSP 2 and 3 */

	/* Sidetone block for McBSP 2 and 3 */

	unsigned long phys_base_st;

	unsigned long phys_base_st;

	u16 buffer_size;

#endif

#endif

	u16 buffer_size;

};

};





struct omap_mcbsp_st_data {

struct omap_mcbsp_st_data {