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

Unverified Commit 6ce6d181 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'asoc/topic/tfa9879',... 

Merge remote-tracking branches 'asoc/topic/tfa9879', 'asoc/topic/tlv320aic31xx', 'asoc/topic/tlv320aic32x4', 'asoc/topic/tlv320aic3x' and 'asoc/topic/tlv320dac33' into asoc-next
parents 7f4b8750 a73be943 0ce918c9 9245f647 025f8449 c4305af4

Documentation/devicetree/bindings/sound/tfa9879.txt

+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>;

Documentation/devicetree/bindings/sound/tlv320aic31xx.txt

+8 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ Required 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

        1 or MICBIAS_2_0V - MICBIAS output is powered to 2.0V

        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

	micbias	is set to 2.0V.



Deprecated properties:



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



CODEC output pins:

  * HPL

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



Example:

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

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



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


	ai31xx-micbias-vg = <MICBIAS_OFF>;



	reset-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;



	HPVDD-supply = <&regulator>;

	SPRVDD-supply = <&regulator>;

	SPLVDD-supply = <&regulator>;

Documentation/devicetree/bindings/sound/tlv320aic3x.txt

+9 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ Required 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

				    - Not supported on tlv320aic3104

- ai3x-micbias-vg - MicBias Voltage required.
@@ -34,6 +34,10 @@ Optional properties: 
- AVDD-supply, IOVDD-supply, DRVDD-supply, DVDD-supply : power supplies for the

  device as covered in Documentation/devicetree/bindings/regulator/regulator.txt



Deprecated properties:



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



CODEC output pins:

  * LLOUT

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


Example:



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



tlv320aic3x: tlv320aic3x@1b {

	compatible = "ti,tlv320aic3x";

	reg = <0x1b>;



	reset-gpios = <&gpio1 17 GPIO_ACTIVE_LOW>;



	AVDD-supply = <&regulator>;

	IOVDD-supply = <&regulator>;

	DRVDD-supply = <&regulator>;

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -9804,6 +9804,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

sound/soc/codecs/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -943,12 +943,12 @@ config SND_SOC_TLV320AIC32X4 
	tristate



config SND_SOC_TLV320AIC32X4_I2C

	tristate

	tristate "Texas Instruments TLV320AIC32x4 audio CODECs - I2C"

	depends on I2C

	select SND_SOC_TLV320AIC32X4



config SND_SOC_TLV320AIC32X4_SPI

	tristate

	tristate "Texas Instruments TLV320AIC32x4 audio CODECs - SPI"

	depends on SPI_MASTER

	select SND_SOC_TLV320AIC32X4