diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2015-12-11 15:50:20 +0300 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2015-12-17 21:34:41 +0300 |
| commit | f2e6a0a913b53f5af87c7e9a783ceae5bb4ae2c4 (patch) | |
| tree | 74a109ed8a527c8f7298056a6433a882eb3abc41 /arch/arm/mach-omap2/devices.c | |
| parent | 65a52a212adde216a92656a1419ea4ec0a7781c7 (diff) | |
| download | linux-f2e6a0a913b53f5af87c7e9a783ceae5bb4ae2c4.tar.xz | |
ARM: OMAP2+: Remove device creation for omap-pcm-audio
The omap-pcm in ASoC is no longer a platform device. No need to create this
device anymore.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/devices.c')
| -rw-r--r-- | arch/arm/mach-omap2/devices.c | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c index 9374da313e8e..9cda974a3009 100644 --- a/arch/arm/mach-omap2/devices.c +++ b/arch/arm/mach-omap2/devices.c @@ -94,22 +94,6 @@ static inline void omap_init_mbox(void) { } static inline void omap_init_sti(void) {} -#if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE) - -static struct platform_device omap_pcm = { - .name = "omap-pcm-audio", - .id = -1, -}; - -static void omap_init_audio(void) -{ - platform_device_register(&omap_pcm); -} - -#else -static inline void omap_init_audio(void) {} -#endif - #if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE) #include <linux/platform_data/spi-omap2-mcspi.h> @@ -239,13 +223,12 @@ static int __init omap2_init_devices(void) if (!of_have_populated_dt()) pinctrl_provide_dummies(); - /* - * please keep these calls, and their implementations above, - * in alphabetical order so they're easier to sort through. - */ - omap_init_audio(); /* If dtb is there, the devices will be created dynamically */ if (!of_have_populated_dt()) { + /* + * please keep these calls, and their implementations above, + * in alphabetical order so they're easier to sort through. + */ omap_init_mbox(); omap_init_mcspi(); omap_init_sham(); |