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

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

Merge branch 'topic/asoc' into for-linus

parents 57648cd5 43f0de8d

arch/arm/mach-davinci/include/mach/asp.h

+8 −0
Original line number Original line Diff line number Diff line
@@ -51,6 +51,14 @@ struct snd_platform_data { 
	u32 rx_dma_offset;

	u32 rx_dma_offset;

	enum dma_event_q eventq_no;	/* event queue number */

	enum dma_event_q eventq_no;	/* event queue number */

	unsigned int codec_fmt;

	unsigned int codec_fmt;

	/*

	 * Allowing this is more efficient and eliminates left and right swaps

	 * caused by underruns, but will swap the left and right channels

	 * when compared to previous behavior.

	 */

	unsigned enable_channel_combine:1;

	unsigned sram_size_playback;

	unsigned sram_size_capture;





	/* McASP specific fields */

	/* McASP specific fields */

	int tdm_slots;

	int tdm_slots;

arch/arm/mach-omap2/board-3430sdp.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -410,6 +410,15 @@ static struct regulator_init_data sdp3430_vpll2 = { 
	.consumer_supplies	= &sdp3430_vdvi_supply,

	.consumer_supplies	= &sdp3430_vdvi_supply,

};

};





static struct twl4030_codec_audio_data sdp3430_audio = {

	.audio_mclk = 26000000,

};



static struct twl4030_codec_data sdp3430_codec = {

	.audio_mclk = 26000000,

	.audio = &sdp3430_audio,

};



static struct twl4030_platform_data sdp3430_twldata = {

static struct twl4030_platform_data sdp3430_twldata = {

	.irq_base	= TWL4030_IRQ_BASE,

	.irq_base	= TWL4030_IRQ_BASE,

	.irq_end	= TWL4030_IRQ_END,

	.irq_end	= TWL4030_IRQ_END,
@@ -420,6 +429,7 @@ static struct twl4030_platform_data sdp3430_twldata = { 
	.madc		= &sdp3430_madc_data,

	.madc		= &sdp3430_madc_data,

	.keypad		= &sdp3430_kp_data,

	.keypad		= &sdp3430_kp_data,

	.usb		= &sdp3430_usb_data,

	.usb		= &sdp3430_usb_data,

	.codec		= &sdp3430_codec,





	.vaux1		= &sdp3430_vaux1,

	.vaux1		= &sdp3430_vaux1,

	.vaux2		= &sdp3430_vaux2,

	.vaux2		= &sdp3430_vaux2,

arch/arm/mach-omap2/board-omap3beagle.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -254,6 +254,15 @@ static struct twl4030_usb_data beagle_usb_data = { 
	.usb_mode	= T2_USB_MODE_ULPI,

	.usb_mode	= T2_USB_MODE_ULPI,

};

};





static struct twl4030_codec_audio_data beagle_audio_data = {

	.audio_mclk = 26000000,

};



static struct twl4030_codec_data beagle_codec_data = {

	.audio_mclk = 26000000,

	.audio = &beagle_audio_data,

};



static struct twl4030_platform_data beagle_twldata = {

static struct twl4030_platform_data beagle_twldata = {

	.irq_base	= TWL4030_IRQ_BASE,

	.irq_base	= TWL4030_IRQ_BASE,

	.irq_end	= TWL4030_IRQ_END,

	.irq_end	= TWL4030_IRQ_END,
@@ -261,6 +270,7 @@ static struct twl4030_platform_data beagle_twldata = { 
	/* platform_data for children goes here */

	/* platform_data for children goes here */

	.usb		= &beagle_usb_data,

	.usb		= &beagle_usb_data,

	.gpio		= &beagle_gpio_data,

	.gpio		= &beagle_gpio_data,

	.codec		= &beagle_codec_data,

	.vmmc1		= &beagle_vmmc1,

	.vmmc1		= &beagle_vmmc1,

	.vsim		= &beagle_vsim,

	.vsim		= &beagle_vsim,

	.vdac		= &beagle_vdac,

	.vdac		= &beagle_vdac,

arch/arm/mach-omap2/board-omap3evm.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -194,6 +194,15 @@ static struct twl4030_madc_platform_data omap3evm_madc_data = { 
	.irq_line	= 1,

	.irq_line	= 1,

};

};





static struct twl4030_codec_audio_data omap3evm_audio_data = {

	.audio_mclk = 26000000,

};



static struct twl4030_codec_data omap3evm_codec_data = {

	.audio_mclk = 26000000,

	.audio = &omap3evm_audio_data,

};



static struct twl4030_platform_data omap3evm_twldata = {

static struct twl4030_platform_data omap3evm_twldata = {

	.irq_base	= TWL4030_IRQ_BASE,

	.irq_base	= TWL4030_IRQ_BASE,

	.irq_end	= TWL4030_IRQ_END,

	.irq_end	= TWL4030_IRQ_END,
@@ -203,6 +212,7 @@ static struct twl4030_platform_data omap3evm_twldata = { 
	.madc		= &omap3evm_madc_data,

	.madc		= &omap3evm_madc_data,

	.usb		= &omap3evm_usb_data,

	.usb		= &omap3evm_usb_data,

	.gpio		= &omap3evm_gpio_data,

	.gpio		= &omap3evm_gpio_data,

	.codec		= &omap3evm_codec_data,

};

};





static struct i2c_board_info __initdata omap3evm_i2c_boardinfo[] = {

static struct i2c_board_info __initdata omap3evm_i2c_boardinfo[] = {

arch/arm/mach-omap2/board-omap3pandora.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -281,11 +281,21 @@ static struct twl4030_usb_data omap3pandora_usb_data = { 
	.usb_mode	= T2_USB_MODE_ULPI,

	.usb_mode	= T2_USB_MODE_ULPI,

};

};





static struct twl4030_codec_audio_data omap3pandora_audio_data = {

	.audio_mclk = 26000000,

};



static struct twl4030_codec_data omap3pandora_codec_data = {

	.audio_mclk = 26000000,

	.audio = &omap3pandora_audio_data,

};



static struct twl4030_platform_data omap3pandora_twldata = {

static struct twl4030_platform_data omap3pandora_twldata = {

	.irq_base	= TWL4030_IRQ_BASE,

	.irq_base	= TWL4030_IRQ_BASE,

	.irq_end	= TWL4030_IRQ_END,

	.irq_end	= TWL4030_IRQ_END,

	.gpio		= &omap3pandora_gpio_data,

	.gpio		= &omap3pandora_gpio_data,

	.usb		= &omap3pandora_usb_data,

	.usb		= &omap3pandora_usb_data,

	.codec		= &omap3pandora_codec_data,

	.vmmc1		= &pandora_vmmc1,

	.vmmc1		= &pandora_vmmc1,

	.vmmc2		= &pandora_vmmc2,

	.vmmc2		= &pandora_vmmc2,

	.keypad		= &pandora_kp_data,

	.keypad		= &pandora_kp_data,