Merge remote-tracking branches 'asoc/topic/tas6424', 'asoc/topic/tfa9879',... (3f8fe9be) · Commits · jan.koester / Linux

Documentation/devicetree/bindings/sound/tfa9879.txt

+4 −4

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

	- reg : the I2C address of the device		- reg : the I2C address of the device

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

	Example:		Example:

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

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

Documentation/devicetree/bindings/sound/ti,tas6424.txt

0 → 100644

+20 −0

Original line number	Original line	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

Documentation/devicetree/bindings/sound/tlv320aic31xx.txt

+8 −1

Original line number	Original line	Diff line number	Diff line
	@@ -22,7 +22,7 @@ Required properties:

	Optional properties:		Optional properties:

	- gpio-reset - gpio pin number used for codec reset		- reset-gpios - GPIO specification for the active low RESET input.
	- ai31xx-micbias-vg - MicBias Voltage setting		- ai31xx-micbias-vg - MicBias Voltage setting
	1 or MICBIAS_2_0V - MICBIAS output is powered to 2.0V		1 or MICBIAS_2_0V - MICBIAS output is powered to 2.0V
	2 or MICBIAS_2_5V - MICBIAS output is powered to 2.5V		2 or MICBIAS_2_5V - MICBIAS output is powered to 2.5V
	@@ -30,6 +30,10 @@ Optional properties:
	If this node is not mentioned or if the value is unknown, then		If this node is not mentioned or if the value is unknown, then
	micbias is set to 2.0V.		micbias is set to 2.0V.

			Deprecated properties:

			- gpio-reset - gpio pin number used for codec reset

	CODEC output pins:		CODEC output pins:
	* HPL		* HPL
	* HPR		* HPR
	@@ -48,6 +52,7 @@ CODEC input pins:
	The pins can be used in referring sound node's audio-routing property.		The pins can be used in referring sound node's audio-routing property.

	Example:		Example:
			#include <dt-bindings/gpio/gpio.h>
	#include <dt-bindings/sound/tlv320aic31xx-micbias.h>		#include <dt-bindings/sound/tlv320aic31xx-micbias.h>

	tlv320aic31xx: tlv320aic31xx@18 {		tlv320aic31xx: tlv320aic31xx@18 {
	@@ -56,6 +61,8 @@ tlv320aic31xx: tlv320aic31xx@18 {

	ai31xx-micbias-vg = <MICBIAS_OFF>;		ai31xx-micbias-vg = <MICBIAS_OFF>;

			reset-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;

	HPVDD-supply = <&regulator>;		HPVDD-supply = <&regulator>;
	SPRVDD-supply = <&regulator>;		SPRVDD-supply = <&regulator>;
	SPLVDD-supply = <&regulator>;		SPLVDD-supply = <&regulator>;

Documentation/devicetree/bindings/sound/tlv320aic3x.txt

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,7 @@ Required properties:

	Optional properties:		Optional properties:

	- gpio-reset - gpio pin number used for codec reset		- reset-gpios - GPIO specification for the active low RESET input.
	- ai3x-gpio-func - <array of 2 int> - AIC3X_GPIO1 & AIC3X_GPIO2 Functionality		- ai3x-gpio-func - <array of 2 int> - AIC3X_GPIO1 & AIC3X_GPIO2 Functionality
	- Not supported on tlv320aic3104		- Not supported on tlv320aic3104
	- ai3x-micbias-vg - MicBias Voltage required.		- ai3x-micbias-vg - MicBias Voltage required.
	@@ -34,6 +34,10 @@ Optional properties:
	- AVDD-supply, IOVDD-supply, DRVDD-supply, DVDD-supply : power supplies for the		- AVDD-supply, IOVDD-supply, DRVDD-supply, DVDD-supply : power supplies for the
	device as covered in Documentation/devicetree/bindings/regulator/regulator.txt		device as covered in Documentation/devicetree/bindings/regulator/regulator.txt

			Deprecated properties:

			- gpio-reset - gpio pin number used for codec reset

	CODEC output pins:		CODEC output pins:
	* LLOUT		* LLOUT
	* RLOUT		* RLOUT
	@@ -61,10 +65,14 @@ The pins can be used in referring sound node's audio-routing property.

	Example:		Example:

			#include <dt-bindings/gpio/gpio.h>

	tlv320aic3x: tlv320aic3x@1b {		tlv320aic3x: tlv320aic3x@1b {
	compatible = "ti,tlv320aic3x";		compatible = "ti,tlv320aic3x";
	reg = <0x1b>;		reg = <0x1b>;

			reset-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;

	AVDD-supply = <&regulator>;		AVDD-supply = <&regulator>;
	IOVDD-supply = <&regulator>;		IOVDD-supply = <&regulator>;
	DRVDD-supply = <&regulator>;		DRVDD-supply = <&regulator>;

MAINTAINERS

+1 −0

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

	NXP-NCI NFC DRIVER		NXP-NCI NFC DRIVER