Merge remote-tracking branch 'asoc/topic/wm8753' into asoc-next (a2e4b255) · Commits · e / devices / android_kernel_oneplus_sm7250

Documentation/devicetree/bindings/sound/nvidia,tegra-audio-wm8753.txt

+2 −25

Original line number	Diff line number	Diff line
		@@ -11,31 +11,8 @@ Required properties:
		- nvidia,audio-routing : A list of the connections between audio components.
		Each entry is a pair of strings, the first being the connection's sink,
		the second being the connection's source. Valid names for sources and
		sinks are the WM8753's pins, and the jacks on the board:

		WM8753 pins:

		* LOUT1
		* LOUT2
		* ROUT1
		* ROUT2
		* MONO1
		* MONO2
		* OUT3
		* OUT4
		* LINE1
		* LINE2
		* RXP
		* RXN
		* ACIN
		* ACOP
		* MIC1N
		* MIC1
		* MIC2N
		* MIC2
		* Mic Bias

		Board connectors:
		sinks are the WM8753's pins as documented in the binding for the WM8753,
		and the jacks on the board:

		* Headphone Jack
		* Mic Jack

+23 −1

Original line number	Diff line number	Diff line
		@@ -10,9 +10,31 @@ Required properties:
		- reg : the I2C address of the device for I2C, the chip select
		number for SPI.

		Pins on the device (for linking into audio routes):

		* LOUT1
		* LOUT2
		* ROUT1
		* ROUT2
		* MONO1
		* MONO2
		* OUT3
		* OUT4
		* LINE1
		* LINE2
		* RXP
		* RXN
		* ACIN
		* ACOP
		* MIC1N
		* MIC1
		* MIC2N
		* MIC2
		* Mic Bias

		Example:

		codec: wm8737@1a {
		codec: wm8753@1a {
		compatible = "wlf,wm8753";
		reg = <0x1a>;
		};

+3 −2

Original line number	Diff line number	Diff line
		@@ -1456,7 +1456,8 @@ static int wm8753_resume(struct snd_soc_codec *codec)
		if (codec->dapm.suspend_bias_level == SND_SOC_BIAS_ON) {
		wm8753_set_bias_level(codec, SND_SOC_BIAS_PREPARE);
		codec->dapm.bias_level = SND_SOC_BIAS_ON;
		schedule_delayed_work(&codec->dapm.delayed_work,
		queue_delayed_work(system_power_efficient_wq,
		&codec->dapm.delayed_work,
		msecs_to_jiffies(caps_charge));
		}