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

Commit bb14eb0d authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/asoc' into for-linus

parents 9430148d 5927f947

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -530,6 +530,7 @@ S: Maintained 
F:	drivers/infiniband/hw/amso1100/



ANALOG DEVICES INC ASOC CODEC DRIVERS

M:	Lars-Peter Clausen <lars@metafoo.de>

L:	device-drivers-devel@blackfin.uclinux.org

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

W:	http://wiki.analog.com/
@@ -7199,6 +7200,7 @@ T: git git://opensource.wolfsonmicro.com/linux-2.6-audioplus 
W:	http://opensource.wolfsonmicro.com/content/linux-drivers-wolfson-devices

S:	Supported

F:	Documentation/hwmon/wm83??

F:	arch/arm/mach-s3c64xx/mach-crag6410*

F:	drivers/leds/leds-wm83*.c

F:	drivers/input/misc/wm831x-on.c

F:	drivers/input/touchscreen/wm831x-ts.c

arch/arm/mach-omap2/board-rx51-peripherals.c

+0 −1
Original line number Diff line number Diff line
@@ -900,7 +900,6 @@ static struct twl4030_platform_data rx51_twldata __initdata = { 
};



static struct tpa6130a2_platform_data rx51_tpa6130a2_data __initdata_or_module = {

	.id			= TPA6130A2,

	.power_gpio		= 98,

};

arch/arm/mach-omap2/devices.c

+33 −0
Original line number Diff line number Diff line
@@ -330,6 +330,38 @@ static void omap_init_audio(void) 
static inline void omap_init_audio(void) {}

#endif



#if defined(CONFIG_SND_OMAP_SOC_MCPDM) || \

		defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE)



static struct omap_device_pm_latency omap_mcpdm_latency[] = {

	{

		.deactivate_func = omap_device_idle_hwmods,

		.activate_func = omap_device_enable_hwmods,

		.flags = OMAP_DEVICE_LATENCY_AUTO_ADJUST,

	},

};



static void omap_init_mcpdm(void)

{

	struct omap_hwmod *oh;

	struct omap_device *od;



	oh = omap_hwmod_lookup("mcpdm");

	if (!oh) {

		printk(KERN_ERR "Could not look up mcpdm hw_mod\n");

		return;

	}



	od = omap_device_build("omap-mcpdm", -1, oh, NULL, 0,

				omap_mcpdm_latency,

				ARRAY_SIZE(omap_mcpdm_latency), 0);

	if (IS_ERR(od))

		printk(KERN_ERR "Could not build omap_device for omap-mcpdm-dai\n");

}

#else

static inline void omap_init_mcpdm(void) {}

#endif



#if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE)



#include <plat/mcspi.h>
@@ -683,6 +715,7 @@ static int __init omap2_init_devices(void) 
	 * in alphabetical order so they're easier to sort through.

	 */

	omap_init_audio();

	omap_init_mcpdm();

	omap_init_camera();

	omap_init_mbox();

	omap_init_mcspi();

arch/arm/mach-omap2/omap_hwmod_44xx_data.c

+1 −1
Original line number Diff line number Diff line
@@ -5430,7 +5430,7 @@ static __initdata struct omap_hwmod *omap44xx_hwmods[] = { 
	&omap44xx_mcbsp4_hwmod,



	/* mcpdm class */

/*	&omap44xx_mcpdm_hwmod, */

	&omap44xx_mcpdm_hwmod,



	/* mcspi class */

	&omap44xx_mcspi1_hwmod,

arch/arm/plat-omap/devices.c

+0 −36
Original line number Diff line number Diff line
@@ -74,41 +74,6 @@ void omap_mcbsp_register_board_cfg(struct resource *res, int res_count, 


/*-------------------------------------------------------------------------*/



#if defined(CONFIG_SND_OMAP_SOC_MCPDM) || \

		defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE)



static struct resource mcpdm_resources[] = {

	{

		.name		= "mcpdm_mem",

		.start		= OMAP44XX_MCPDM_BASE,

		.end		= OMAP44XX_MCPDM_BASE + SZ_4K,

		.flags		= IORESOURCE_MEM,

	},

	{

		.name		= "mcpdm_irq",

		.start		= OMAP44XX_IRQ_MCPDM,

		.end		= OMAP44XX_IRQ_MCPDM,

		.flags		= IORESOURCE_IRQ,

	},

};



static struct platform_device omap_mcpdm_device = {

	.name		= "omap-mcpdm",

	.id		= -1,

	.num_resources	= ARRAY_SIZE(mcpdm_resources),

	.resource	= mcpdm_resources,

};



static void omap_init_mcpdm(void)

{

	(void) platform_device_register(&omap_mcpdm_device);

}

#else

static inline void omap_init_mcpdm(void) {}

#endif



/*-------------------------------------------------------------------------*/



#if defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE) || \

	defined(CONFIG_MMC_OMAP_HS) || defined(CONFIG_MMC_OMAP_HS_MODULE)
@@ -291,7 +256,6 @@ static int __init omap_init_devices(void) 
	 * in alphabetical order so they're easier to sort through.

	 */

	omap_init_rng();

	omap_init_mcpdm();

	omap_init_uwire();

	return 0;

}