Skip to content

K
Kernel

openeuler / Kernel
1 年多 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 64bcbd33 编写于 作者: K Kishon Vijay Abraham I 提交者： Tony Lindgren
浏览文件
操作

OMAP2+: McBSP: hwmod adaptation for McBSP 

Modify OMAP2+ McBSP to use omap hwmod framework APIs
Signed-off-by: NKishon Vijay Abraham I <kishon@ti.com>
Signed-off-by: NCharulatha V <charu@ti.com>
Signed-off-by: NShubhrajyoti D <shubhrajyoti@ti.com>
Acked-by: NPeter Ujfalusi <peter.ujfalusi@nokia.com>
Acked-by: NJarkko Nikula <jhnikula@gmail.com>
Acked-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: NTony Lindgren <tony@atomide.com>
上级 8b1906f1
隐藏空白更改
内联 并排
Showing with 46 addition and 551 deletion
arch/arm/mach-omap2/mcbsp.c
浏览文件 @ 64bcbd33
......@@ -22,10 +22,10 @@
#include <plat/dma.h>
#include <plat/cpu.h>
#include <plat/mcbsp.h>
#include <plat/omap_device.h>
#include "control.h"
/* McBSP internal signal muxing functions */
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);
/* Platform data */
#ifdef CONFIG_SOC_OMAP2420
struct resource omap2420_mcbsp_res[][6] = {
struct omap_device_pm_latency omap2_mcbsp_latency[] = {
{
{
.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,
},
.deactivate_func = omap_device_idle_hwmods,
.activate_func = omap_device_enable_hwmods,
.flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,
},
};
#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
static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused)
{
int id, count = 1;
char *name = "omap-mcbsp";
struct omap_hwmod *oh_device[2];
struct omap_mcbsp_platform_data *pdata = NULL;
struct omap_device *od;
#ifdef CONFIG_SOC_OMAP2430
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",
.start = OMAP24XX_DMA_MCBSP3_RX,
.flags = IORESOURCE_DMA,
},
{
.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
sscanf(oh->name, "mcbsp%d", &id);
#define omap2430_mcbsp_pdata NULL
pdata = kzalloc(sizeof(struct omap_mcbsp_platform_data), GFP_KERNEL);
if (!pdata) {
pr_err("%s: No memory for mcbsp\n", __func__);
return -ENOMEM;
}
#ifdef CONFIG_ARCH_OMAP3
struct resource omap34xx_mcbsp_res[][7] = {
{
{
.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,
},
},
};
if (oh->class->rev == MCBSP_CONFIG_TYPE3) {
if (id == 2)
/* The FIFO has 1024 + 256 locations */
pdata->buffer_size = 0x500;
else
/* The FIFO has 128 locations */
pdata->buffer_size = 0x80;
}
static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = {
{
.buffer_size = 0x80, /* The FIFO has 128 locations */
},
{
.buffer_size = 0x500, /* The FIFO has 1024 + 256 locations */
},
{
.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
oh_device[0] = oh;
struct resource omap44xx_mcbsp_res[][6] = {
{
{
.name = "mpu",
.start = OMAP44XX_MCBSP1_BASE,
.end = OMAP44XX_MCBSP1_BASE + SZ_256,
.flags = IORESOURCE_MEM,
},
{
.name = "dma",
.start = OMAP44XX_MCBSP1_DMA_BASE,
.end = OMAP44XX_MCBSP1_DMA_BASE + SZ_256,
.flags = IORESOURCE_MEM,
},
{
.name = "rx",
.start = 0,
.flags = IORESOURCE_IRQ,
},
{
.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)
if (oh->dev_attr) {
oh_device[1] = omap_hwmod_lookup((
(struct omap_mcbsp_dev_attr *)(oh->dev_attr))->sidetone);
count++;
}
od = omap_device_build_ss(name, id, oh_device, count, pdata,
sizeof(*pdata), omap2_mcbsp_latency,
ARRAY_SIZE(omap2_mcbsp_latency), false);
kfree(pdata);
if (IS_ERR(od)) {
pr_err("%s: Cant build omap_device for %s:%s.\n", __func__,
name, oh->name);
return PTR_ERR(od);
}
omap_mcbsp_count++;
return 0;
}
static int __init omap2_mcbsp_init(void)
{
if (cpu_is_omap2420())
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;
omap_hwmod_for_each_by_class("mcbsp", omap_init_mcbsp, NULL);
mcbsp_ptr = kzalloc(omap_mcbsp_count * sizeof(struct omap_mcbsp *),
GFP_KERNEL);
if (!mcbsp_ptr)
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();
}
arch_initcall(omap2_mcbsp_init);
arch/arm/plat-omap/include/plat/mcbsp.h
浏览文件 @ 64bcbd33
......@@ -421,8 +421,8 @@ struct omap_mcbsp_platform_data {
#ifdef CONFIG_ARCH_OMAP3
/* Sidetone block for McBSP 2 and 3 */
unsigned long phys_base_st;
u16 buffer_size;
#endif
u16 buffer_size;
};
struct omap_mcbsp_st_data {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或