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

Commit abebcdfb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound updates from Takashi Iwai:
 "There are little changes in core part, but lots of development are
  found in drivers, especially ASoC.  The diffstat shows regmap-related
  changes for a slight API additions / changes, and that's all.

  Looking at the code size statistics, the most significant addition is
  for Intel Skylake.  (Note that SKL support is still underway, the
  codec driver is missing.) Also STI controller driver is a major
  addition as well as a few new codec drivers.

  In HD-audio side, there are fewer changes than the past.  The
  noticeable change is the support of ELD notification from i915
  graphics driver.  Thus this pull request carries a few changes in
  drm/i915.

  Other than that, USB-audio got a rewrite of runtime PM code.  It was
  initiated by lockdep warning, but resulted in a good cleanup in the
  end.

  Below are the highlights:

  Common:
   - Factoring out of AC'97 reset code from ASoC into the core helper
   - A few regmap API extensions (in case it's not pulled yet)

  ASoC:
   - New drivers for Cirrus CS4349, GTM601, InvenSense ICS43432, Realtek
     RT298 and ST STI controllers
   - Machine drivers for Rockchip systems with MAX98090 and RT5645 and
     RT5650
   - Initial driver support for Intel Skylake devices
   - Lots of rsnd cleanup and enhancements
   - A few DAPM fixes and cleanups
   - A large number of cleanups in various drivers (conversion and
     standardized to regmap, component) mostly by Lars-Peter and Axel

  HD-audio:
   - Extended HD-audio core for Intel Skylake controller support
   - Quirks for Dell headsets, Alienware 15
   - Clean up of pin-based quirk tables for Realtek codecs
   - ELD notifier implenetation for Intel HDMI/DP

  USB-audio:
   - Refactor runtime PM code to make lockdep happier"

* tag 'sound-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (411 commits)
  drm/i915: Add locks around audio component bind/unbind
  drm/i915: Drop port_mst_index parameter from pin/eld callback
  ALSA: hda - Fix missing inline for dummy snd_hdac_set_codec_wakeup()
  ALSA: hda - Wake the codec up on pin/ELD notify events
  ALSA: hda - allow codecs to access the i915 pin/ELD callback
  drm/i915: Call audio pin/ELD notify function
  drm/i915: Add audio pin sense / ELD callback
  ASoC: zx296702-i2s: Fix resource leak when unload module
  ASoC: sti_uniperif: Ensure component is unregistered when unload module
  ASoC: au1x: psc-i2s: Convert to use devm_ioremap_resource
  ASoC: sh: dma-sh7760: Convert to devm_snd_soc_register_platform
  ASoC: spear_pcm: Use devm_snd_dmaengine_pcm_register to fix resource leak
  ALSA: fireworks/bebob/dice/oxfw: fix substreams counting at vmalloc failure
  ASoC: Clean up docbook warnings
  ASoC: txx9: Convert to devm_snd_soc_register_platform
  ASoC: pxa: Convert to devm_snd_soc_register_platform
  ASoC: nuc900: Convert to devm_snd_soc_register_platform
  ASoC: blackfin: Convert to devm_snd_soc_register_platform
  ASoC: au1x: Convert to devm_snd_soc_register_platform
  ASoC: qcom: Constify asoc_qcom_lpass_cpu_dai_ops
  ...
parents 670c039d d5f362a7

Documentation/DocBook/alsa-driver-api.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ 
     <sect1><title>ASoC Core API</title>

!Iinclude/sound/soc.h

!Esound/soc/soc-core.c

!Esound/soc/soc-cache.c

<!-- !Esound/soc/soc-cache.c no docbook comments here -->

!Esound/soc/soc-devres.c

!Esound/soc/soc-io.c

!Esound/soc/soc-pcm.c

Documentation/devicetree/bindings/sound/cs4349.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
CS4349 audio CODEC



Required properties:



  - compatible : "cirrus,cs4349"



  - reg : the I2C address of the device for I2C



Optional properties:



  - reset-gpios : a GPIO spec for the reset pin.



Example:



codec: cs4349@48 {

        compatible = "cirrus,cs4349";

        reg = <0x48>;

        reset-gpios = <&gpio 54 0>;

};

Documentation/devicetree/bindings/sound/ics43432.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
Invensense ICS-43432 MEMS microphone with I2S output.



There are no software configuration options for this device, indeed, the only

host connection is the I2S interface. Apart from requirements on clock

frequency (460 kHz to 3.379 MHz according to the data sheet) there must be

64 clock cycles in each stereo output frame; 24 of the 32 available bits

contain audio data. A hardware pin determines if the device outputs data

on the left or right channel of the I2S frame.



Required properties:

  - compatible : Must be "invensense,ics43432"



Example:



	ics43432: ics43432 {

		compatible = "invensense,ics43432";

	};

Documentation/devicetree/bindings/sound/max98357a.txt

+5 −1
Original line number Diff line number Diff line
@@ -4,7 +4,11 @@ This node models the Maxim MAX98357A DAC. 


Required properties:

- compatible   : "maxim,max98357a"

- sdmode-gpios : GPIO specifier for the GPIO -> DAC SDMODE pin



Optional properties:

- sdmode-gpios : GPIO specifier for the chip's SD_MODE pin.

        If this option is not specified then driver does not manage

        the pin state (e.g. chip is always on).



Example:

Documentation/devicetree/bindings/sound/renesas,rsnd.txt

+22 −0
Original line number Diff line number Diff line
@@ -18,6 +18,12 @@ Required properties: 
- rcar_sound,src		: Should contain SRC feature.

				  The number of SRC subnode should be same as HW.

				  see below for detail.

- rcar_sound,ctu		: Should contain CTU feature.

				  The number of CTU subnode should be same as HW.

				  see below for detail.

- rcar_sound,mix		: Should contain MIX feature.

				  The number of MIX subnode should be same as HW.

				  see below for detail.

- rcar_sound,dvc		: Should contain DVC feature.

				  The number of DVC subnode should be same as HW.

				  see below for detail.
@@ -90,6 +96,22 @@ rcar_sound: sound@ec500000 { 
		};

	};



	rcar_sound,mix {

		mix0: mix@0 { };

		mix1: mix@1 { };

	};



	rcar_sound,ctu {

		ctu00: ctu@0 { };

		ctu01: ctu@1 { };

		ctu02: ctu@2 { };

		ctu03: ctu@3 { };

		ctu10: ctu@4 { };

		ctu11: ctu@5 { };

		ctu12: ctu@6 { };

		ctu13: ctu@7 { };

	};



	rcar_sound,src {

		src0: src@0 {

			interrupts = <0 352 IRQ_TYPE_LEVEL_HIGH>;