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>

diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index 1d76a63c098362742773ac89298c1a8cf0980e6f..187b2fe132e98c08d0fd822532e8d7dfb2ac99c1 100644 (file)
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -28,7 +28,6 @@
 #include <plat/mux.h>
 #include <plat/mmc.h>
 #include <plat/omap7xx.h>
-#include <plat/mcbsp.h>
 
 #include "clock.h"
 
@@ -250,16 +249,8 @@ static struct platform_device omap_pcm = {
        .id     = -1,
 };
 
-OMAP_MCBSP_PLATFORM_DEVICE(1);
-OMAP_MCBSP_PLATFORM_DEVICE(2);
-OMAP_MCBSP_PLATFORM_DEVICE(3);
-
 static void omap_init_audio(void)
 {
-       platform_device_register(&omap_mcbsp1);
-       platform_device_register(&omap_mcbsp2);
-       if (!cpu_is_omap7xx())
-               platform_device_register(&omap_mcbsp3);
        platform_device_register(&omap_pcm);
 }
 

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 283d11eae693115b42d2bbcca9176f019274960c..e9fae652cd048f02ff7768367f7b3c64bbc04a8d 100644 (file)
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -26,7 +26,6 @@
 
 #include <plat/tc.h>
 #include <plat/board.h>
-#include <plat/mcbsp.h>
 #include <plat/mmc.h>
 #include <plat/dma.h>
 #include <plat/omap_hwmod.h>
@@ -304,29 +303,8 @@ static struct platform_device omap_pcm = {
        .id     = -1,
 };
 
-/*
- * OMAP2420 has 2 McBSP ports
- * OMAP2430 has 5 McBSP ports
- * OMAP3 has 5 McBSP ports
- * OMAP4 has 4 McBSP ports
- */
-OMAP_MCBSP_PLATFORM_DEVICE(1);
-OMAP_MCBSP_PLATFORM_DEVICE(2);
-OMAP_MCBSP_PLATFORM_DEVICE(3);
-OMAP_MCBSP_PLATFORM_DEVICE(4);
-OMAP_MCBSP_PLATFORM_DEVICE(5);
-
 static void omap_init_audio(void)
 {
-       platform_device_register(&omap_mcbsp1);
-       platform_device_register(&omap_mcbsp2);
-       if (cpu_is_omap243x() || cpu_is_omap34xx() || cpu_is_omap44xx()) {
-               platform_device_register(&omap_mcbsp3);
-               platform_device_register(&omap_mcbsp4);
-       }
-       if (cpu_is_omap243x() || cpu_is_omap34xx())
-               platform_device_register(&omap_mcbsp5);
-
        platform_device_register(&omap_pcm);
 }
 

diff --git a/arch/arm/plat-omap/include/plat/mcbsp.h b/arch/arm/plat-omap/include/plat/mcbsp.h
index 437e375f05b7c624afd5c0d8dbb41f6321bdb604..8eb9b0e7a85254e7062d434234a67b9824fe918b 100644 (file)
--- a/arch/arm/plat-omap/include/plat/mcbsp.h
+++ b/arch/arm/plat-omap/include/plat/mcbsp.h
@@ -27,13 +27,6 @@
 #include <linux/spinlock.h>
 #include <linux/clk.h>
 
-/* macro for building platform_device for McBSP ports */
-#define OMAP_MCBSP_PLATFORM_DEVICE(port_nr)            \
-static struct platform_device omap_mcbsp##port_nr = {  \
-       .name   = "omap-mcbsp-dai",                     \
-       .id     = port_nr - 1,                  \
-}
-
 #define MCBSP_CONFIG_TYPE2     0x2
 #define MCBSP_CONFIG_TYPE3     0x3
 #define MCBSP_CONFIG_TYPE4     0x4