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

Commit 2e341ca6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull sound updates from Takashi Iwai:
 "This is the first big chunk for 3.5 merges of sound stuff.

  There are a few big changes in different areas.  First off, the
  streaming logic of USB-audio endpoints has been largely rewritten for
  the better support of "implicit feedback".  If anything about USB got
  broken, this change has to be checked.

  For HD-audio, the resume procedure was changed; instead of delaying
  the resume of the hardware until the first use, now waking up
  immediately at resume.  This is for buggy BIOS.

  For ASoC, dynamic PCM support and the improved support for digital
  links between off-SoC devices are major framework changes.

  Some highlights are below:

  * HD-audio
   - Avoid accesses of invalid pin-control bits that may stall the codec
   - V-ref setup cleanups
   - Fix the races in power-saving code
   - Fix the races in codec cache hashes and connection lists
   - Split some common codes for BIOS auto-parser to hda_auto_parser.c
   - Changed the PM resume code to wake up immediately for buggy BIOS
   - Creative SoundCore3D support
   - Add Conexant CX20751/2/3/4 codec support

  * ASoC
   - Dynamic PCM support, allowing support for SoCs with internal
     routing through components with tight sequencing and formatting
     constraints within their internal paths or where there are multiple
     components connected with CPU managed DMA controllers inside the
     SoC.
   - Greatly improved support for direct digital links between off-SoC
     devices, providing a much simpler way of connecting things like
     digital basebands to CODECs.
   - Much more fine grained and robust locking, cleaning up some of the
     confusion that crept in with multi-component.
   - CPU support for nVidia Tegra 30 I2S and audio hub controllers and
     ST-Ericsson MSP I2S controolers
   - New CODEC drivers for Cirrus CS42L52, LAPIS Semiconductor ML26124,
     Texas Instruments LM49453.
   - Some regmap changes needed by the Tegra I2S driver.
   - mc13783 audio support.

  * Misc
   - Rewrite with module_pci_driver()
   - Xonar DGX support for snd-oxygen
   - Improvement of packet handling in snd-firewire driver
   - New USB-endpoint streaming logic
   - Enhanced M-audio FTU quirks and relevant cleanups
   - Increment the support of OSS devices to 256
   - snd-aloop accuracy improvement

  There are a few more pending changes for 3.5, but they will be sent
  slightly later as partly depending on the changes of DRM."

Fix up conflicts in regmap (due to duplicate patches, with some further
updates then having already come in from the regmap tree).  Also some
fairly trivial context conflicts in the imx and mcx soc drivers.

* tag 'sound-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (280 commits)
  ALSA: snd-usb: fix stream info output in /proc
  ALSA: pcm - Add proper state checks to snd_pcm_drain()
  ALSA: sh: Fix up namespace collision in sh_dac_audio.
  ALSA: hda/realtek - Fix unused variable compile warning
  ASoC: sh: fsi: enable chip specific data transfer mode
  ASoC: sh: fsi: call fsi_hw_startup/shutdown from fsi_dai_trigger()
  ASoC: sh: fsi: use same format for IN/OUT
  ASoC: sh: fsi: add fsi_version() and removed meaningless version check
  ASoC: sh: fsi: use register field macro name on IN/OUT_DMAC
  ASoC: tegra: Add machine driver for WM8753 codec
  ALSA: hda - Fix possible races of accesses to connection list array
  ASoC: OMAP: HDMI: Introduce codec
  ARM: mx31_3ds: Add sound support
  ASoC: imx-mc13783 cleanup
  mx31moboard: Add sound support
  ASoC: mc13783 codec cleanups
  ASoC: add imx-mc13783 sound support
  ASoC: Add mc13783 codec
  mfd: mc13xxx: add codec platform data
  ASoC: don't flip master of DT-instantiated DAI links
  ...
parents 927ad551 85e184e4

Documentation/devicetree/bindings/sound/imx-audio-sgtl5000.txt

0 → 100644
+49 −0
Original line number Diff line number Diff line 
Freescale i.MX audio complex with SGTL5000 codec



Required properties:

- compatible : "fsl,imx-audio-sgtl5000"

- model : The user-visible name of this sound complex

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

- audio-codec : The phandle of the SGTL5000 audio codec

- 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, SGTL5000 pins, and the jacks on the board:



  Power supplies:

   * Mic Bias



  SGTL5000 pins:

   * MIC_IN

   * LINE_IN

   * HP_OUT

   * LINE_OUT



  Board connectors:

   * Mic Jack

   * Line In Jack

   * Headphone Jack

   * Line Out Jack

   * Ext Spk



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

- 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

hardware manual.



Example:



sound {

	compatible = "fsl,imx51-babbage-sgtl5000",

		     "fsl,imx-audio-sgtl5000";

	model = "imx51-babbage-sgtl5000";

	ssi-controller = <&ssi1>;

	audio-codec = <&sgtl5000>;

	audio-routing =

		"MIC_IN", "Mic Jack",

		"Mic Jack", "Mic Bias",

		"Headphone Jack", "HP_OUT";

	mux-int-port = <1>;

	mux-ext-port = <3>;

};

Documentation/devicetree/bindings/sound/mxs-audio-sgtl5000.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
* Freescale MXS audio complex with SGTL5000 codec



Required properties:

- compatible: "fsl,mxs-audio-sgtl5000"

- model: The user-visible name of this sound complex

- saif-controllers: The phandle list of the MXS SAIF controller

- audio-codec: The phandle of the SGTL5000 audio codec



Example:



sound {

	compatible = "fsl,imx28-evk-sgtl5000",

		     "fsl,mxs-audio-sgtl5000";

	model = "imx28-evk-sgtl5000";

	saif-controllers = <&saif0 &saif1>;

	audio-codec = <&sgtl5000>;

};

Documentation/devicetree/bindings/sound/mxs-saif.txt

0 → 100644
+36 −0
Original line number Diff line number Diff line 
* Freescale MXS Serial Audio Interface (SAIF)



Required properties:

- compatible: Should be "fsl,<chip>-saif"

- reg: Should contain registers location and length

- interrupts: Should contain ERROR and DMA interrupts

- fsl,saif-dma-channel: APBX DMA channel for the SAIF



Optional properties:

- fsl,saif-master: phandle to the master SAIF.  It's only required for

  the slave SAIF.



Note: Each SAIF controller should have an alias correctly numbered

in "aliases" node.



Example:



aliases {

	saif0 = &saif0;

	saif1 = &saif1;

};



saif0: saif@80042000 {

	compatible = "fsl,imx28-saif";

	reg = <0x80042000 2000>;

	interrupts = <59 80>;

	fsl,saif-dma-channel = <4>;

};



saif1: saif@80046000 {

	compatible = "fsl,imx28-saif";

	reg = <0x80046000 2000>;

	interrupts = <58 81>;

	fsl,saif-dma-channel = <5>;

	fsl,saif-master = <&saif0>;

};

Documentation/devicetree/bindings/sound/nvidia,tegra30-ahub.txt

0 → 100644
+32 −0
Original line number Diff line number Diff line 
NVIDIA Tegra30 AHUB (Audio Hub)



Required properties:

- compatible : "nvidia,tegra30-ahub"

- reg : Should contain the register physical address and length for each of

  the AHUB's APBIF registers and the AHUB's own registers.

- interrupts : Should contain AHUB interrupt

- nvidia,dma-request-selector : The Tegra DMA controller's phandle and

  request selector for the first APBIF channel.

- ranges : The bus address mapping for the configlink register bus.

  Can be empty since the mapping is 1:1.

- #address-cells : For the configlink bus. Should be <1>;

- #size-cells : For the configlink bus. Should be <1>.



AHUB client modules need to specify the IDs of their CIFs (Client InterFaces).

For RX CIFs, the numbers indicate the register number within AHUB routing

register space (APBIF 0..3 RX, I2S 0..5 RX, DAM 0..2 RX 0..1, SPDIF RX 0..1).

For TX CIFs, the numbers indicate the bit position within the AHUB routing

registers (APBIF 0..3 TX, I2S 0..5 TX, DAM 0..2 TX, SPDIF TX 0..1).



Example:



ahub@70080000 {

	compatible = "nvidia,tegra30-ahub";

	reg = <0x70080000 0x200 0x70080200 0x100>;

	interrupts = < 0 103 0x04 >;

	nvidia,dma-request-selector = <&apbdma 1>;



	ranges;

	#address-cells = <1>;

	#size-cells = <1>;

};

Documentation/devicetree/bindings/sound/nvidia,tegra30-i2s.txt

0 → 100644
+15 −0
Original line number Diff line number Diff line 
NVIDIA Tegra30 I2S controller



Required properties:

- compatible : "nvidia,tegra30-i2s"

- reg : Should contain I2S registers location and length

- nvidia,ahub-cif-ids : The list of AHUB CIF IDs for this port, rx (playback)

  first, tx (capture) second. See nvidia,tegra30-ahub.txt for values.



Example:



i2s@70002800 {

	compatible = "nvidia,tegra30-i2s";

	reg = <0x70080300 0x100>;

	nvidia,ahub-cif-ids = <4 4>;

};