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

Commit 69dd89fd authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v3.15-4' of... 

Merge tag 'asoc-v3.15-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus

ASoC: Final updates for v3.15 merge window

A few more updates from last week - use of the tdm_slot mapping from
Xiubo plus a few smaller fixes and cleanups.
parents 8c1d8434 c159a850

Documentation/devicetree/bindings/net/micrel-ks8851.txt

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ Required properties: 


Optional properties:

- local-mac-address : Ethernet mac address to use

- vdd-supply:	supply for Ethernet mac

Documentation/devicetree/bindings/sound/renesas,rsnd.txt

+12 −3
Original line number Diff line number Diff line
@@ -7,14 +7,23 @@ Required properties: 
				  required register is

				   SRU/ADG/SSI      if generation1

				   SRU/ADG/SSIU/SSI if generation2

- rcar_sound,ssi		: SSI subnode

- rcar_sound,scu		: SCU subnode

- rcar_sound,dai		: DAI subnode

- rcar_sound,ssi		: Should contain SSI feature.

				  The number of SSI subnode should be same as HW.

				  see below for detail.

- rcar_sound,src		: Should contain SRC feature.

				  The number of SRC subnode should be same as HW.

				  see below for detail.

- rcar_sound,dai		: DAI contents.

				  The number of DAI subnode should be same as HW.

				  see below for detail.



SSI subnode properties:

- interrupts			: Should contain SSI interrupt for PIO transfer

- shared-pin			: if shared clock pin



SRC subnode properties:

no properties at this point



DAI subnode properties:

- playback			: list of playback modules

- capture			: list of capture  modules

Documentation/devicetree/bindings/sound/simple-card.txt

+41 −1
Original line number Diff line number Diff line
@@ -23,6 +23,11 @@ Optional properties: 


Required subnodes:



- simple-audio-card,dai-link		: container for the CPU and CODEC sub-nodes

					  This container may be omitted when the

					  card has only one DAI link.

					  See the examples.



- simple-audio-card,cpu			: CPU   sub-node

- simple-audio-card,codec		: CODEC sub-node
@@ -49,7 +54,7 @@ Note: 
   CPU and CODEC sides as we need to keep the settings identical for both ends

   of the link.



Example:

Example 1 - single DAI link:



sound {

	compatible = "simple-audio-card";
@@ -94,3 +99,38 @@ sh_fsi2: sh_fsi2@ec230000 { 
	interrupt-parent = <&gic>;

	interrupts = <0 146 0x4>;

};



Example 2 - many DAI links:



sound {

	compatible = "simple-audio-card";

	simple-audio-card,name = "Cubox Audio";

	simple-audio-card,format = "i2s";



	simple-audio-card,dai-link@0 {		/* I2S - HDMI */

		simple-audio-card,cpu {

			sound-dai = <&audio1 0>;

		};

		simple-audio-card,codec {

			sound-dai = <&tda998x 0>;

		};

	};



	simple-audio-card,dai-link@1 {		/* S/PDIF - HDMI */

		simple-audio-card,cpu {

			sound-dai = <&audio1 1>;

		};

		simple-audio-card,codec {

			sound-dai = <&tda998x 1>;

		};

	};



	simple-audio-card,dai-link@2 {		/* S/PDIF - S/PDIF */

		simple-audio-card,cpu {

			sound-dai = <&audio1 1>;

		};

		simple-audio-card,codec {

			sound-dai = <&spdif_codec>;

		};

	};

};

Documentation/networking/netlink_mmap.txt

+2 −2
Original line number Diff line number Diff line
@@ -226,9 +226,9 @@ Ring setup: 
	void *rx_ring, *tx_ring;



	/* Configure ring parameters */

	if (setsockopt(fd, NETLINK_RX_RING, &req, sizeof(req)) < 0)

	if (setsockopt(fd, SOL_NETLINK, NETLINK_RX_RING, &req, sizeof(req)) < 0)

		exit(1);

	if (setsockopt(fd, NETLINK_TX_RING, &req, sizeof(req)) < 0)

	if (setsockopt(fd, SOL_NETLINK, NETLINK_TX_RING, &req, sizeof(req)) < 0)

		exit(1)



	/* Calculate size of each individual ring */

MAINTAINERS

+3 −2
Original line number Diff line number Diff line
@@ -911,11 +911,11 @@ F: arch/arm/include/asm/hardware/dec21285.h 
F:	arch/arm/mach-footbridge/



ARM/FREESCALE IMX / MXC ARM ARCHITECTURE

M:	Shawn Guo <shawn.guo@linaro.org>

M:	Shawn Guo <shawn.guo@freescale.com>

M:	Sascha Hauer <kernel@pengutronix.de>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

T:	git git://git.linaro.org/people/shawnguo/linux-2.6.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git

F:	arch/arm/mach-imx/

F:	arch/arm/boot/dts/imx*

F:	arch/arm/configs/imx*_defconfig
@@ -4552,6 +4552,7 @@ M: Greg Rose <gregory.v.rose@intel.com> 
M:	Alex Duyck <alexander.h.duyck@intel.com>

M:	John Ronciak <john.ronciak@intel.com>

M:	Mitch Williams <mitch.a.williams@intel.com>

M:	Linux NICS <linux.nics@intel.com>

L:	e1000-devel@lists.sourceforge.net

W:	http://www.intel.com/support/feedback.htm

W:	http://e1000.sourceforge.net/