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

Commit 89fc594b authored by Mark Brown's avatar Mark Brown
Browse files

Merge tag 'asoc-v4.2' into asoc-next 

ASoC: Updates for v4.2

The big thing this release has been Liam's addition of topology support
to the core.  We've also seen quite a bit of driver work and the
continuation of Lars' refactoring for component support.

 - Support for loading ASoC topology maps from firmware, intended to be
   used to allow self-describing DSP firmware images to be built which
   can map controls added by the DSP to userspace without the kernel
   needing to know about individual DSP firmwares.
 - Lots of refactoring to avoid direct access to snd_soc_codec where
   it's not needed supporting future refactoring.
 - Big refactoring and cleanup serieses for the Wolfson ADSP and TI
   TAS2552 drivers.
 - Support for TI TAS571x power amplifiers.
 - Support for Qualcomm APQ8016 and ZTE ZX296702 SoCs.
 - Support for x86 systems with RT5650 and Qualcomm Storm.

# gpg: Signature made Mon 08 Jun 2015 18:48:37 BST using RSA key ID 5D5487D0
# gpg: Oops: keyid_from_fingerprint: no pubkey
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>"
# gpg:                 aka "Mark Brown <broonie@debian.org>"
# gpg:                 aka "Mark Brown <broonie@kernel.org>"
# gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>"
# gpg:                 aka "Mark Brown <broonie@linaro.org>"
# gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>"
parents f4cb3b70 11e68886

Documentation/devicetree/bindings/sound/adi,adau1701.txt

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ Optional properties: 
			pin configurations as described in the datasheet,

			table 53. Note that the value of this property has

			to be prefixed with '/bits/ 8'.

 - avdd-supply: 	Power supply for AVDD, providing 3.3V

 - dvdd-supply: 	Power supply for DVDD, providing 3.3V



Examples:
@@ -28,6 +30,8 @@ Examples: 
			compatible = "adi,adau1701";

			reg = <0x34>;

			reset-gpio = <&gpio 23 0>;

			avdd-supply = <&vdd_3v3_reg>;

			dvdd-supply = <&vdd_3v3_reg>;

			adi,pll-mode-gpios = <&gpio 24 0 &gpio 25 0>;

			adi,pin-config = /bits/ 8 <0x4 0x7 0x5 0x5 0x4 0x4

                                                   0x4 0x4 0x4 0x4 0x4 0x4>;

Documentation/devicetree/bindings/sound/bt-sco.txt

0 → 100644
+13 −0
Original line number Diff line number Diff line 
Bluetooth-SCO audio CODEC



This device support generic Bluetooth SCO link.



Required properties:



  - compatible : "delta,dfbmcs320"



Example:



codec: bt_sco {

	compatible = "delta,dfbmcs320";

};

Documentation/devicetree/bindings/sound/gtm601.txt

0 → 100644
+13 −0
Original line number Diff line number Diff line 
GTM601 UMTS modem audio interface CODEC



This device has no configuration interface. Sample rate is fixed - 8kHz.



Required properties:



  - compatible : "option,gtm601"



Example:



codec: gtm601_codec {

	compatible = "option,gtm601";

};

Documentation/devicetree/bindings/sound/max98090.txt

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,12 @@ Optional properties: 


- maxim,dmic-freq: Frequency at which to clock DMIC



- maxim,micbias: Micbias voltage applies to the analog mic, valid voltages value are:

	0 - 2.2v

	1 - 2.55v

	2 - 2.4v

	3 - 2.8v



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



  * MIC1

Documentation/devicetree/bindings/sound/qcom,lpass-cpu.txt

+12 −1
Original line number Diff line number Diff line
@@ -4,12 +4,21 @@ This node models the Qualcomm Technologies Low-Power Audio SubSystem (LPASS). 


Required properties:



- compatible		: "qcom,lpass-cpu"

- compatible		: "qcom,lpass-cpu" or "qcom,apq8016-lpass-cpu"

- clocks		: Must contain an entry for each entry in clock-names.

- clock-names		: A list which must include the following entries:

				* "ahbix-clk"

				* "mi2s-osr-clk"

				* "mi2s-bit-clk"

			: required clocks for "qcom,lpass-cpu-apq8016"

				* "ahbix-clk"

				* "mi2s-bit-clk0"

				* "mi2s-bit-clk1"

				* "mi2s-bit-clk2"

				* "mi2s-bit-clk3"

				* "pcnoc-mport-clk"

				* "pcnoc-sway-clk"



- interrupts		: Must contain an entry for each entry in

			  interrupt-names.

- interrupt-names	: A list which must include the following entries:
@@ -22,6 +31,8 @@ Required properties: 
- reg-names		: A list which must include the following entries:

				* "lpass-lpaif"







Optional properties:



- qcom,adsp		: Phandle for the audio DSP node