Skip to content

Commit

Permalink
Merge tag 'sound-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kerne…
Browse files Browse the repository at this point in the history
…l/git/tiwai/sound

Pull sound updates from Takashi Iwai:
 "After a heavy storm by syzkaller in 4.5 cycle, we have relatively few
  changes in the core at this time while a lot of changes are found in
  the driver side, unsurprisingly.  Below are some highlights:

  ALSA core:
   - A few more hardening in ALSA timer codes
   - An extension of sequencer API for advertising the card / pid
   - Small fixes in compress-offload and jack layers

  HD-audio:
   - Dynamic PCM assignment in HDMI/DP codec; preparation for upcoming
     DP-MST support
   - Lots of code refactoring for sharing with ASoC SKL driver
   - Regression fixes for Intel HDMI/DP
   - Fixups for CX20724 codec, Lenovo AiO

  USB-audio:
   - Add quirk_alias option to make quirk debugging easier
   - Fixes for possible Oops by malformed firmware

  Firewire:
   - Add support for FW-1804 in tascam driver
   - Improvements / changes in card registration, multi stream handling,
     etc for DICE
   - Lots of code refactoring

  ASoC:
   - Enhancements of still ongoing topology API
   - Lots of commits for Intel Skylake support including HDMI support
   - A few Intel Atom driver updates for recent devices
   - Lots of improvements to the Renesas drivers
   - Capture support for Qualcomm drivers
   - Support for TI DaVinci DRA7xxx devices
   - New machine drivers for Freescale systems with Cirrus CODECs,
     Mediatek systems with RT5650 CODECs
   - New CPU drivers for Allwinner S/PDIF controllers
   - New CODEC drivers for Maxim MAX9867 and MAX98926 and Realtek RT5514"

* tag 'sound-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (291 commits)
  ALSA: hda - Fix mutex deadlock at HDMI/DP hotplug
  ALSA: ctl: change return value in compatibility layer so that it's the same value in core implementation
  ALSA: mixart: silence an uninitialized variable warning
  ALSA: usb-audio: Add sanity checks for endpoint accesses
  ALSA: usb-audio: Minor code cleanup in create_fixed_stream_quirk()
  ALSA: usb-audio: Fix NULL dereference in create_fixed_stream_quirk()
  ALSA: hda - Limit i915 HDMI binding only for HSW and later
  ALSA: hda - Fix unconditional GPIO toggle via automute
  ALSA: mixart: silence unitialized variable warnings
  ALSA: hda - Fixes double fault in nvhdmi_chmap_cea_alloc_validate_get_type
  ALSA: intel8x0: Add clock quirk entry for AD1981B on IBM ThinkPad X41.
  ALSA: hda - Add new GPU codec ID 0x10de0082 to snd-hda
  ASoC: rsnd: add simplified module explanation
  ASoC: hdac_hdmi: Add broxton device ID
  ASoC: Intel: Bxtn: Add Broxton PCI ID
  ASoC: Intel: Skylake: Move Skylake dsp ops & loader ops
  ASoC: Intel: add dmabuffer to common sst_dsp
  ASoC: Intel: Skylake: Unstatify skl_dsp_enable_core
  ASoC: Intel: Skylake: Fix whitepsace issues
  ASoC: Intel: Skylake: Move module id defines
  ...
  • Loading branch information
torvalds committed Mar 18, 2016
2 parents 9ea4463 + 222bde0 commit 021f163
Show file tree
Hide file tree
Showing 202 changed files with 12,770 additions and 4,360 deletions.
24 changes: 24 additions & 0 deletions Documentation/devicetree/bindings/sound/adi,adau17x1.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
Analog Devices ADAU1361/ADAU1461/ADAU1761/ADAU1961/ADAU1381/ADAU1781

Required properties:

- compatible: Should contain one of the following:
"adi,adau1361"
"adi,adau1461"
"adi,adau1761"
"adi,adau1961"
"adi,adau1381"
"adi,adau1781"

- reg: The i2c address. Value depends on the state of ADDR0
and ADDR1, as wired in hardware.

Examples:
#include <dt-bindings/sound/adau17x1.h>

i2c_bus {
adau1361@38 {
compatible = "adi,adau1761";
reg = <0x38>;
};
};
9 changes: 9 additions & 0 deletions Documentation/devicetree/bindings/sound/fsl-asoc-card.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ The compatible list for this generic sound card currently:

"fsl,imx-audio-cs42888"

"fsl,imx-audio-cs427x"
(compatible with CS4271 and CS4272)

"fsl,imx-audio-wm8962"
(compatible with Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt)

Expand Down Expand Up @@ -63,6 +66,12 @@ Optional properties:
- audio-asrc : The phandle of ASRC. It can be absent if there's no
need to add ASRC support via DPCM.

Optional unless SSI is selected as a CPU DAI:

- 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

Example:
sound-cs42888 {
compatible = "fsl,imx-audio-cs42888";
Expand Down
17 changes: 17 additions & 0 deletions Documentation/devicetree/bindings/sound/max9867.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
max9867 codec

This device supports I2C mode only.

Required properties:

- compatible : "maxim,max9867"
- reg : The chip select number on the I2C bus

Example:

&i2c {
max9867: max9867@0x18 {
compatible = "maxim,max9867";
reg = <0x18>;
};
};
32 changes: 32 additions & 0 deletions Documentation/devicetree/bindings/sound/max98926.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
max98926 audio CODEC

This device supports I2C.

Required properties:

- compatible : "maxim,max98926"

- vmon-slot-no : slot number used to send voltage information
or in inteleave mode this will be used as
interleave slot.

- imon-slot-no : slot number used to send current information

- interleave-mode : When using two MAX98926 in a system it is
possible to create ADC data that that will
overflow the frame size. Digital Audio Interleave
mode provides a means to output VMON and IMON data
from two devices on a single DOUT line when running
smaller frames sizes such as 32 BCLKS per LRCLK or
48 BCLKS per LRCLK.

- reg : the I2C address of the device for I2C

Example:

codec: max98926@1a {
compatible = "maxim,max98926";
vmon-slot-no = <0>;
imon-slot-no = <2>;
reg = <0x1a>;
};
15 changes: 15 additions & 0 deletions Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5514.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
MT8173 with RT5650 RT5514 CODECS

Required properties:
- compatible : "mediatek,mt8173-rt5650-rt5514"
- mediatek,audio-codec: the phandles of rt5650 and rt5514 codecs
- mediatek,platform: the phandle of MT8173 ASoC platform

Example:

sound {
compatible = "mediatek,mt8173-rt5650-rt5514";
mediatek,audio-codec = <&rt5650 &rt5514>;
mediatek,platform = <&afe>;
};

15 changes: 15 additions & 0 deletions Documentation/devicetree/bindings/sound/mt8173-rt5650.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
MT8173 with RT5650 CODECS

Required properties:
- compatible : "mediatek,mt8173-rt5650"
- mediatek,audio-codec: the phandles of rt5650 codecs
- mediatek,platform: the phandle of MT8173 ASoC platform

Example:

sound {
compatible = "mediatek,mt8173-rt5650";
mediatek,audio-codec = <&rt5650>;
mediatek,platform = <&afe>;
};

11 changes: 10 additions & 1 deletion Documentation/devicetree/bindings/sound/pcm179x.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Texas Instruments pcm179x DT bindings

This driver supports the SPI bus.
This driver supports both the I2C and SPI bus.

Required properties:

Expand All @@ -9,10 +9,19 @@ Required properties:
For required properties on SPI, please consult
Documentation/devicetree/bindings/spi/spi-bus.txt

Required properties on I2C:

- reg: the I2C address


Examples:

codec_spi: 1792a@0 {
compatible = "ti,pcm1792a";
spi-max-frequency = <600000>;
};

codec_i2c: 1792a@4c {
compatible = "ti,pcm1792a";
reg = <0x4c>;
};
Loading

0 comments on commit 021f163

Please sign in to comment.