diff options
author | Alistair Buxton <a.j.buxton@gmail.com> | 2009-09-22 01:49:35 -0400 |
---|---|---|
committer | Alistair Buxton <a.j.buxton@gmail.com> | 2009-10-07 18:14:04 -0400 |
commit | bf1cb7eb4fe35e50798f03e00d3900db0474f7d0 (patch) | |
tree | 83c83015dbca267e89149869f45f6475362b94e4 /arch/arm/mach-omap1 | |
parent | 39a8b08610a10f3456ef9f4a38986d0407f1c57e (diff) |
OMAP7XX: McBSP: Add omap850 support
This patch is part of a series which unifies all duplicated code between
omap730 and omap850. All cpu checks are converted to cpu_is_omap7xx() and
CONFIG_ARCH_OMAP850 is added to all CONFIG_ARCH_OMAP730 checks.
Signed-off-by: Alistair Buxton <a.j.buxton@gmail.com>
Reviewed-by: Zebediah C. McClure <zmc@lurian.net>
Diffstat (limited to 'arch/arm/mach-omap1')
-rw-r--r-- | arch/arm/mach-omap1/mcbsp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap1/mcbsp.c b/arch/arm/mach-omap1/mcbsp.c index 505d98cfe508..06f380bf221e 100644 --- a/arch/arm/mach-omap1/mcbsp.c +++ b/arch/arm/mach-omap1/mcbsp.c | |||
@@ -79,7 +79,7 @@ static struct omap_mcbsp_ops omap1_mcbsp_ops = { | |||
79 | .free = omap1_mcbsp_free, | 79 | .free = omap1_mcbsp_free, |
80 | }; | 80 | }; |
81 | 81 | ||
82 | #ifdef CONFIG_ARCH_OMAP730 | 82 | #if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850) |
83 | static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = { | 83 | static struct omap_mcbsp_platform_data omap730_mcbsp_pdata[] = { |
84 | { | 84 | { |
85 | .phys_base = OMAP730_MCBSP1_BASE, | 85 | .phys_base = OMAP730_MCBSP1_BASE, |
@@ -172,7 +172,7 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = { | |||
172 | 172 | ||
173 | int __init omap1_mcbsp_init(void) | 173 | int __init omap1_mcbsp_init(void) |
174 | { | 174 | { |
175 | if (cpu_is_omap730()) | 175 | if (cpu_is_omap7xx()) |
176 | omap_mcbsp_count = OMAP730_MCBSP_PDATA_SZ; | 176 | omap_mcbsp_count = OMAP730_MCBSP_PDATA_SZ; |
177 | if (cpu_is_omap15xx()) | 177 | if (cpu_is_omap15xx()) |
178 | omap_mcbsp_count = OMAP15XX_MCBSP_PDATA_SZ; | 178 | omap_mcbsp_count = OMAP15XX_MCBSP_PDATA_SZ; |
@@ -184,7 +184,7 @@ int __init omap1_mcbsp_init(void) | |||
184 | if (!mcbsp_ptr) | 184 | if (!mcbsp_ptr) |
185 | return -ENOMEM; | 185 | return -ENOMEM; |
186 | 186 | ||
187 | if (cpu_is_omap730()) | 187 | if (cpu_is_omap7xx()) |
188 | omap_mcbsp_register_board_cfg(omap730_mcbsp_pdata, | 188 | omap_mcbsp_register_board_cfg(omap730_mcbsp_pdata, |
189 | OMAP730_MCBSP_PDATA_SZ); | 189 | OMAP730_MCBSP_PDATA_SZ); |
190 | 190 | ||