aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap1/mcbsp.c11
-rw-r--r--arch/arm/plat-omap/include/plat/mcbsp.h11
2 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c
index 36ab5d83327e..91f9abbd3250 100644
--- a/arch/arm/mach-omap1/mcbsp.c
+++ b/arch/arm/mach-omap1/mcbsp.c
@@ -79,6 +79,17 @@ static struct omap_mcbsp_ops omap1_mcbsp_ops = {
79 .free = omap1_mcbsp_free, 79 .free = omap1_mcbsp_free,
80}; 80};
81 81
82#define OMAP7XX_MCBSP1_BASE 0xfffb1000
83#define OMAP7XX_MCBSP2_BASE 0xfffb1800
84
85#define OMAP1510_MCBSP1_BASE 0xe1011800
86#define OMAP1510_MCBSP2_BASE 0xfffb1000
87#define OMAP1510_MCBSP3_BASE 0xe1017000
88
89#define OMAP1610_MCBSP1_BASE 0xe1011800
90#define OMAP1610_MCBSP2_BASE 0xfffb1000
91#define OMAP1610_MCBSP3_BASE 0xe1017000
92
82#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850) 93#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)
83struct resource omap7xx_mcbsp_res[][6] = { 94struct resource omap7xx_mcbsp_res[][6] = {
84 { 95 {
diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/arch/arm/plat-omap/include/plat/mcbsp.h
index 5d657d96269d..af5824a38f9d 100644
--- a/arch/arm/plat-omap/include/plat/mcbsp.h
+++ b/arch/arm/plat-omap/include/plat/mcbsp.h
@@ -38,17 +38,6 @@ static struct platform_device omap_mcbsp##port_nr = { \
38#define MCBSP_CONFIG_TYPE3 0x3 38#define MCBSP_CONFIG_TYPE3 0x3
39#define MCBSP_CONFIG_TYPE4 0x4 39#define MCBSP_CONFIG_TYPE4 0x4
40 40
41#define OMAP7XX_MCBSP1_BASE 0xfffb1000
42#define OMAP7XX_MCBSP2_BASE 0xfffb1800
43
44#define OMAP1510_MCBSP1_BASE 0xe1011800
45#define OMAP1510_MCBSP2_BASE 0xfffb1000
46#define OMAP1510_MCBSP3_BASE 0xe1017000
47
48#define OMAP1610_MCBSP1_BASE 0xe1011800
49#define OMAP1610_MCBSP2_BASE 0xfffb1000
50#define OMAP1610_MCBSP3_BASE 0xe1017000
51
52/* McBSP register numbers. Register address offset = num * reg_step */ 41/* McBSP register numbers. Register address offset = num * reg_step */
53enum { 42enum {
54 /* Common registers */ 43 /* Common registers */