Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2e6a0a9 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Tony Lindgren
Browse files

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: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 65a52a21

arch/arm/mach-omap2/devices.c

+4 −21
Original line number Diff line number Diff line
@@ -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();



	/* 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_audio();

	/* If dtb is there, the devices will be created dynamically */

	if (!of_have_populated_dt()) {

		omap_init_mbox();

		omap_init_mcspi();

		omap_init_sham();