Get rid of is_omap tests in omap_mcbsp_write and omap_mcbsp_read by using
register size and register step variables that are passed via platform data
Signed-off-by: Jarkko Nikula <jhnikula@xxxxxxxxx>
---
arch/arm/mach-omap1/mcbsp.c | 2 +
arch/arm/mach-omap2/mcbsp.c | 7 ++++++
arch/arm/plat-omap/include/plat/mcbsp.h | 2 +
arch/arm/plat-omap/mcbsp.c | 32 +++++++++++++++++-------------
4 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c
index 3c985ac..36ab5d8 100644
--- a/arch/arm/mach-omap1/mcbsp.c
+++ b/arch/arm/mach-omap1/mcbsp.c
@@ -391,6 +391,8 @@ static void omap_mcbsp_register_board_cfg(struct resource *res, int res_count,
continue;
platform_device_add_resources(new_mcbsp, &res[i * res_count],
res_count);
+ config[i].reg_size = 2;
+ config[i].reg_step = 2;
new_mcbsp->dev.platform_data = &config[i];
ret = platform_device_add(new_mcbsp);
if (ret) {
diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c
index 4a6ef6a..1408156 100644
--- a/arch/arm/mach-omap2/mcbsp.c
+++ b/arch/arm/mach-omap2/mcbsp.c
@@ -137,6 +137,13 @@ static int omap_init_mcbsp(struct omap_hwmod *oh, void *unused)
pdata->buffer_size = 0x80;
}
+ pdata->reg_step = 4;
+ if (oh->class->rev < MCBSP_CONFIG_TYPE2)
+ pdata->reg_size = 2;
+ else
+ pdata->reg_size = 4;
+
+
oh_device[0] = oh;
if (oh->dev_attr) {
diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/arch/arm/plat-omap/include/plat/mcbsp.h
index 2202457..31b24c9 100644
--- a/arch/arm/plat-omap/include/plat/mcbsp.h
+++ b/arch/arm/plat-omap/include/plat/mcbsp.h
@@ -320,6 +320,8 @@ struct omap_mcbsp_platform_data {
#endif
u16 buffer_size;
unsigned int mcbsp_config_type;
+ u8 reg_size;
+ u8 reg_step;
};
struct omap_mcbsp_st_data {
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c
index a7ced1b..92d6d4f 100644
--- a/arch/arm/plat-omap/mcbsp.c
+++ b/arch/arm/plat-omap/mcbsp.c
@@ -36,31 +36,35 @@ int omap_mcbsp_count, omap_mcbsp_cache_size;
static void omap_mcbsp_write(struct omap_mcbsp *mcbsp, u16 reg, u32 val)
{
- if (cpu_class_is_omap1()) {
- reg /= 2;
- ((u16 *)mcbsp->reg_cache)[reg / sizeof(u16)] = (u16)val;
- __raw_writew((u16)val, mcbsp->io_base + reg);
- } else if (cpu_is_omap2420()) {
- ((u16 *)mcbsp->reg_cache)[reg / sizeof(u32)] = (u16)val;
+ int index;
+
+ if (mcbsp->pdata->reg_size == 2 && mcbsp->pdata->reg_step == 2)
+ reg /= 2; /* Calculate OMAP1 register offset */
+
+ index = reg / mcbsp->pdata->reg_step;
+ if (mcbsp->pdata->reg_size == 2) {
+ ((u16 *)mcbsp->reg_cache)[index] = (u16)val;
__raw_writew((u16)val, mcbsp->io_base + reg);
} else {
- ((u32 *)mcbsp->reg_cache)[reg / sizeof(u32)] = val;
+ ((u32 *)mcbsp->reg_cache)[index] = val;
__raw_writel(val, mcbsp->io_base + reg);
}
}
static int omap_mcbsp_read(struct omap_mcbsp *mcbsp, u16 reg, bool from_cache)
{
- if (cpu_class_is_omap1()) {
- reg /= 2;
- return !from_cache ? __raw_readw(mcbsp->io_base + reg) :
- ((u16 *)mcbsp->reg_cache)[reg / sizeof(u16)];
- } else if (cpu_is_omap2420()) {
+ int index;
+
+ if (mcbsp->pdata->reg_size == 2 && mcbsp->pdata->reg_step == 2)
+ reg /= 2; /* Calculate OMAP1 register offset */
+
+ index = reg / mcbsp->pdata->reg_step;
+ if (mcbsp->pdata->reg_size == 2) {
return !from_cache ? __raw_readw(mcbsp->io_base + reg) :
- ((u16 *)mcbsp->reg_cache)[reg / sizeof(u32)];
+ ((u16 *)mcbsp->reg_cache)[index];
} else {
return !from_cache ? __raw_readl(mcbsp->io_base + reg) :
- ((u32 *)mcbsp->reg_cache)[reg / sizeof(u32)];
+ ((u32 *)mcbsp->reg_cache)[index];
}
}
--
1.7.0.4
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
