Skip to content

Commit fb95aae

Browse files
committed
Merge tag 'sound-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "As the diffstat shows we've had again a lot of works done for this cycle: the majority of changes are the continued componentization and code refactoring in ASoC, the tree-wide PCM API updates and cleanups and SOF updates while a few ASoC driver updates are seen, too. Here we go, some highlights: Core: - Finally y2038 support landed to ALSA ABI; some ioctls have been extended and lots of tricks were applied - Applying the new managed PCM buffer API to all drivers; the API itself was already merged in 5.5 - The already deprecated dimension support in ALSA control API is dropped completely now - Verification of ALSA control elements to catch API misuses ASoC: - Further code refactorings and moving things to the component level - Lots of updates and improvements on SOF / Intel drivers; now including common HDMI driver and SoundWire support - New driver support for Ingenic JZ4770, Mediatek MT6660, Qualcomm WCD934x and WSA881x, and Realtek RT700, RT711, RT715, RT1011, RT1015 and RT1308 HD-audio: - Improved ring-buffer communications using waitqueue - Drop the superfluous buffer preallocation on x86 Others: - Many code cleanups, mostly constifications over the whole tree - USB-audio: quirks for MOTU, Corsair Virtuoso, Line6 Helix - FireWire: code refactoring for oxfw and dice drivers" * tag 'sound-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (638 commits) ALSA: usb-audio: add quirks for Line6 Helix devices fw>=2.82 ALSA: hda: Add Clevo W65_67SB the power_save blacklist ASoC: soc-core: remove null_snd_soc_ops ASoC: soc-pcm: add soc_rtd_trigger() ASoC: soc-pcm: add soc_rtd_hw_free() ASoC: soc-pcm: add soc_rtd_hw_params() ASoC: soc-pcm: add soc_rtd_prepare() ASoC: soc-pcm: add soc_rtd_shutdown() ASoC: soc-pcm: add soc_rtd_startup() ASoC: rt1015: add rt1015 amplifier driver ASoC: madera: Correct some kernel doc ASoC: topology: fix soc_tplg_fe_link_create() - link->dobj initialization order ASoC: Intel: skl_hda_dsp_common: Fix global-out-of-bounds bug ASoC: madera: Correct DMIC only input hook ups ALSA: cs46xx: fix spelling mistake "to" -> "too" ALSA: hda - Add docking station support for Lenovo Thinkpad T420s ASoC: Add MediaTek MT6660 Speaker Amp Driver ASoC: dt-bindings: rt5645: add suppliers ASoC: max98090: fix deadlock in max98090_dapm_put_enum_double() ASoC: dapm: add snd_soc_dapm_put_enum_double_locked ...
2 parents bd2463a + 90fb04f commit fb95aae

File tree

617 files changed

+27603
-8124
lines changed

Some content is hidden

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

617 files changed

+27603
-8124
lines changed

Documentation/devicetree/bindings/sound/amlogic,axg-fifo.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ Required properties:
1717
* "arb" : memory ARB line (required)
1818
* "rst" : dedicated device reset line (optional)
1919
- #sound-dai-cells: must be 0.
20+
- amlogic,fifo-depth: The size of the controller's fifo in bytes. This
21+
is useful for determining certain configuration such
22+
as the flush threshold of the fifo
2023

2124
Example of FRDDR A on the A113 SoC:
2225

@@ -27,4 +30,5 @@ frddr_a: audio-controller@1c0 {
2730
interrupts = <GIC_SPI 88 IRQ_TYPE_EDGE_RISING>;
2831
clocks = <&clkc_audio AUD_CLKID_FRDDR_A>;
2932
resets = <&arb AXG_ARB_FRDDR_A>;
33+
fifo-depth = <512>;
3034
};

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,12 @@ three substreams within totally 10 channels.
88

99
Required properties:
1010

11-
- compatible : Contains "fsl,imx35-asrc" or "fsl,imx53-asrc".
11+
- compatible : Compatible list, should contain one of the following
12+
compatibles:
13+
"fsl,imx35-asrc",
14+
"fsl,imx53-asrc",
15+
"fsl,imx8qm-asrc",
16+
"fsl,imx8qxp-asrc",
1217

1318
- reg : Offset and length of the register set for the device.
1419

@@ -35,6 +40,11 @@ Required properties:
3540

3641
- fsl,asrc-width : Defines a mutual sample width used by DPCM Back Ends.
3742

43+
- fsl,asrc-clk-map : Defines clock map used in driver. which is required
44+
by imx8qm/imx8qxp platform
45+
<0> - select the map for asrc0 in imx8qm/imx8qxp
46+
<1> - select the map for asrc1 in imx8qm/imx8qxp
47+
3848
Optional properties:
3949

4050
- big-endian : If this property is absent, the little endian mode

Documentation/devicetree/bindings/sound/gtm601.txt

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
GTM601 UMTS modem audio interface CODEC
22

3-
This device has no configuration interface. Sample rate is fixed - 8kHz.
3+
This device has no configuration interface. The sample rate and channels are
4+
based on the compatible string
5+
"option,gtm601" = 8kHz mono
6+
"broadmobi,bm818" = 48KHz stereo
47

58
Required properties:
69

7-
- compatible : "option,gtm601"
10+
- compatible : one of
11+
"option,gtm601"
12+
"broadmobi,bm818"
13+
814

915
Example:
1016

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/ingenic,codec.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Ingenic JZ47xx internal codec DT bindings
8+
9+
maintainers:
10+
- Paul Cercueil <[email protected]>
11+
12+
properties:
13+
$nodename:
14+
pattern: '^audio-codec@.*'
15+
16+
compatible:
17+
oneOf:
18+
- const: ingenic,jz4770-codec
19+
- const: ingenic,jz4725b-codec
20+
- const: ingenic,jz4740-codec
21+
22+
reg:
23+
maxItems: 1
24+
25+
clocks:
26+
maxItems: 1
27+
28+
clock-names:
29+
items:
30+
- const: aic
31+
32+
'#sound-dai-cells':
33+
const: 0
34+
35+
additionalProperties: false
36+
37+
required:
38+
- compatible
39+
- reg
40+
- clocks
41+
- clock-names
42+
- '#sound-dai-cells'
43+
44+
examples:
45+
- |
46+
#include <dt-bindings/clock/jz4740-cgu.h>
47+
codec: audio-codec@10020080 {
48+
compatible = "ingenic,jz4740-codec";
49+
reg = <0x10020080 0x8>;
50+
#sound-dai-cells = <0>;
51+
clocks = <&cgu JZ4740_CLK_AIC>;
52+
clock-names = "aic";
53+
};
54+
55+
...

Documentation/devicetree/bindings/sound/ingenic,jz4725b-codec.txt

Lines changed: 0 additions & 20 deletions
This file was deleted.

Documentation/devicetree/bindings/sound/ingenic,jz4740-codec.txt

Lines changed: 0 additions & 20 deletions
This file was deleted.

Documentation/devicetree/bindings/sound/qcom,sdm845.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,10 @@ This binding describes the SDM845 sound card, which uses qdsp for audio.
55
- compatible:
66
Usage: required
77
Value type: <stringlist>
8-
Definition: must be "qcom,sdm845-sndcard"
8+
Definition: must be one of this
9+
"qcom,sdm845-sndcard"
10+
"qcom,db845c-sndcard"
11+
"lenovo,yoga-c630-sndcard"
912

1013
- audio-routing:
1114
Usage: Optional
Lines changed: 175 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,175 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/qcom,wcd934x.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Bindings for Qualcomm WCD9340/WCD9341 Audio Codec
8+
9+
maintainers:
10+
- Srinivas Kandagatla <[email protected]>
11+
12+
description: |
13+
Qualcomm WCD9340/WCD9341 Codec is a standalone Hi-Fi audio codec IC.
14+
It has in-built Soundwire controller, pin controller, interrupt mux and
15+
supports both I2S/I2C and SLIMbus audio interfaces.
16+
17+
properties:
18+
compatible:
19+
const: slim217,250
20+
21+
reg:
22+
maxItems: 1
23+
24+
interrupts:
25+
maxItems: 1
26+
27+
reset-gpios:
28+
description: GPIO spec for reset line to use
29+
maxItems: 1
30+
31+
slim-ifc-dev: true
32+
33+
clocks:
34+
maxItems: 1
35+
36+
clock-names:
37+
const: extclk
38+
39+
vdd-buck-supply:
40+
description: A reference to the 1.8V buck supply
41+
42+
vdd-buck-sido-supply:
43+
description: A reference to the 1.8V SIDO buck supply
44+
45+
vdd-rx-supply:
46+
description: A reference to the 1.8V rx supply
47+
48+
vdd-tx-supply:
49+
description: A reference to the 1.8V tx supply
50+
51+
vdd-vbat-supply:
52+
description: A reference to the vbat supply
53+
54+
vdd-io-supply:
55+
description: A reference to the 1.8V I/O supply
56+
57+
vdd-micbias-supply:
58+
description: A reference to the micbias supply
59+
60+
qcom,micbias1-microvolt:
61+
description: micbias1 voltage
62+
minimum: 1800000
63+
maximum: 2850000
64+
65+
qcom,micbias2-microvolt:
66+
description: micbias2 voltage
67+
minimum: 1800000
68+
maximum: 2850000
69+
70+
qcom,micbias3-microvolt:
71+
description: micbias3 voltage
72+
minimum: 1800000
73+
maximum: 2850000
74+
75+
qcom,micbias4-microvolt:
76+
description: micbias4 voltage
77+
minimum: 1800000
78+
maximum: 2850000
79+
80+
clock-output-names:
81+
const: mclk
82+
83+
clock-frequency:
84+
description: Clock frequency of output clk in Hz
85+
86+
interrupt-controller: true
87+
88+
'#interrupt-cells':
89+
const: 1
90+
91+
'#clock-cells':
92+
const: 0
93+
94+
'#sound-dai-cells':
95+
const: 1
96+
97+
"#address-cells":
98+
const: 1
99+
100+
"#size-cells":
101+
const: 1
102+
103+
gpio@42:
104+
type: object
105+
allOf:
106+
- $ref: ../gpio/qcom,wcd934x-gpio.yaml#
107+
108+
patternProperties:
109+
"^.*@[0-9a-f]+$":
110+
type: object
111+
description: |
112+
WCD934x subnode for each slave devices. Bindings of each subnodes
113+
depends on the specific driver providing the functionality and
114+
documented in their respective bindings.
115+
116+
properties:
117+
reg:
118+
maxItems: 1
119+
120+
required:
121+
- reg
122+
123+
required:
124+
- compatible
125+
- reg
126+
- reset-gpios
127+
- slim-ifc-dev
128+
- interrupts
129+
- interrupt-controller
130+
- clock-frequency
131+
- clock-output-names
132+
- qcom,micbias1-microvolt
133+
- qcom,micbias2-microvolt
134+
- qcom,micbias3-microvolt
135+
- qcom,micbias4-microvolt
136+
- "#interrupt-cells"
137+
- "#clock-cells"
138+
- "#sound-dai-cells"
139+
- "#address-cells"
140+
- "#size-cells"
141+
142+
examples:
143+
- |
144+
codec@1,0{
145+
compatible = "slim217,250";
146+
reg = <1 0>;
147+
reset-gpios = <&tlmm 64 0>;
148+
slim-ifc-dev = <&wcd9340_ifd>;
149+
#sound-dai-cells = <1>;
150+
interrupt-parent = <&tlmm>;
151+
interrupts = <54 4>;
152+
interrupt-controller;
153+
#interrupt-cells = <1>;
154+
#clock-cells = <0>;
155+
clock-frequency = <9600000>;
156+
clock-output-names = "mclk";
157+
qcom,micbias1-microvolt = <1800000>;
158+
qcom,micbias2-microvolt = <1800000>;
159+
qcom,micbias3-microvolt = <1800000>;
160+
qcom,micbias4-microvolt = <1800000>;
161+
clock-names = "extclk";
162+
clocks = <&rpmhcc 2>;
163+
164+
#address-cells = <1>;
165+
#size-cells = <1>;
166+
167+
gpio@42 {
168+
compatible = "qcom,wcd9340-gpio";
169+
reg = <0x42 0x2>;
170+
gpio-controller;
171+
#gpio-cells = <2>;
172+
};
173+
};
174+
175+
...

0 commit comments

Comments
 (0)