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

Commit 5691f0e9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sound-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound 

Pull sound updates from Takashi Iwai:
 "Again the diffstat shows a widely distributed pattern at this cycle,
  as there've been many code cleanups and refactoring allover the
  places. Other than that, the development was relatively calm, and no
  big surprise shouldn't be expected. Here are some highlights:

  Core:
   - Sequencer code refactoring / documentation updates
   - TLV code moved to uapi, following some relevant cleanups

  USB-Audio:
   - Lots of LINE6 driver fixes / updates
   - DragonFly and TEAC device quirk updates

  HD-audio:
   - Usual fixupes for Dell, Lenovo and HP machines
   - Link-audio time reporting capability

  ASoC:
   - Large refactoring of simple-card code to be shared with rcar driver
   - Removal of some duplicated ops over lots of CODEC drivers
   - Again quite a few Intel SKL driver updates
   - New drivers for Nuvoton NAU88C10, Realtek RT5660 and RT5663"

* tag 'sound-4.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (465 commits)
  ASoC: fsl: Fix lockups with recent cache changes
  ASoC: Intel: Skylake: fix memory leak of module on error exit path
  ASoC: rsnd: add SNDRV_PCM_TRIGGER_SUSPEND/RESUME
  ASoC: wm8960: remove usage of obsoleted TLV-related macro
  ASoC: rt5616: remove usage of obsoleted TLV-related macro
  ASoC: max9867: remove usage of obsoleted TLV-related macro
  ASoC: trivial: system spelling fix
  ASoC: da7219: fix inappropriate condition statement
  ASoC: tlv320aic31xx: do not declare support for mono DAI
  ASoC: stac9766: fix wrong usage of DECLARE_TLV_DB_LINEAR()
  ASoC: wm8991: remove unused variable
  ASoC: wm8991: fix wrong usage of DECLARE_TLV_DB_LINEAR()
  ASOC: tpa6130a2: add static qualifier for file local symbols
  ASoC: sst-bxt-rt298: fix obsoleted initializers for array
  ASoC: sst-bxt-da7219_max98357a: fix obsoleted initializers for array
  ASoC: rt5616: add static qualifier for file local symbols
  ASoC: arizona: Add output power up/down delays for speaker path
  ASoC: arizona: Add debug prints for output power up/down times
  ALSA: hda - Add the top speaker pin config for HP Spectre x360
  ASoC: Intel: Add DMIC channel constraint for bxt machine
  ...
parents 878fb5dc eeea8b40

Documentation/devicetree/bindings/sound/nau8810.txt

0 → 100644
+16 −0
Original line number Diff line number Diff line 
NAU8810 audio CODEC



This device supports I2C only.



Required properties:



  - compatible : "nuvoton,nau8810"



  - reg : the I2C address of the device.



Example:



codec: nau8810@1a {

	compatible = "nuvoton,nau8810";

	reg = <0x1a>;

};

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

0 → 100644
+42 −0
Original line number Diff line number Diff line 
NVIDIA Tegra audio complex, with SGTL5000 CODEC



Required properties:

- compatible : "nvidia,tegra-audio-sgtl5000"

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

  See ../clocks/clock-bindings.txt for details.

- clock-names : Must include the following entries:

  - pll_a

  - pll_a_out0

  - mclk (The Tegra cdev1/extern1 clock, which feeds the CODEC's mclk)

- nvidia,model : The user-visible name of this sound complex.

- 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 SGTL5000's pins (as documented in its binding), and the jacks

  on the board:



  * Headphone Jack

  * Line In Jack

  * Mic Jack



- nvidia,i2s-controller : The phandle of the Tegra I2S controller that's

  connected to the CODEC.

- nvidia,audio-codec : The phandle of the SGTL5000 audio codec.



Example:



sound {

	compatible = "toradex,tegra-audio-sgtl5000-apalis_t30",

		     "nvidia,tegra-audio-sgtl5000";

	nvidia,model = "Toradex Apalis T30";

	nvidia,audio-routing =

		"Headphone Jack", "HP_OUT",

		"LINE_IN", "Line In Jack",

		"MIC_IN", "Mic Jack";

	nvidia,i2s-controller = <&tegra_i2s2>;

	nvidia,audio-codec = <&sgtl5000>;

	clocks = <&tegra_car TEGRA30_CLK_PLL_A>,

		 <&tegra_car TEGRA30_CLK_PLL_A_OUT0>,

		 <&tegra_car TEGRA30_CLK_EXTERN1>;

	clock-names = "pll_a", "pll_a_out0", "mclk";

};

Documentation/devicetree/bindings/sound/qcom,apq8016-sbc.txt

+30 −0
Original line number Diff line number Diff line
@@ -16,6 +16,24 @@ Required properties: 
				* "spkr-iomux"

- qcom,model		: Name of the sound card.



- qcom,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 could be power supplies, MicBias

			  of msm8x16_wcd codec and the jacks on the board:



			  Power supplies:

			  * MIC BIAS External1

			  * MIC BIAS External2

			  * MIC BIAS Internal1

			  * MIC BIAS Internal2



			  Board connectors:

			  * Headset Mic

			  * Secondary Mic",

			  * DMIC

			  * Ext Spk



Dai-link subnode properties and subnodes:



Required dai-link subnodes:
@@ -37,6 +55,18 @@ sound: sound { 
	reg-names = "mic-iomux", "spkr-iomux";

	qcom,model = "DB410c";



	qcom,audio-routing =

		"MIC BIAS External1", "Handset Mic",

		"MIC BIAS Internal2", "Headset Mic",

		"MIC BIAS External1", "Secondary Mic",

		"AMIC1", "MIC BIAS External1",

		"AMIC2", "MIC BIAS Internal2",

		"AMIC3", "MIC BIAS External1",

		"DMIC1", "MIC BIAS Internal1",

		"MIC BIAS Internal1", "Digital Mic1",

		"DMIC2", "MIC BIAS Internal1",

		"MIC BIAS Internal1", "Digital Mic2";



	/* I2S - Internal codec */

	internal-dai-link@0 {

		cpu { /* PRIMARY */

Documentation/devicetree/bindings/sound/rockchip,rk3399-gru-sound.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
ROCKCHIP with MAX98357A/RT5514/DA7219 codecs on GRU boards



Required properties:

- compatible: "rockchip,rk3399-gru-sound"

- rockchip,cpu: The phandle of the Rockchip I2S controller that's

  connected to the codecs

- rockchip,codec: The phandle of the MAX98357A/RT5514/DA7219 codecs



Optional properties:

- dmic-wakeup-delay-ms : specify delay time (ms) for DMIC ready.

  If this option is specified, which means it's required dmic need

  delay for DMIC to ready so that rt5514 can avoid recording before

  DMIC send valid data



Example:



sound {

	compatible = "rockchip,rk3399-gru-sound";

	rockchip,cpu = <&i2s0>;

	rockchip,codec = <&max98357a &rt5514 &da7219>;

	dmic-wakeup-delay-ms = <20>;

};

Documentation/devicetree/bindings/sound/rt5659.txt

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,9 @@ Required properties: 


Optional properties:



- clocks: The phandle of the master clock to the CODEC

- clock-names: Should be "mclk"



- realtek,in1-differential

- realtek,in3-differential

- realtek,in4-differential