Skip to content

Commit 021f163

Browse files
torvaldstorvalds
committed
Merge tag 'sound-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/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 ...
2 parents 9ea4463 + 222bde0 commit 021f163

File tree

202 files changed

+12770
-4360
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

202 files changed

+12770
-4360
lines changed

‎Documentation/devicetree/bindings/sound/adi,adau17x1.txt

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
Analog Devices ADAU1361/ADAU1461/ADAU1761/ADAU1961/ADAU1381/ADAU1781
2+
3+
Required properties:
4+
5+
- compatible: Should contain one of the following:
6+
"adi,adau1361"
7+
"adi,adau1461"
8+
"adi,adau1761"
9+
"adi,adau1961"
10+
"adi,adau1381"
11+
"adi,adau1781"
12+
13+
- reg: The i2c address. Value depends on the state of ADDR0
14+
and ADDR1, as wired in hardware.
15+
16+
Examples:
17+
#include <dt-bindings/sound/adau17x1.h>
18+
19+
i2c_bus {
20+
adau1361@38 {
21+
compatible = "adi,adau1761";
22+
reg = <0x38>;
23+
};
24+
};

‎Documentation/devicetree/bindings/sound/fsl-asoc-card.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ The compatible list for this generic sound card currently:
2424

2525
"fsl,imx-audio-cs42888"
2626

27+
"fsl,imx-audio-cs427x"
28+
(compatible with CS4271 and CS4272)
29+
2730
"fsl,imx-audio-wm8962"
2831
(compatible with Documentation/devicetree/bindings/sound/imx-audio-wm8962.txt)
2932

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

69+
Optional unless SSI is selected as a CPU DAI:
70+
71+
- mux-int-port : The internal port of the i.MX audio muxer (AUDMUX)
72+
73+
- mux-ext-port : The external port of the i.MX audio muxer
74+
6675
Example:
6776
sound-cs42888 {
6877
compatible = "fsl,imx-audio-cs42888";

‎Documentation/devicetree/bindings/sound/max9867.txt

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
max9867 codec
2+
3+
This device supports I2C mode only.
4+
5+
Required properties:
6+
7+
- compatible : "maxim,max9867"
8+
- reg : The chip select number on the I2C bus
9+
10+
Example:
11+
12+
&i2c {
13+
max9867: max9867@0x18 {
14+
compatible = "maxim,max9867";
15+
reg = <0x18>;
16+
};
17+
};

‎Documentation/devicetree/bindings/sound/max98926.txt

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
max98926 audio CODEC
2+
3+
This device supports I2C.
4+
5+
Required properties:
6+
7+
- compatible : "maxim,max98926"
8+
9+
- vmon-slot-no : slot number used to send voltage information
10+
or in inteleave mode this will be used as
11+
interleave slot.
12+
13+
- imon-slot-no : slot number used to send current information
14+
15+
- interleave-mode : When using two MAX98926 in a system it is
16+
possible to create ADC data that that will
17+
overflow the frame size. Digital Audio Interleave
18+
mode provides a means to output VMON and IMON data
19+
from two devices on a single DOUT line when running
20+
smaller frames sizes such as 32 BCLKS per LRCLK or
21+
48 BCLKS per LRCLK.
22+
23+
- reg : the I2C address of the device for I2C
24+
25+
Example:
26+
27+
codec: max98926@1a {
28+
compatible = "maxim,max98926";
29+
vmon-slot-no = <0>;
30+
imon-slot-no = <2>;
31+
reg = <0x1a>;
32+
};

‎Documentation/devicetree/bindings/sound/mt8173-rt5650-rt5514.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
MT8173 with RT5650 RT5514 CODECS
2+
3+
Required properties:
4+
- compatible : "mediatek,mt8173-rt5650-rt5514"
5+
- mediatek,audio-codec: the phandles of rt5650 and rt5514 codecs
6+
- mediatek,platform: the phandle of MT8173 ASoC platform
7+
8+
Example:
9+
10+
sound {
11+
compatible = "mediatek,mt8173-rt5650-rt5514";
12+
mediatek,audio-codec = <&rt5650 &rt5514>;
13+
mediatek,platform = <&afe>;
14+
};
15+

‎Documentation/devicetree/bindings/sound/mt8173-rt5650.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
MT8173 with RT5650 CODECS
2+
3+
Required properties:
4+
- compatible : "mediatek,mt8173-rt5650"
5+
- mediatek,audio-codec: the phandles of rt5650 codecs
6+
- mediatek,platform: the phandle of MT8173 ASoC platform
7+
8+
Example:
9+
10+
sound {
11+
compatible = "mediatek,mt8173-rt5650";
12+
mediatek,audio-codec = <&rt5650>;
13+
mediatek,platform = <&afe>;
14+
};
15+

‎Documentation/devicetree/bindings/sound/pcm179x.txt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Texas Instruments pcm179x DT bindings
22

3-
This driver supports the SPI bus.
3+
This driver supports both the I2C and SPI bus.
44

55
Required properties:
66

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

12+
Required properties on I2C:
13+
14+
- reg: the I2C address
15+
16+
1217
Examples:
1318

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

24+
codec_i2c: 1792a@4c {
25+
compatible = "ti,pcm1792a";
26+
reg = <0x4c>;
27+
};

0 commit comments

Comments
 (0)