Merge remote-tracking branches 'asoc/topic/sunxi', 'asoc/topic/symmetry',... (ced9541c) · Commits · 戴 / test

Documentation/devicetree/bindings/sound/sun4i-i2s.txt

+2 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,7 @@ Required properties:
		- compatible: should be one of the following:
		- "allwinner,sun4i-a10-i2s"
		- "allwinner,sun6i-a31-i2s"
		- "allwinner,sun8i-a83t-i2s"
		- "allwinner,sun8i-h3-i2s"
		- reg: physical base address of the controller and length of memory mapped
		region.
		@@ -23,6 +24,7 @@ Required properties:

		Required properties for the following compatibles:
		- "allwinner,sun6i-a31-i2s"
		- "allwinner,sun8i-a83t-i2s"
		- "allwinner,sun8i-h3-i2s"
		- resets: phandle to the reset line for this codec

+3 −1

Original line number	Diff line number	Diff line
		@@ -6,10 +6,12 @@ audio playback. For more product information please see the links below:

		http://www.ti.com/product/TAS5720L
		http://www.ti.com/product/TAS5720M
		http://www.ti.com/product/TAS5722L

		Required properties:

		- compatible : "ti,tas5720"
		- compatible : "ti,tas5720",
		"ti,tas5722"
		- reg : I2C slave address
		- dvdd-supply : phandle to a 3.3-V supply for the digital circuitry
		- pvdd-supply : phandle to a supply used for the Class-D amp and the analog

+4 −4

Original line number	Diff line number	Diff line
		@@ -6,15 +6,15 @@ Required properties:

		- reg : the I2C address of the device

		- #sound-dai-cells : must be 0.

		Example:

		&i2c1 {
		clock-frequency = <100000>;
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_i2c1>;
		status = "okay";

		codec: tfa9879@6c {
		amp: amp@6c {
		#sound-dai-cells = <0>;
		compatible = "nxp,tfa9879";
		reg = <0x6c>;

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		Texas Instruments TAS6424 Quad-Channel Audio amplifier

		The TAS6424 serial control bus communicates through I2C protocols.

		Required properties:
		- compatible: "ti,tas6424" - TAS6424
		- reg: I2C slave address
		- sound-dai-cells: must be equal to 0

		Example:

		tas6424: tas6424@6a {
		compatible = "ti,tas6424";
		reg = <0x6a>;

		#sound-dai-cells = <0>;
		};

		For more product information please see the link below:
		http://www.ti.com/product/TAS6424-Q1

+1 −0

Original line number	Diff line number	Diff line
		@@ -9803,6 +9803,7 @@ NXP TFA9879 DRIVER
		M: Peter Rosin <peda@axentia.se>
		L: alsa-devel@alsa-project.org (moderated for non-subscribers)
		S: Maintained
		F: Documentation/devicetree/bindings/sound/tfa9879.txt
		F: sound/soc/codecs/tfa9879*

		NXP-NCI NFC DRIVER