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

Commit 28cbc335 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound updates from Takashi Iwai:
 "Here is the update of sound bits for 4.11: again at this time, no big
  changes in ALSA and ASoC core but only cosmetic changes like
  consitifaction.

  Meanwhile, quite a lot of developments are seen in a few driver side.

  ALSA Core:
   - Clean up, consitification of some ops

  HD-audio:
   - A slight behavior change of single_cmd option
   - Quirks for AmigaOne X1000, Samsung Ativ Book 8, Dell AiO, ALC221
     HP, and fixes for Lewisburg controller
   - Realtek ALC299, ALC1220 codecs

  Others:
   - USB-audio: Tascam US-16x08 DSP mixer quirk
   - Intel HDMI LPE audio support for Baytrail / Cherrytrail; this
     contains some updates in drm/i915 for the new platform binding

  ASoC:
   - Lots of updates in Intel drivers, mostly for DisplayPort and HDMI
     on Skylake and onwards, as well as more Baytrail / Cherrytrail
     boards support
   - Channel mapping support for HDMI
   - Support for AllWinner A31 and A33, Everest Semiconductor ES8328,
     Nuvoton NAU8540.

* tag 'sound-4.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (323 commits)
  ALSA: usb-audio: Tidy up mixer_us16x08.c
  ALSA: usb-audio: Fix memory leak and corruption in mixer_us16x08.c
  ALSA: usb-audio: purge needless variable length array
  ALSA: x86: hdmi: select CONFIG_SND_PCM
  ALSA: x86: Don't enable runtime PM as default
  ALSA: x86: Use runtime PM autosuspend
  ALSA: usb-audio: localize function without external linkage
  ALSA: usb-audio: localize one-referrer variable
  ALSA: usb-audio: Tascam US-16x08 DSP mixer quirk
  ALSA: emu10k1: constify snd_emux_operators structure
  ASoC: sun4i-spdif: drop unnessary snd_soc_unregister_component()
  ASoC: Intel: bxt: Add jack port initialize in bxt_rt298 machine
  ASoC: nau8825: automatic BCLK and LRC divde in master mode
  ASoC: hdac_hdmi: Add device id for Geminilake
  ASoC: Intel: Skylake: Add Geminlake IDs
  ASoC: rt298: Add DMI match for Geminilake reference platform
  ASoC: Intel: Skylake: Check device type to get endpoint configuration
  ASoC: Intel: bxt: Add jack port initialize in da7219_max98357a machine
  ASoC: Intel: Skylake: Add jack port initialize in nau88l25_ssm4567 machine
  ASoC: Intel: Skylake: Add jack port initialize in nau88l25_max98357a machine
  ...
parents 1ec5c186 7086b7b3

Documentation/devicetree/bindings/misc/atmel-ssc.txt

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ Optional properties: 
       this parameter to choose where the clock from.

     - By default the clock is from TK pin, if the clock from RK pin, this

       property is needed.

  - #sound-dai-cells: Should contain <0>.

     - This property makes the SSC into an automatically registered DAI.



Examples:

- PDC transfer:

Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt

+8 −3
Original line number Diff line number Diff line
@@ -2,8 +2,7 @@ Devicetree bindings for the Axentia TSE-850 audio complex 


Required properties:

  - compatible: "axentia,tse850-pcm5142"

  - axentia,ssc-controller: The phandle of the atmel SSC controller used as

    cpu dai.

  - axentia,cpu-dai: The phandle of the cpu dai.

  - axentia,audio-codec: The phandle of the PCM5142 codec.

  - axentia,add-gpios: gpio specifier that controls the mixer.

  - axentia,loop1-gpios: gpio specifier that controls loop relays on channel 1.
@@ -43,6 +42,12 @@ the PCM5142 codec. 


Example:



	&ssc0 {

		#sound-dai-cells = <0>;



		status = "okay";

	};



	&i2c {

		codec: pcm5142@4c {

			compatible = "ti,pcm5142";
@@ -77,7 +82,7 @@ Example: 
	sound {

		compatible = "axentia,tse850-pcm5142";



		axentia,ssc-controller = <&ssc0>;

		axentia,cpu-dai = <&ssc0>;

		axentia,audio-codec = <&codec>;



		axentia,add-gpios = <&pioA 8 GPIO_ACTIVE_LOW>;

Documentation/devicetree/bindings/sound/es8328.txt

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ This device supports both I2C and SPI. 


Required properties:



  - compatible : "everest,es8328"

  - compatible  : Should be "everest,es8328" or "everest,es8388"

  - DVDD-supply : Regulator providing digital core supply voltage 1.8 - 3.6V

  - AVDD-supply : Regulator providing analog supply voltage 3.3V

  - PVDD-supply : Regulator providing digital IO supply voltage 1.8 - 3.6V

Documentation/devicetree/bindings/sound/mt2701-afe-pcm.txt

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ Required properties: 
- compatible = "mediatek,mt2701-audio";

- reg: register location and size

- interrupts: Should contain AFE interrupt

- power-domains: should define the power domain

- clock-names: should have these clock names:

		"infra_sys_audio_clk",

		"top_audio_mux1_sel",
@@ -58,6 +59,7 @@ Example: 
		      <0 0x112A0000 0 0x20000>;

		interrupts = <GIC_SPI 104 IRQ_TYPE_LEVEL_LOW>,

			     <GIC_SPI 132 IRQ_TYPE_LEVEL_LOW>;

		power-domains = <&scpsys MT2701_POWER_DOMAIN_IFR_MSC>;

		clocks = <&infracfg CLK_INFRA_AUDIO>,

			 <&topckgen CLK_TOP_AUD_MUX1_SEL>,

			 <&topckgen CLK_TOP_AUD_MUX2_SEL>,

Documentation/devicetree/bindings/sound/nau8540.txt

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



This device supports I2C only.



Required properties:



  - compatible : "nuvoton,nau8540"



  - reg : the I2C address of the device.



Example:



codec: nau8540@1c {

       compatible = "nuvoton,nau8540";

       reg = <0x1c>;

};