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

Commit c34c0d76 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'asoc/fix/fsl' into asoc-linus

parents 29dc5dd2 4345adf9

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

0 → 100644
+34 −0
Original line number Original line Diff line number Diff line 
Freescale i.MX audio complex with S/PDIF transceiver



Required properties:



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



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



  - spdif-controller : The phandle of the i.MX S/PDIF controller





Optional properties:



  - spdif-out : This is a boolean property. If present, the transmitting

    function of S/PDIF will be enabled, indicating there's a physical

    S/PDIF out connector/jack on the board or it's connecting to some

    other IP block, such as an HDMI encoder/display-controller.



  - spdif-in : This is a boolean property. If present, the receiving

    function of S/PDIF will be enabled, indicating there's a physical

    S/PDIF in connector/jack on the board.



* Note: At least one of these two properties should be set in the DT binding.





Example:



sound-spdif {

	compatible = "fsl,imx-audio-spdif";

	model = "imx-spdif";

	spdif-controller = <&spdif>;

	spdif-out;

	spdif-in;

};

Documentation/devicetree/bindings/sound/mvebu-audio.txt

0 → 100644
+29 −0
Original line number Original line Diff line number Diff line 
* mvebu (Kirkwood, Dove, Armada 370) audio controller



Required properties:



- compatible: "marvell,mvebu-audio"



- reg: physical base address of the controller and length of memory mapped

  region.



- interrupts: list of two irq numbers.

  The first irq is used for data flow and the second one is used for errors.



- clocks: one or two phandles.

  The first one is mandatory and defines the internal clock.

  The second one is optional and defines an external clock.



- clock-names: names associated to the clocks:

	"internal" for the internal clock

	"extclk" for the external clock



Example:



i2s1: audio-controller@b4000 {

	compatible = "marvell,mvebu-audio";

	reg = <0xb4000 0x2210>;

	interrupts = <21>, <22>;

	clocks = <&gate_clk 13>;

	clock-names = "internal";

};

Documentation/sound/alsa/HD-Audio-Models.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -244,6 +244,7 @@ STAC9227/9228/9229/927x 
  5stack-no-fp	D965 5stack without front panel

  5stack-no-fp	D965 5stack without front panel

  dell-3stack	Dell Dimension E520

  dell-3stack	Dell Dimension E520

  dell-bios	Fixes with Dell BIOS setup

  dell-bios	Fixes with Dell BIOS setup

  dell-bios-amic Fixes with Dell BIOS setup including analog mic

  volknob	Fixes with volume-knob widget 0x24

  volknob	Fixes with volume-knob widget 0x24

  auto		BIOS setup (default)

  auto		BIOS setup (default)

Documentation/sound/alsa/HD-Audio.txt

+2 −0
Original line number Original line Diff line number Diff line
@@ -454,6 +454,8 @@ The generic parser supports the following hints: 
- need_dac_fix (bool): limits the DACs depending on the channel count

- need_dac_fix (bool): limits the DACs depending on the channel count

- primary_hp (bool): probe headphone jacks as the primary outputs;

- primary_hp (bool): probe headphone jacks as the primary outputs;

  default true

  default true

- multi_io (bool): try probing multi-I/O config (e.g. shared

  line-in/surround, mic/clfe jacks)

- multi_cap_vol (bool): provide multiple capture volumes

- multi_cap_vol (bool): provide multiple capture volumes

- inv_dmic_split (bool): provide split internal mic volume/switch for

- inv_dmic_split (bool): provide split internal mic volume/switch for

  phase-inverted digital mics

  phase-inverted digital mics

MAINTAINERS

+11 −0
Original line number Original line Diff line number Diff line
@@ -7676,6 +7676,17 @@ F: include/sound/ 
F:	include/uapi/sound/

F:	include/uapi/sound/

F:	sound/

F:	sound/





SOUND - COMPRESSED AUDIO

M:	Vinod Koul <vinod.koul@intel.com>

L:	alsa-devel@alsa-project.org (moderated for non-subscribers)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git

S:	Supported

F:	Documentation/sound/alsa/compress_offload.txt

F:	include/sound/compress_driver.h

F:	include/uapi/sound/compress_*

F:	sound/core/compress_offload.c

F:	sound/soc/soc-compress.c



SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)

SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT (ASoC)

M:	Liam Girdwood <lgirdwood@gmail.com>

M:	Liam Girdwood <lgirdwood@gmail.com>

M:	Mark Brown <broonie@kernel.org>

M:	Mark Brown <broonie@kernel.org>