Commit 6630f30e authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/headers', 'asoc/topic/intel',... 

Merge remote-tracking branches 'asoc/topic/headers', 'asoc/topic/intel', 'asoc/topic/jz4740', 'asoc/topic/max98090', 'asoc/topic/max98095', 'asoc/topic/mc13783' and 'asoc/topic/multicodec' into asoc-next
parents 3a6a489f ee5e4534 2fa190ce 0aa2a15a a735d992 c4839c87 780aaeff 7b4a469e

Documentation/devicetree/bindings/mfd/mc13xxx.txt

+3 −0
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ Optional properties: 
- fsl,mc13xxx-uses-touch : Indicate the touchscreen controller is being used



Sub-nodes:

- codec: Contain the Audio Codec node.

  - adc-port: Contain PMIC SSI port number used for ADC.

  - dac-port: Contain PMIC SSI port number used for DAC.

- leds : Contain the led nodes and initial register values in property

  "led-control". Number of register depends of used IC, for MC13783 is 6,

  for MC13892 is 4, for MC34708 is 1. See datasheet for bits definitions of

Documentation/devicetree/bindings/sound/max98095.txt

0 → 100644
+16 −0
Original line number Diff line number Diff line 
MAX98095 audio CODEC



This device supports I2C only.



Required properties:



- compatible : "maxim,max98095".



- reg : The I2C address of the device.



Example:



max98095: codec@11 {

	compatible = "maxim,max98095";

	reg = <0x11>;

};

arch/mips/include/asm/mach-jz4740/dma.h

+0 −2
Original line number Diff line number Diff line
@@ -22,8 +22,6 @@ enum jz4740_dma_request_type { 
	JZ4740_DMA_TYPE_UART_RECEIVE	= 21,

	JZ4740_DMA_TYPE_SPI_TRANSMIT	= 22,

	JZ4740_DMA_TYPE_SPI_RECEIVE	= 23,

	JZ4740_DMA_TYPE_AIC_TRANSMIT	= 24,

	JZ4740_DMA_TYPE_AIC_RECEIVE	= 25,

	JZ4740_DMA_TYPE_MMC_TRANSMIT	= 26,

	JZ4740_DMA_TYPE_MMC_RECEIVE	= 27,

	JZ4740_DMA_TYPE_TCU		= 28,

arch/mips/jz4740/board-qi_lb60.c

+11 −0
Original line number Diff line number Diff line
@@ -425,6 +425,15 @@ static struct platform_device qi_lb60_audio_device = { 
	.id = -1,

};



static struct gpiod_lookup_table qi_lb60_audio_gpio_table = {

	.dev_id = "qi-lb60-audio",

	.table = {

		GPIO_LOOKUP("Bank B", 29, "snd", 0),

		GPIO_LOOKUP("Bank D", 4, "amp", 0),

		{ },

	},

};



static struct platform_device *jz_platform_devices[] __initdata = {

	&jz4740_udc_device,

	&jz4740_udc_xceiv_device,
@@ -461,6 +470,8 @@ static int __init qi_lb60_init_platform_devices(void) 
	jz4740_adc_device.dev.platform_data = &qi_lb60_battery_pdata;

	jz4740_mmc_device.dev.platform_data = &qi_lb60_mmc_pdata;



	gpiod_add_lookup_table(&qi_lb60_audio_gpio_table);



	jz4740_serial_device_register();



	spi_register_board_info(qi_lb60_spi_board_info,

drivers/mfd/mc13xxx-core.c

+7 −3
Original line number Diff line number Diff line
@@ -673,9 +673,13 @@ int mc13xxx_common_init(struct device *dev) 
	if (mc13xxx->flags & MC13XXX_USE_ADC)

		mc13xxx_add_subdevice(mc13xxx, "%s-adc");



	if (mc13xxx->flags & MC13XXX_USE_CODEC)

	if (mc13xxx->flags & MC13XXX_USE_CODEC) {

		if (pdata)

			mc13xxx_add_subdevice_pdata(mc13xxx, "%s-codec",

				pdata->codec, sizeof(*pdata->codec));

		else

			mc13xxx_add_subdevice(mc13xxx, "%s-codec");

	}



	if (mc13xxx->flags & MC13XXX_USE_RTC)

		mc13xxx_add_subdevice(mc13xxx, "%s-rtc");