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

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

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

Pull sound updates from Takashi Iwai:
 "This became a fairly large pull request.  In addition to the usual
  driver updates / fixes, there have been a high amount of cleanups in
  ASoC area, as well as control API helpers and kernel documentations
  fixes touching through the whole tree.

  In the driver side, the biggest changes are the support for new Intel
  SoC found on new x86 machines, and the updates of FireWire dice and
  oxfw drivers.

  Some remarkable items are below:

  ALSA core:
   - PCM mmap code cleanup, removal of arch-dependent codes
   - PCM xrun injection support
   - PCM hwptr tracepoint support
   - Refactoring of snd_pcm_action(), simplification of PCM locking
   - Robustified sequecner auto-load functionality
   - New control API helpers and lots of cleanups along with them
   - Lots of kerneldoc fixes and cleanups

  USB-audio:
   - The mixer resume code was largely rewritten, and the devices with
     quirks are resumed properly.
   - New hardware support: Focusrite Scarlett, Digidesign Mbox1,
     Denon/Marantz DACs, Zoom R16/24

  FireWire:
   - DICE driver updates with better duplex and sync support, including
     MIDI support
   - New OXFW driver for Oxford Semiconductor FW970/971 chipset,
     including the previous LaCie Speakers device.  Fullduplex and MIDI
     support included as well as DICE driver.

  HD-audio:
   - Refactoring the driver-caps quirk handling in snd-hda-intel
   - More consistent control names representing the topology better
   - Fixups: HP mute LED with ALC268 codec, Ideapad S210 built-in mic
     fix, ASUS Z99He laptop EAPD

  ASoC:
   - Conversion of AC'97 drivers to use regmap, bringing us closer to
     the removal of the ASoC level I/O code
   - Clean up a lot of old drivers that were open coding things that
     have subsequently been implemented in the core
   - Some DAPM performance improvements
   - Removal of the now seldom used CODEC mutex
   - Lots of updates for the newer Intel SoC support, including support
     for the DSP and some Cherrytrail and Braswell machine drivers
   - Support for Samsung boards using rt5631 as the CODEC
   - Removal of the obsolete AFEB9260 machine driver
   - Driver support for the TI TS3A227E headset driver used in some
     Chrombeooks

  Others:
   - ASIHPI driver update and cleanups
   - Lots of dev_*() printk conversions
   - Lots of trivial cleanups for the codes spotted by Coccinelle"

* tag 'sound-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (594 commits)
  ALSA: pcxhr: NULL dereference on probe failure
  ALSA: lola: NULL dereference on probe failure
  ALSA: hda - Add "eapd" model string for AD1986A codec
  ALSA: hda - Add EAPD fixup for ASUS Z99He laptop
  ALSA: oxfw: Add hwdep interface
  ALSA: oxfw: Add support for capture/playback MIDI messages
  ALSA: oxfw: add support for capturing PCM samples
  ALSA: oxfw: Add support AMDTP in-stream
  ALSA: oxfw: Add support for Behringer/Mackie devices
  ALSA: oxfw: Change the way to start stream
  ALSA: oxfw: Add proc interface for debugging purpose
  ALSA: oxfw: Change the way to make PCM rules/constraints
  ALSA: oxfw: Add support for AV/C stream format command to get/set supported stream formation
  ALSA: oxfw: Change the way to name card
  ALSA: dice: Add support for MIDI capture/playback
  ALSA: dice: Add support for capturing PCM samples
  ALSA: dice: Support for non SYT-Match sampling clock source mode
  ALSA: dice: Add support for duplex streams with synchronization
  ALSA: dice: Change the way to start stream
  ALSA: jack: Add dummy snd_jack_set_key() definition
  ...
parents 7ef58b32 6e1d7a51

Documentation/DocBook/alsa-driver-api.tmpl

+31 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
!Esound/core/pcm.c

!Esound/core/pcm_lib.c

!Esound/core/pcm_native.c

!Iinclude/sound/pcm.h

     </sect1>

     <sect1><title>PCM Format Helpers</title>

!Esound/core/pcm_misc.c
@@ -64,6 +65,10 @@ 
     <sect1><title>PCM Memory Management</title>

!Esound/core/pcm_memory.c

     </sect1>

     <sect1><title>PCM DMA Engine API</title>

!Esound/core/pcm_dmaengine.c

!Iinclude/sound/dmaengine_pcm.h

     </sect1>

  </chapter>

  <chapter><title>Control/Mixer API</title>

     <sect1><title>General Control Interface</title>
@@ -91,12 +96,38 @@ 
!Esound/core/info.c

     </sect1>

  </chapter>

  <chapter><title>Compress Offload</title>

     <sect1><title>Compress Offload API</title>

!Esound/core/compress_offload.c

!Iinclude/uapi/sound/compress_offload.h

!Iinclude/uapi/sound/compress_params.h

!Iinclude/sound/compress_driver.h

     </sect1>

  </chapter>

  <chapter><title>ASoC</title>

     <sect1><title>ASoC Core API</title>

!Iinclude/sound/soc.h

!Esound/soc/soc-core.c

!Esound/soc/soc-cache.c

!Esound/soc/soc-devres.c

!Esound/soc/soc-io.c

!Esound/soc/soc-pcm.c

     </sect1>

     <sect1><title>ASoC DAPM API</title>

!Esound/soc/soc-dapm.c

     </sect1>

     <sect1><title>ASoC DMA Engine API</title>

!Esound/soc/soc-generic-dmaengine-pcm.c

     </sect1>

  </chapter>

  <chapter><title>Miscellaneous Functions</title>

     <sect1><title>Hardware-Dependent Devices API</title>

!Esound/core/hwdep.c

     </sect1>

     <sect1><title>Jack Abstraction Layer API</title>

!Iinclude/sound/jack.h

!Esound/core/jack.c

!Esound/soc/soc-jack.c

     </sect1>

     <sect1><title>ISA DMA Helpers</title>

!Esound/core/isadma.c

Documentation/DocBook/writing-an-alsa-driver.tmpl

+23 −0
Original line number Diff line number Diff line
@@ -3657,6 +3657,29 @@ struct _snd_pcm_runtime { 
          </informalexample>

        </para>



        <para>

	  The above callback can be simplified with a helper function,

	  <function>snd_ctl_enum_info</function>.  The final code

	  looks like below.

	  (You can pass ARRAY_SIZE(texts) instead of 4 in the third

	   argument; it's a matter of taste.)



          <informalexample>

            <programlisting>

<![CDATA[

  static int snd_myctl_enum_info(struct snd_kcontrol *kcontrol,

                          struct snd_ctl_elem_info *uinfo)

  {

          static char *texts[4] = {

                  "First", "Second", "Third", "Fourth"

          };

          return snd_ctl_enum_info(uinfo, 1, 4, texts);

  }

]]>

            </programlisting>

          </informalexample>

        </para>



        <para>

	  Some common info callbacks are available for your convenience:

	<function>snd_ctl_boolean_mono_info()</function> and

Documentation/devicetree/bindings/sound/arndale.txt

0 → 100644
+24 −0
Original line number Diff line number Diff line 
Audio Binding for Arndale boards



Required properties:

- compatible : Can be the following,

			"samsung,arndale-rt5631"



- samsung,audio-cpu: The phandle of the Samsung I2S controller

- samsung,audio-codec: The phandle of the audio codec



Optional:

- samsung,model: The name of the sound-card



Arndale Boards has many audio daughter cards, one of them is

rt5631/alc5631. Below example shows audio bindings for rt5631/

alc5631 based codec.



Example:



sound {

		compatible = "samsung,arndale-rt5631";



		samsung,audio-cpu = <&i2s0>

		samsung,audio-codec = <&rt5631>;

};

Documentation/devicetree/bindings/sound/davinci-mcasp-audio.txt

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ Optional properties: 
- rx-num-evt : FIFO levels.

- sram-size-playback : size of sram to be allocated during playback

- sram-size-capture  : size of sram to be allocated during capture

- interrupts : Interrupt numbers for McASP, currently not used by the driver

- interrupts : Interrupt numbers for McASP

- interrupt-names : Known interrupt names are "tx" and "rx"

- pinctrl-0: Should specify pin control group used for this controller.

- pinctrl-names: Should contain only one value - "default", for more details

Documentation/devicetree/bindings/sound/eukrea-tlv320.txt

+10 −5
Original line number Diff line number Diff line 
Audio complex for Eukrea boards with tlv320aic23 codec.



Required properties:



  - compatible		: "eukrea,asoc-tlv320"



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



  - ssi-controller	: The phandle of the SSI controller.



  - fsl,mux-int-port	: The internal port of the i.MX audio muxer (AUDMUX).



  - fsl,mux-ext-port	: The external port of the i.MX audio muxer.



Note: The AUDMUX port numbering should start at 1, which is consistent with