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

Commit 3fd8a804 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge tag 'asoc-v3.12-2' of... 

Merge tag 'asoc-v3.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next

ASoC: Updates for v3.12

A few more updates for v3.12, mostly small cleanups plus the addition of
the DT bindings for kirkwood and the new i.MX S/PDIF driver.
parents 1c9a341b 6d52825f

Documentation/devicetree/bindings/sound/imx-audio-spdif.txt

0 → 100644
+34 −0
Original line number Diff line number Diff line 
Freescale i.MX audio complex with S/PDIF transceiver



Required properties:



  - compatible : "fsl,imx-audio-spdif"



  - model : The user-visible name of this sound complex



  - spdif-controller : The phandle of the i.MX S/PDIF controller





Optional properties:



  - spdif-out : This is a boolean property. If present, the transmitting

    function of S/PDIF will be enabled, indicating there's a physical

    S/PDIF out connector/jack on the board or it's connecting to some

    other IP block, such as an HDMI encoder/display-controller.



  - spdif-in : This is a boolean property. If present, the receiving

    function of S/PDIF will be enabled, indicating there's a physical

    S/PDIF in connector/jack on the board.



* Note: At least one of these two properties should be set in the DT binding.





Example:



sound-spdif {

	compatible = "fsl,imx-audio-spdif";

	model = "imx-spdif";

	spdif-controller = <&spdif>;

	spdif-out;

	spdif-in;

};

Documentation/devicetree/bindings/sound/mvebu-audio.txt

0 → 100644
+29 −0
Original line number Diff line number Diff line 
* mvebu (Kirkwood, Dove, Armada 370) audio controller



Required properties:



- compatible: "marvell,mvebu-audio"



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

  region.



- interrupts: list of two irq numbers.

  The first irq is used for data flow and the second one is used for errors.



- clocks: one or two phandles.

  The first one is mandatory and defines the internal clock.

  The second one is optional and defines an external clock.



- clock-names: names associated to the clocks:

	"internal" for the internal clock

	"extclk" for the external clock



Example:



i2s1: audio-controller@b4000 {

	compatible = "marvell,mvebu-audio";

	reg = <0xb4000 0x2210>;

	interrupts = <21>, <22>;

	clocks = <&gate_clk 13>;

	clock-names = "internal";

};

Documentation/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -2953,7 +2953,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			improve throughput, but will also increase the

			amount of memory reserved for use by the client.



	swapaccount[=0|1]

	swapaccount=[0|1]

			[KNL] Enable accounting of swap in memory resource

			controller if no parameter or 1 is given or disable

			it if 0 is given (See Documentation/cgroups/memory.txt)

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -5885,7 +5885,7 @@ F: drivers/i2c/busses/i2c-omap.c 
F:	include/linux/i2c-omap.h



OMAP DEVICE TREE SUPPORT

M:	Benoît Cousson <b-cousson@ti.com>

M:	Benoît Cousson <bcousson@baylibre.com>

M:	Tony Lindgren <tony@atomide.com>

L:	linux-omap@vger.kernel.org

L:	devicetree@vger.kernel.org
@@ -5965,14 +5965,14 @@ S: Maintained 
F:	drivers/char/hw_random/omap-rng.c



OMAP HWMOD SUPPORT

M:	Benoît Cousson <b-cousson@ti.com>

M:	Benoît Cousson <bcousson@baylibre.com>

M:	Paul Walmsley <paul@pwsan.com>

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	arch/arm/mach-omap2/omap_hwmod.*



OMAP HWMOD DATA FOR OMAP4-BASED DEVICES

M:	Benoît Cousson <b-cousson@ti.com>

M:	Benoît Cousson <bcousson@baylibre.com>

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	arch/arm/mach-omap2/omap_hwmod_44xx_data.c

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 11

SUBLEVEL = 0

EXTRAVERSION = -rc6

EXTRAVERSION = -rc7

NAME = Linux for Workgroups



# *DOCUMENTATION*