Skip to content

Commit 3f9df56

Browse files
committed
Merge tag 'sound-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "This became wide and scattered updates all over the sound tree as diffstat shows: lots of (still ongoing) refactoring works in ASoC, fixes and cleanups caught by static analysis, inclusive term conversions as well as lots of new drivers. Below are highlights: ASoC core: - API cleanups and conversions to the unified mute_stream() call - Simplify I/O helper functions - Use helper macros to retrieve RTD from substreams ASoC drivers: - Lots of fixes and cleanups in Intel ASoC drivers - Lots of new stuff: Freescale MQS and i.MX6sx, Intel KeemBay I2S, Maxim MAX98360A and MAX98373 SoundWire, various Mediatek boards, nVidia Tegra 186 and 210, RealTek RL6231, Samsung Midas and Aries boards, TI J721e EVM ALSA core: - Minor code refacotring for SG-buffer handling HD-audio: - Generalization of mute-LED handling with LED classdev - Intel silent stream support for HDMI - Device-specific fixes: CA0132, Loongson-3 Others: - Usual USB- and HD-audio quirks for various devices - Fixes for echoaudio DMA position handling - Various documents and trivial fixes for sparse warnings - Conversion to adopt inclusive terms" * tag 'sound-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (479 commits) ALSA: pci: delete repeated words in comments ALSA: isa: delete repeated words in comments ALSA: hda/tegra: Add 100us dma stop delay ALSA: hda: Add dma stop delay variable ASoC: hda/tegra: Set buffer alignment to 128 bytes ALSA: seq: oss: Serialize ioctls ALSA: hda/hdmi: Add quirk to force connectivity ALSA: usb-audio: add startech usb audio dock name ALSA: usb-audio: Add support for Lenovo ThinkStation P620 Revert "ALSA: hda: call runtime_allow() for all hda controllers" ALSA: hda/ca0132 - Fix AE-5 microphone selection commands. ALSA: hda/ca0132 - Add new quirk ID for Recon3D. ALSA: hda/ca0132 - Fix ZxR Headphone gain control get value. ALSA: hda/realtek: Add alc269/alc662 pin-tables for Loongson-3 laptops ALSA: docs: fix typo ALSA: doc: use correct config variable name ASoC: core: Two step component registration ASoC: core: Simplify snd_soc_component_initialize declaration ASoC: core: Relocate and expose snd_soc_component_initialize ASoC: sh: Replace 'select' DMADEVICES 'with depends on' ...
2 parents 921d259 + c7fabbc commit 3f9df56

File tree

688 files changed

+17934
-5766
lines changed

Some content is hidden

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

688 files changed

+17934
-5766
lines changed

Documentation/devicetree/bindings/sound/adi,adau1977.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Analog Devices ADAU1977/ADAU1978/ADAU1979
22

33
Datasheets:
4-
http://www.analog.com/media/en/technical-documentation/data-sheets/ADAU1977.pdf
5-
http://www.analog.com/media/en/technical-documentation/data-sheets/ADAU1978.pdf
6-
http://www.analog.com/media/en/technical-documentation/data-sheets/ADAU1979.pdf
4+
https://www.analog.com/media/en/technical-documentation/data-sheets/ADAU1977.pdf
5+
https://www.analog.com/media/en/technical-documentation/data-sheets/ADAU1978.pdf
6+
https://www.analog.com/media/en/technical-documentation/data-sheets/ADAU1979.pdf
77

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

Documentation/devicetree/bindings/sound/ak4613.txt

Lines changed: 0 additions & 27 deletions
This file was deleted.
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/ak4613.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: AK4613 I2C transmitter Device Tree Bindings
8+
9+
maintainers:
10+
- Kuninori Morimoto <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: asahi-kasei,ak4613
15+
16+
reg:
17+
maxItems: 1
18+
19+
clocks:
20+
maxItems: 1
21+
22+
"#sound-dai-cells":
23+
const: 0
24+
25+
patternProperties:
26+
"^asahi-kasei,in[1-2]-single-end$":
27+
description: Input Pin 1 - 2.
28+
$ref: /schemas/types.yaml#/definitions/flag
29+
30+
"^asahi-kasei,out[1-6]-single-end$":
31+
description: Output Pin 1 - 6.
32+
$ref: /schemas/types.yaml#/definitions/flag
33+
34+
required:
35+
- compatible
36+
- reg
37+
38+
additionalProperties: false
39+
40+
examples:
41+
- |
42+
i2c {
43+
#address-cells = <1>;
44+
#size-cells = <0>;
45+
ak4613: codec@10 {
46+
compatible = "asahi-kasei,ak4613";
47+
reg = <0x10>;
48+
};
49+
};

Documentation/devicetree/bindings/sound/ak4642.txt

Lines changed: 0 additions & 37 deletions
This file was deleted.
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/ak4642.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: AK4642 I2C transmitter Device Tree Bindings
8+
9+
maintainers:
10+
- Kuninori Morimoto <[email protected]>
11+
12+
properties:
13+
compatible:
14+
enum:
15+
- asahi-kasei,ak4642
16+
- asahi-kasei,ak4643
17+
- asahi-kasei,ak4648
18+
19+
reg:
20+
maxItems: 1
21+
22+
"#clock-cells":
23+
const: 0
24+
"#sound-dai-cells":
25+
const: 0
26+
27+
clocks:
28+
maxItems: 1
29+
30+
clock-frequency:
31+
description: common clock binding; frequency of MCKO
32+
$ref: /schemas/types.yaml#/definitions/uint32
33+
34+
clock-output-names:
35+
description: common clock name
36+
$ref: /schemas/types.yaml#/definitions/string
37+
38+
required:
39+
- compatible
40+
- reg
41+
42+
additionalProperties: false
43+
44+
examples:
45+
- |
46+
i2c {
47+
#address-cells = <1>;
48+
#size-cells = <0>;
49+
ak4643: codec@12 {
50+
compatible = "asahi-kasei,ak4643";
51+
#sound-dai-cells = <0>;
52+
reg = <0x12>;
53+
#clock-cells = <0>;
54+
clocks = <&audio_clock>;
55+
clock-frequency = <12288000>;
56+
clock-output-names = "ak4643_mcko";
57+
};
58+
};

Documentation/devicetree/bindings/sound/everest,es8316.txt

Lines changed: 0 additions & 23 deletions
This file was deleted.
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/everest,es8316.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Everest ES8316 audio CODEC
8+
9+
maintainers:
10+
- Daniel Drake <[email protected]>
11+
- Katsuhiro Suzuki <[email protected]>
12+
13+
properties:
14+
compatible:
15+
const: everest,es8316
16+
17+
reg:
18+
maxItems: 1
19+
20+
clocks:
21+
items:
22+
- description: clock for master clock (MCLK)
23+
24+
clock-names:
25+
items:
26+
- const: mclk
27+
28+
"#sound-dai-cells":
29+
const: 0
30+
31+
required:
32+
- compatible
33+
- reg
34+
- "#sound-dai-cells"
35+
36+
additionalProperties: false
37+
38+
examples:
39+
- |
40+
i2c0 {
41+
#address-cells = <1>;
42+
#size-cells = <0>;
43+
es8316: codec@11 {
44+
compatible = "everest,es8316";
45+
reg = <0x11>;
46+
clocks = <&clks 10>;
47+
clock-names = "mclk";
48+
#sound-dai-cells = <0>;
49+
};
50+
};

Documentation/devicetree/bindings/sound/fsl,spdif.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,11 @@ a fibre cable.
66

77
Required properties:
88

9-
- compatible : Compatible list, must contain "fsl,imx35-spdif".
9+
- compatible : Compatible list, should contain one of the following
10+
compatibles:
11+
"fsl,imx35-spdif",
12+
"fsl,vf610-spdif",
13+
"fsl,imx6sx-spdif",
1014

1115
- reg : Offset and length of the register set for the device.
1216

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

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ The compatible list for this generic sound card currently:
3434

3535
"fsl,imx-audio-wm8960"
3636

37+
"fsl,imx-audio-mqs"
38+
39+
"fsl,imx-audio-wm8524"
40+
3741
Required properties:
3842

3943
- compatible : Contains one of entries in the compatible list.
@@ -44,6 +48,11 @@ Required properties:
4448

4549
- audio-codec : The phandle of an audio codec
4650

51+
Optional properties:
52+
53+
- audio-asrc : The phandle of ASRC. It can be absent if there's no
54+
need to add ASRC support via DPCM.
55+
4756
- audio-routing : A list of the connections between audio components.
4857
Each entry is a pair of strings, the first being the
4958
connection's sink, the second being the connection's
@@ -60,10 +69,13 @@ Required properties:
6069
coexisting in order to support the old bindings
6170
of wm8962 and sgtl5000.
6271

63-
Optional properties:
64-
65-
- audio-asrc : The phandle of ASRC. It can be absent if there's no
66-
need to add ASRC support via DPCM.
72+
- hp-det-gpio : The GPIO that detect headphones are plugged in
73+
- mic-det-gpio : The GPIO that detect microphones are plugged in
74+
- bitclock-master : Indicates dai-link bit clock master; for details see simple-card.yaml.
75+
- frame-master : Indicates dai-link frame master; for details see simple-card.yaml.
76+
- dai-format : audio format, for details see simple-card.yaml.
77+
- frame-inversion : dai-link uses frame clock inversion, for details see simple-card.yaml.
78+
- bitclock-inversion : dai-link uses bit clock inversion, for details see simple-card.yaml.
6779

6880
Optional unless SSI is selected as a CPU DAI:
6981

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
# Copyright 2020 Intel Corporation
3+
%YAML 1.2
4+
---
5+
$id: http://devicetree.org/schemas/sound/intel,keembay-i2s.yaml#
6+
$schema: http://devicetree.org/meta-schemas/core.yaml#
7+
8+
title: Intel KeemBay I2S Device Tree Bindings
9+
10+
maintainers:
11+
- Sia, Jee Heng <[email protected]>
12+
13+
description: |
14+
Intel KeemBay I2S
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- intel,keembay-i2s
20+
21+
"#sound-dai-cells":
22+
const: 0
23+
24+
reg:
25+
items:
26+
- description: I2S registers
27+
- description: I2S gen configuration
28+
29+
reg-names:
30+
items:
31+
- const: i2s-regs
32+
- const: i2s_gen_cfg
33+
34+
interrupts:
35+
maxItems: 1
36+
37+
clocks:
38+
items:
39+
- description: Bus Clock
40+
- description: Module Clock
41+
42+
clock-names:
43+
items:
44+
- const: osc
45+
- const: apb_clk
46+
47+
required:
48+
- compatible
49+
- "#sound-dai-cells"
50+
- reg
51+
- clocks
52+
- clock-names
53+
- interrupts
54+
55+
examples:
56+
- |
57+
#include <dt-bindings/interrupt-controller/arm-gic.h>
58+
#include <dt-bindings/interrupt-controller/irq.h>
59+
#define KEEM_BAY_PSS_AUX_I2S3
60+
#define KEEM_BAY_PSS_I2S3
61+
i2s3: i2s@20140000 {
62+
compatible = "intel,keembay-i2s";
63+
#sound-dai-cells = <0>;
64+
reg = <0x20140000 0x200>, /* I2S registers */
65+
<0x202a00a4 0x4>; /* I2S gen configuration */
66+
reg-names = "i2s-regs", "i2s_gen_cfg";
67+
interrupts = <GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>;
68+
clock-names = "osc", "apb_clk";
69+
clocks = <&scmi_clk KEEM_BAY_PSS_AUX_I2S3>, <&scmi_clk KEEM_BAY_PSS_I2S3>;
70+
};

0 commit comments

Comments
 (0)