Commit 1b7e8204 authored by Mark Brown's avatar Mark Brown
Browse files

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

ASoC: Updates for v4.5

 - Some more fixes for the topology code, though it is still not final
   and ready for enabling in production.  We really need to get to the
   point where that can be done.
 - A pile of changes for Intel SkyLake drivers which hopefully deliver
   some useful initial functionality for systems with this chipset,
   though there is more work still to come.
 - New drivers for a number of Imagination Technologies IPs.
 - Lots of new features and cleanups for the Renesas drivers.
 - ANC support for WM5110.
 - New driver for Atmel class D speaker drivers.
 - New drivers for Cirrus CS47L24 and WM1831.
 - New driver for Dialog DA7128.
 - New drivers for Realtek RT5659 and RT56156.
 - New driver for Rockchip RK3036.

# gpg: Signature made Wed 23 Dec 2015 00:36:01 GMT using RSA key ID 5D5487D0
# gpg: Oops: keyid_from_fingerprint: no pubkey
# gpg: Oops: keyid_from_fingerprint: no pubkey
# gpg: key 00000000 occurs more than once in the trustdb
# gpg: key 16005C11: no public key for trusted key - skipped
# gpg: key 16005C11 marked as ultimately trusted
# 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 b574a192 fec89f94

Documentation/devicetree/bindings/sound/ak4613.txt

+10 −0
Original line number Diff line number Diff line
@@ -7,6 +7,16 @@ Required properties: 
- compatible : "asahi-kasei,ak4613"

- reg : The chip select number on the I2C bus



Optional properties:

- asahi-kasei,in1-single-end	: Boolean. Indicate input / output pins are single-ended.

- asahi-kasei,in2-single-end	  rather than differential.

- asahi-kasei,out1-single-end

- asahi-kasei,out2-single-end

- asahi-kasei,out3-single-end

- asahi-kasei,out4-single-end

- asahi-kasei,out5-single-end

- asahi-kasei,out6-single-end



Example:



&i2c {

Documentation/devicetree/bindings/sound/atmel-classd.txt

+6 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ Required properties: 
	Required elements: "pclk", "gclk" and "aclk".

- clocks

	Please refer to clock-bindings.txt.

- assigned-clocks

	Should be <&classd_gclk>.

- assigned-clock-parents

	Should be <&audio_pll_pmc>.



Optional properties:

- pinctrl-names, pinctrl-0
@@ -43,6 +47,8 @@ classd: classd@fc048000 { 
		dma-names = "tx";

		clocks = <&classd_clk>, <&classd_gclk>, <&audio_pll_pmc>;

		clock-names = "pclk", "gclk", "aclk";

		assigned-clocks = <&classd_gclk>;

		assigned-clock-parents = <&audio_pll_pmc>;



		pinctrl-names = "default";

		pinctrl-0 = <&pinctrl_classd_default>;

Documentation/devicetree/bindings/sound/atmel-pdmic.txt

0 → 100644
+55 −0
Original line number Diff line number Diff line 
* Atmel PDMIC driver under ALSA SoC architecture



Required properties:

- compatible

	Should be "atmel,sama5d2-pdmic".

- reg

	Should contain PDMIC registers location and length.

- interrupts

	Should contain the IRQ line for the PDMIC.

- dmas

	One DMA specifiers as described in atmel-dma.txt and dma.txt files.

- dma-names

	Must be "rx".

- clock-names

	Required elements:

	- "pclk"	peripheral clock

	- "gclk"	generated clock

- clocks

	Must contain an entry for each required entry in clock-names.

	Please refer to clock-bindings.txt.

- atmel,mic-min-freq

	The minimal frequency that the micphone supports.

- atmel,mic-max-freq

	The maximal frequency that the micphone supports.



Optional properties:

- pinctrl-names, pinctrl-0

	Please refer to pinctrl-bindings.txt.

- atmel,model

	The user-visible name of this sound card.

	The default value is "PDMIC".

- atmel,mic-offset

	The offset that should be added.

	The range is from -32768 to 32767.

	The default value is 0.



Example:

	pdmic@f8018000 {

				compatible = "atmel,sama5d2-pdmic";

				reg = <0xf8018000 0x124>;

				interrupts = <48 IRQ_TYPE_LEVEL_HIGH 7>;

				dmas = <&dma0

					(AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1)

					| AT91_XDMAC_DT_PERID(50))>;

				dma-names = "rx";

				clocks = <&pdmic_clk>, <&pdmic_gclk>;

				clock-names = "pclk", "gclk";



				pinctrl-names = "default";

				pinctrl-0 = <&pinctrl_pdmic_default>;

				atmel,model = "PDMIC @ sama5d2_xplained";

				atmel,mic-min-freq = <1000000>;

				atmel,mic-max-freq = <3246000>;

				atmel,mic-offset = <0x0>;

	};

Documentation/devicetree/bindings/sound/da7218.txt

0 → 100644
+104 −0
Original line number Diff line number Diff line 
Dialog Semiconductor DA7218 Audio Codec bindings



DA7218 is an audio codec with HP detect feature.



======



Required properties:

- compatible : Should be "dlg,da7217" or "dlg,da7218"

- reg: Specifies the I2C slave address



- VDD-supply: VDD power supply for the device

- VDDMIC-supply: VDDMIC power supply for the device

- VDDIO-supply: VDDIO power supply for the device

  (See Documentation/devicetree/bindings/regulator/regulator.txt for further

   information relating to regulators)



Optional properties:

- interrupt-parent: Specifies the phandle of the interrupt controller to which

  the IRQs from DA7218 are delivered to.

- interrupts: IRQ line info for DA7218 chip.

  (See Documentation/devicetree/bindings/interrupt-controller/interrupts.txt for

   further information relating to interrupt properties)

- interrupt-names : Name associated with interrupt line. Should be "wakeup" if

  interrupt is to be used to wake system, otherwise "irq" should be used.

- wakeup-source: Flag to indicate this device can wake system (suspend/resume).



- clocks : phandle and clock specifier for codec MCLK.

- clock-names : Clock name string for 'clocks' attribute, should be "mclk".



- dlg,micbias1-lvl-millivolt : Voltage (mV) for Mic Bias 1

	[<1200>, <1600>, <1800>, <2000>, <2200>, <2400>, <2600>, <2800>, <3000>]

- dlg,micbias2-lvl-millivolt : Voltage (mV) for Mic Bias 2

	[<1200>, <1600>, <1800>, <2000>, <2200>, <2400>, <2600>, <2800>, <3000>]

- dlg,mic1-amp-in-sel : Mic1 input source type

	["diff", "se_p", "se_n"]

- dlg,mic2-amp-in-sel : Mic2 input source type

	["diff", "se_p", "se_n"]

- dlg,dmic1-data-sel : DMIC1 channel select based on clock edge.

	["lrise_rfall", "lfall_rrise"]

- dlg,dmic1-samplephase : When to sample audio from DMIC1.

	["on_clkedge", "between_clkedge"]

- dlg,dmic1-clkrate-hz : DMic1 clock frequency (Hz).

	[<1500000>, <3000000>]

- dlg,dmic2-data-sel : DMic2 channel select based on clock edge.

	["lrise_rfall", "lfall_rrise"]

- dlg,dmic2-samplephase : When to sample audio from DMic2.

	["on_clkedge", "between_clkedge"]

- dlg,dmic2-clkrate-hz : DMic2 clock frequency (Hz).

	[<1500000>, <3000000>]

- dlg,hp-diff-single-supply : Boolean flag, use single supply for HP

			      (DA7217 only)



======



Optional Child node - 'da7218_hpldet' (DA7218 only):



Optional properties:

- dlg,jack-rate-us : Time between jack detect measurements (us)

	[<5>, <10>, <20>, <40>, <80>, <160>, <320>, <640>]

- dlg,jack-debounce : Number of debounce measurements taken for jack detect

	[<0>, <2>, <3>, <4>]

- dlg,jack-threshold-pct : Threshold level for jack detection (% of VDD)

	[<84>, <88>, <92>, <96>]

- dlg,comp-inv : Boolean flag, invert comparator output

- dlg,hyst : Boolean flag, enable hysteresis

- dlg,discharge : Boolean flag, auto discharge of Mic Bias on jack removal



======



Example:



	codec: da7218@1a {

		compatible = "dlg,da7218";

		reg = <0x1a>;

		interrupt-parent = <&gpio6>;

		interrupts = <11 IRQ_TYPE_LEVEL_HIGH>;

		wakeup-source;



		VDD-supply = <&reg_audio>;

		VDDMIC-supply = <&reg_audio>;

		VDDIO-supply = <&reg_audio>;



		clocks = <&clks 201>;

		clock-names = "mclk";



		dlg,micbias1-lvl-millivolt = <2600>;

		dlg,micbias2-lvl-millivolt = <2600>;

		dlg,mic1-amp-in-sel = "diff";

		dlg,mic2-amp-in-sel = "diff";



		dlg,dmic1-data-sel = "lrise_rfall";

		dlg,dmic1-samplephase = "on_clkedge";

		dlg,dmic1-clkrate-hz = <3000000>;

		dlg,dmic2-data-sel = "lrise_rfall";

		dlg,dmic2-samplephase = "on_clkedge";

		dlg,dmic2-clkrate-hz = <3000000>;



		da7218_hpldet {

			dlg,jack-rate-us = <40>;

			dlg,jack-debounce = <2>;

			dlg,jack-threshold-pct = <84>;

			dlg,hyst;

		};

	};

Documentation/devicetree/bindings/sound/da7219.txt

+5 −3
Original line number Diff line number Diff line
@@ -28,13 +28,15 @@ Optional properties: 
- clocks : phandle and clock specifier for codec MCLK.

- clock-names : Clock name string for 'clocks' attribute, should be "mclk".



- dlg,ldo-lvl : Required internal LDO voltage (mV) level for digital engine

	[<1050>, <1100>, <1200>, <1400>]

- dlg,micbias-lvl : Voltage (mV) for Mic Bias

	[<1800>, <2000>, <2200>, <2400>, <2600>]

	[<1600>, <1800>, <2000>, <2200>, <2400>, <2600>]

- dlg,mic-amp-in-sel : Mic input source type

	["diff", "se_p", "se_n"]



Deprecated properties:

- dlg,ldo-lvl : Required internal LDO voltage (mV) level for digital engine

  (LDO unavailable in production HW so property no longer required).



======



Child node - 'da7219_aad':

CRA Git | Maintained and supported by SUSTech CRA and CCSE