diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-02-15 05:00:26 -0500 |
---|---|---|
committer | Liam Girdwood <lrg@ti.com> | 2012-03-12 09:34:20 -0400 |
commit | 20456242e8d13287b476264223caef7f1193741a (patch) | |
tree | cc6ed3f8207582ea43435372d9d9fba7e0339a43 /arch | |
parent | 45656b44f6d1968d838f3abcf3a264ee9fa2fc62 (diff) |
ARM: OMAP: Do not register omap-mcbsp-dai device
The driver for omap-mcbsp-dai no longer exist since it has been merged with
the omap-mcbsp driver.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Tested-by: Grazvydas Ignotas <notasas@gmail.com>
Tested-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-omap1/devices.c | 9 | ||||
-rw-r--r-- | arch/arm/mach-omap2/devices.c | 22 | ||||
-rw-r--r-- | arch/arm/plat-omap/include/plat/mcbsp.h | 7 |
3 files changed, 0 insertions, 38 deletions
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index 1d76a63c0983..187b2fe132e9 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c | |||
@@ -28,7 +28,6 @@ | |||
28 | #include <plat/mux.h> | 28 | #include <plat/mux.h> |
29 | #include <plat/mmc.h> | 29 | #include <plat/mmc.h> |
30 | #include <plat/omap7xx.h> | 30 | #include <plat/omap7xx.h> |
31 | #include <plat/mcbsp.h> | ||
32 | 31 | ||
33 | #include "clock.h" | 32 | #include "clock.h" |
34 | 33 | ||
@@ -250,16 +249,8 @@ static struct platform_device omap_pcm = { | |||
250 | .id = -1, | 249 | .id = -1, |
251 | }; | 250 | }; |
252 | 251 | ||
253 | OMAP_MCBSP_PLATFORM_DEVICE(1); | ||
254 | OMAP_MCBSP_PLATFORM_DEVICE(2); | ||
255 | OMAP_MCBSP_PLATFORM_DEVICE(3); | ||
256 | |||
257 | static void omap_init_audio(void) | 252 | static void omap_init_audio(void) |
258 | { | 253 | { |
259 | platform_device_register(&omap_mcbsp1); | ||
260 | platform_device_register(&omap_mcbsp2); | ||
261 | if (!cpu_is_omap7xx()) | ||
262 | platform_device_register(&omap_mcbsp3); | ||
263 | platform_device_register(&omap_pcm); | 254 | platform_device_register(&omap_pcm); |
264 | } | 255 | } |
265 | 256 | ||
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 283d11eae693..e9fae652cd04 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c | |||
@@ -26,7 +26,6 @@ | |||
26 | 26 | ||
27 | #include <plat/tc.h> | 27 | #include <plat/tc.h> |
28 | #include <plat/board.h> | 28 | #include <plat/board.h> |
29 | #include <plat/mcbsp.h> | ||
30 | #include <plat/mmc.h> | 29 | #include <plat/mmc.h> |
31 | #include <plat/dma.h> | 30 | #include <plat/dma.h> |
32 | #include <plat/omap_hwmod.h> | 31 | #include <plat/omap_hwmod.h> |
@@ -304,29 +303,8 @@ static struct platform_device omap_pcm = { | |||
304 | .id = -1, | 303 | .id = -1, |
305 | }; | 304 | }; |
306 | 305 | ||
307 | /* | ||
308 | * OMAP2420 has 2 McBSP ports | ||
309 | * OMAP2430 has 5 McBSP ports | ||
310 | * OMAP3 has 5 McBSP ports | ||
311 | * OMAP4 has 4 McBSP ports | ||
312 | */ | ||
313 | OMAP_MCBSP_PLATFORM_DEVICE(1); | ||
314 | OMAP_MCBSP_PLATFORM_DEVICE(2); | ||
315 | OMAP_MCBSP_PLATFORM_DEVICE(3); | ||
316 | OMAP_MCBSP_PLATFORM_DEVICE(4); | ||
317 | OMAP_MCBSP_PLATFORM_DEVICE(5); | ||
318 | |||
319 | static void omap_init_audio(void) | 306 | static void omap_init_audio(void) |
320 | { | 307 | { |
321 | platform_device_register(&omap_mcbsp1); | ||
322 | platform_device_register(&omap_mcbsp2); | ||
323 | if (cpu_is_omap243x() || cpu_is_omap34xx() || cpu_is_omap44xx()) { | ||
324 | platform_device_register(&omap_mcbsp3); | ||
325 | platform_device_register(&omap_mcbsp4); | ||
326 | } | ||
327 | if (cpu_is_omap243x() || cpu_is_omap34xx()) | ||
328 | platform_device_register(&omap_mcbsp5); | ||
329 | |||
330 | platform_device_register(&omap_pcm); | 308 | platform_device_register(&omap_pcm); |
331 | } | 309 | } |
332 | 310 | ||
diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/arch/arm/plat-omap/include/plat/mcbsp.h index 437e375f05b7..8eb9b0e7a852 100644 --- a/arch/arm/plat-omap/include/plat/mcbsp.h +++ b/arch/arm/plat-omap/include/plat/mcbsp.h | |||
@@ -27,13 +27,6 @@ | |||
27 | #include <linux/spinlock.h> | 27 | #include <linux/spinlock.h> |
28 | #include <linux/clk.h> | 28 | #include <linux/clk.h> |
29 | 29 | ||
30 | /* macro for building platform_device for McBSP ports */ | ||
31 | #define OMAP_MCBSP_PLATFORM_DEVICE(port_nr) \ | ||
32 | static struct platform_device omap_mcbsp##port_nr = { \ | ||
33 | .name = "omap-mcbsp-dai", \ | ||
34 | .id = port_nr - 1, \ | ||
35 | } | ||
36 | |||
37 | #define MCBSP_CONFIG_TYPE2 0x2 | 30 | #define MCBSP_CONFIG_TYPE2 0x2 |
38 | #define MCBSP_CONFIG_TYPE3 0x3 | 31 | #define MCBSP_CONFIG_TYPE3 0x3 |
39 | #define MCBSP_CONFIG_TYPE4 0x4 | 32 | #define MCBSP_CONFIG_TYPE4 0x4 |