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

Commit bea8205f authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'asoc-fix-ep93xx' into spi-fix-ep93xx

parents c4e85b7e f7aa23cb

Documentation/devicetree/bindings/sound/davinci-mcbsp.txt

0 → 100644
+51 −0
Original line number Diff line number Diff line 
Texas Instruments DaVinci McBSP module

~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~



This binding describes the "Multi-channel Buffered Serial Port" (McBSP)

audio interface found in some TI DaVinci processors like the OMAP-L138 or AM180x.





Required properties:

~~~~~~~~~~~~~~~~~~~~

- compatible :

        "ti,da850-mcbsp" : for DA850, AM180x and OPAM-L138 platforms



- reg : physical base address and length of the controller memory mapped

        region(s).

- reg-names : Should contain:

        * "mpu" for the main registers (required).

        * "dat" for the data FIFO (optional).



- dmas: three element list of DMA controller phandles, DMA request line and

	TC channel ordered triplets.

- dma-names: identifier string for each DMA request line in the dmas property.

	These strings correspond 1:1 with the ordered pairs in dmas. The dma

	identifiers must be "rx" and "tx".



Optional properties:

~~~~~~~~~~~~~~~~~~~~

- interrupts : Interrupt numbers for McBSP

- interrupt-names : Known interrupt names are "rx" and "tx"



- pinctrl-0: Should specify pin control group used for this controller.

- pinctrl-names: Should contain only one value - "default", for more details

        please refer to pinctrl-bindings.txt



Example (AM1808):

~~~~~~~~~~~~~~~~~



mcbsp0: mcbsp@1d10000 {

	compatible = "ti,da850-mcbsp";

	pinctrl-names = "default";

	pinctrl-0 = <&mcbsp0_pins>;



	reg = 	<0x00110000 0x1000>,

		<0x00310000 0x1000>;

	reg-names = "mpu", "dat";

	interrupts = <97 98>;

	interrupts-names = "rx", "tx";

	dmas = <&edma0 3 1

		&edma0 2 1>;

	dma-names = "tx", "rx";

	status = "okay";

};

Documentation/devicetree/bindings/sound/fsl-sai.txt

+7 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ codec/DSP interfaces. 


Required properties:



  - compatible		: Compatible list, contains "fsl,vf610-sai" or

			  "fsl,imx6sx-sai".

  - compatible		: Compatible list, contains "fsl,vf610-sai",

			  "fsl,imx6sx-sai" or "fsl,imx6ul-sai"



  - reg			: Offset and length of the register set for the device.
@@ -48,6 +48,11 @@ Required properties: 
			  receive data by following their own bit clocks and

			  frame sync clocks separately.



Optional properties (for mx6ul):



  - fsl,sai-mclk-direction-output: This is a boolean property. If present,

			 indicates that SAI will output the SAI MCLK clock.



Note:

- If both fsl,sai-asynchronous and fsl,sai-synchronous-rx are absent, the

  default synchronous mode (sync Rx with Tx) will be used, which means both

Documentation/devicetree/bindings/sound/pcm5102a.txt

0 → 100644
+13 −0
Original line number Diff line number Diff line 
PCM5102a audio CODECs



These devices does not use I2C or SPI.



Required properties:



  - compatible : set as "ti,pcm5102a"



Examples:



	pcm5102a: pcm5102a {

		compatible = "ti,pcm5102a";

	};

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -4661,6 +4661,7 @@ FREESCALE SOC SOUND DRIVERS 
M:	Timur Tabi <timur@tabi.org>

M:	Nicolin Chen <nicoleotsuka@gmail.com>

M:	Xiubo Li <Xiubo.Lee@gmail.com>

R:	Fabio Estevam <fabio.estevam@nxp.com>

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

L:	linuxppc-dev@lists.ozlabs.org

S:	Maintained

drivers/spi/spi-ep93xx.c

+1 −1
Original line number Diff line number Diff line
@@ -567,7 +567,7 @@ static void ep93xx_spi_dma_transfer(struct ep93xx_spi *espi) 
	txd = ep93xx_spi_dma_prepare(espi, DMA_MEM_TO_DEV);

	if (IS_ERR(txd)) {

		ep93xx_spi_dma_finish(espi, DMA_DEV_TO_MEM);

		dev_err(&espi->pdev->dev, "DMA TX failed: %ld\n", PTR_ERR(rxd));

		dev_err(&espi->pdev->dev, "DMA TX failed: %ld\n", PTR_ERR(txd));

		msg->status = PTR_ERR(txd);

		return;

	}