Skip to content

Commit 071b34d

Browse files
committed
Merge tag 'sound-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "This is a relatively calm cycle, and majority of changes are about ASoC. There are little changes in the core side but we received lots of new drivers for new vendors. ALSA Core: - The new accel operation mode for compress-offload API; only the core part, the actual user will follow later ASoC: - Continued API simplification works - Renaming of the sh directory to Renesas - Factoring out of some of the common code for Realtek devices - Ussal ASoC Intel SOF, AMD and SoundWire updates - Support for Allwinner H616, AMD ACP 6.3 systems, AWInic AW88081, Cirrus Logic CS32L84, Everest ES8328, Iron Devices SMA1307, Longsoon I2S, NeoFidelity NTP8918 and NTP8835, Philips UDA1342, Qualcomm SM8750, RealTek RT721, and ST Microelectronics STM32MP25 HD- and USB-audio: - Clean up of IRQ handling in legacy HD-audio driver - Fix soft lockup at disconnection of non-standard USB drivers - Scarlett2 mixer improvements - New quirks and cleanups in HD- and USB-audio" * tag 'sound-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (278 commits) ALSA: hda: Poll jack events for LS7A HD-Audio ASoC: hdmi-codec: reorder channel allocation list ALSA: ump: Fix the wrong format specifier ASoC: Intel: soc-acpi-intel-lnl-match: add rt712_vb + rt1320 support ASoC: stm32: dfsdm: change rate upper limits ASoC: sma1307: fix uninitialized variable refence ASoC: dt-bindings: simple-mux: add idle-state property ASoc: simple-mux: add idle-state support ASoC: sdca: test adev before calling acpi_dev_for_each_child ASoC: SOF: ipc4-topology: remove redundant assignment to variable ret ASoC: amd: ps: fix the pcm device numbering for acp 6.3 platform ASoC: amd: acp: add soundwire machine driver for legacy stack ASoC: amd: acp: move get_acp63_cpu_pin_id() to common file ASoC: amd: ps: add soundwire machines for acp6.3 platform ASoC: amd: acp: add RT711, RT714 & RT1316 support for acp 6.3 platform ASoC: amd: acp: add rt722 based soundwire machines ALSA: compress_offload: Add missing descriptions in structs ALSA: 6fire: Release resources at card release ALSA: caiaq: Use snd_card_free_when_closed() at disconnection ALSA: us122l: Drop mmap_count field ...
2 parents 55ae3ee + e3f8064 commit 071b34d

File tree

395 files changed

+17556
-6477
lines changed

Some content is hidden

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

395 files changed

+17556
-6477
lines changed
Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/adi,adau1373.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Analog Devices ADAU1373 CODEC
8+
9+
maintainers:
10+
- Nuno Sá <nuno.sa@analog.com>
11+
12+
description: |
13+
Analog Devices ADAU1373 Low power codec with speaker and headphone amplifiers.
14+
https://www.analog.com/media/en/technical-documentation/data-sheets/ADAU1373.pdf
15+
16+
allOf:
17+
- $ref: dai-common.yaml#
18+
19+
properties:
20+
compatible:
21+
enum:
22+
- adi,adau1373
23+
24+
reg:
25+
maxItems: 1
26+
27+
"#sound-dai-cells":
28+
const: 0
29+
30+
powerdown-gpios:
31+
description: GPIO used for hardware power-down.
32+
maxItems: 1
33+
34+
adi,micbias1-microvolt:
35+
description:
36+
This property sets the microphone bias voltage for the first microphone.
37+
enum: [1800000, 2200000, 2600000, 2900000]
38+
default: 2900000
39+
40+
adi,micbias2-microvolt:
41+
description:
42+
This property sets the microphone bias voltage for the second microphone.
43+
enum: [1800000, 2200000, 2600000, 2900000]
44+
default: 2900000
45+
46+
adi,input1-differential:
47+
description: This property sets the first analog input as differential.
48+
type: boolean
49+
50+
adi,input2-differential:
51+
description: This property sets the second analog input as differential.
52+
type: boolean
53+
54+
adi,input3-differential:
55+
description: This property sets the third analog input as differential.
56+
type: boolean
57+
58+
adi,input4-differential:
59+
description: This property sets the fourth analog input as differential.
60+
type: boolean
61+
62+
adi,lineout-differential:
63+
description: This property sets the line output as differential.
64+
type: boolean
65+
66+
adi,lineout-gnd-sense:
67+
description: This property enables the line output ground sense control.
68+
type: boolean
69+
70+
adi,drc-settings:
71+
description:
72+
This setting is used to control the dynamic range of the signal. The
73+
device provides a maximum of three full band DRCs with 13 entries each.
74+
$ref: /schemas/types.yaml#/definitions/uint8-array
75+
oneOf:
76+
- minItems: 13
77+
maxItems: 13
78+
- minItems: 26
79+
maxItems: 26
80+
- minItems: 39
81+
maxItems: 39
82+
83+
required:
84+
- "#sound-dai-cells"
85+
- compatible
86+
- reg
87+
88+
unevaluatedProperties: false
89+
90+
examples:
91+
- |
92+
#include <dt-bindings/gpio/gpio.h>
93+
94+
i2c {
95+
#address-cells = <1>;
96+
#size-cells = <0>;
97+
audio-codec@1a {
98+
compatible = "adi,adau1373";
99+
reg = <0x1a>;
100+
#sound-dai-cells = <0>;
101+
powerdown-gpios = <&gpio 100 GPIO_ACTIVE_LOW>;
102+
adi,input2-differential;
103+
adi,input1-differential;
104+
adi,lineout-differential;
105+
adi,micbias2-microvolt = <1800000>;
106+
adi,drc-settings = /bits/ 8 <
107+
0xff 0xff 0x1 0x2 0xa 0xa 0xd 0x1 0xff 0xff 0x5 0xd 0xff
108+
>;
109+
};
110+
};
111+
...

Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-codec.yaml

Lines changed: 47 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ properties:
2222
- allwinner,sun8i-a23-codec
2323
- allwinner,sun8i-h3-codec
2424
- allwinner,sun8i-v3s-codec
25+
- allwinner,sun50i-h616-codec
2526

2627
reg:
2728
maxItems: 1
@@ -40,14 +41,20 @@ properties:
4041
- const: codec
4142

4243
dmas:
43-
items:
44-
- description: RX DMA Channel
45-
- description: TX DMA Channel
44+
oneOf:
45+
- items:
46+
- description: RX DMA Channel
47+
- description: TX DMA Channel
48+
- items:
49+
- description: TX DMA Channel
4650

4751
dma-names:
48-
items:
49-
- const: rx
50-
- const: tx
52+
oneOf:
53+
- items:
54+
- const: rx
55+
- const: tx
56+
- items:
57+
- const: tx
5158

5259
resets:
5360
maxItems: 1
@@ -229,6 +236,40 @@ allOf:
229236
- Mic
230237
- Speaker
231238

239+
- if:
240+
properties:
241+
compatible:
242+
enum:
243+
- allwinner,sun50i-h616-codec
244+
245+
then:
246+
properties:
247+
allwinner,audio-routing:
248+
items:
249+
enum:
250+
- LINEOUT
251+
- Line Out
252+
253+
dmas:
254+
items:
255+
- description: TX DMA Channel
256+
257+
dma-names:
258+
items:
259+
- const: tx
260+
261+
else:
262+
properties:
263+
dmas:
264+
items:
265+
- description: RX DMA Channel
266+
- description: TX DMA Channel
267+
268+
dma-names:
269+
items:
270+
- const: rx
271+
- const: tx
272+
232273
unevaluatedProperties: false
233274

234275
examples:

Documentation/devicetree/bindings/sound/audio-graph.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,14 @@ properties:
3737
pa-gpios:
3838
maxItems: 1
3939
hp-det-gpio:
40+
deprecated: true
41+
maxItems: 1
42+
hp-det-gpios:
4043
maxItems: 1
4144
mic-det-gpio:
45+
deprecated: true
46+
maxItems: 1
47+
mic-det-gpios:
4248
maxItems: 1
4349

4450
required:

Documentation/devicetree/bindings/sound/awinic,aw88395.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,9 @@ description:
1717
properties:
1818
compatible:
1919
enum:
20-
- awinic,aw88395
20+
- awinic,aw88081
2121
- awinic,aw88261
22+
- awinic,aw88395
2223
- awinic,aw88399
2324

2425
reg:
@@ -56,6 +57,7 @@ allOf:
5657
compatible:
5758
contains:
5859
enum:
60+
- awinic,aw88081
5961
- awinic,aw88261
6062
then:
6163
properties:
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/cirrus,cs42l84.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Cirrus Logic CS42L84 audio CODEC
8+
9+
maintainers:
10+
- Martin Povišer <povik+lin@cutebit.org>
11+
12+
description: |
13+
The CS42L84 is a headphone jack codec made by Cirrus Logic and embedded
14+
in personal computers sold by Apple. It was first seen in 2021 Macbook
15+
Pro models. It has stereo DAC for playback, mono ADC for capture, and
16+
is somewhat similar to CS42L42 but with a different regmap.
17+
18+
properties:
19+
compatible:
20+
enum:
21+
- cirrus,cs42l84
22+
23+
reg:
24+
maxItems: 1
25+
26+
reset-gpios:
27+
maxItems: 1
28+
29+
interrupts:
30+
maxItems: 1
31+
32+
'#sound-dai-cells':
33+
const: 0
34+
35+
required:
36+
- compatible
37+
- reg
38+
39+
additionalProperties: false
40+
41+
examples:
42+
- |
43+
#include <dt-bindings/gpio/gpio.h>
44+
#include <dt-bindings/interrupt-controller/irq.h>
45+
i2c {
46+
#address-cells = <1>;
47+
#size-cells = <0>;
48+
49+
jack_codec: codec@4b {
50+
compatible = "cirrus,cs42l84";
51+
reg = <0x4b>;
52+
reset-gpios = <&pinctrl_nub 4 GPIO_ACTIVE_LOW>;
53+
interrupts-extended = <&pinctrl_ap 180 IRQ_TYPE_LEVEL_LOW>;
54+
#sound-dai-cells = <0>;
55+
};
56+
};

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,13 @@
44
$id: http://devicetree.org/schemas/sound/everest,es8316.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Everest ES8311 and ES8316 audio CODECs
7+
title: Everest ES8311, ES8316 and ES8323 audio CODECs
88

99
maintainers:
1010
- Daniel Drake <drake@endlessm.com>
1111
- Katsuhiro Suzuki <katsuhiro@katsuster.net>
1212
- Matteo Martelli <matteomartelli3@gmail.com>
13+
- Binbin Zhou <zhoubinbin@loongson.cn>
1314

1415
allOf:
1516
- $ref: dai-common.yaml#
@@ -19,6 +20,7 @@ properties:
1920
enum:
2021
- everest,es8311
2122
- everest,es8316
23+
- everest,es8323
2224

2325
reg:
2426
maxItems: 1

Documentation/devicetree/bindings/sound/everest,es8326.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ properties:
2424
items:
2525
- const: mclk
2626

27+
interrupts:
28+
maxItems: 1
29+
description: interrupt output for headset detection
30+
2731
"#sound-dai-cells":
2832
const: 0
2933

Documentation/devicetree/bindings/sound/everest,es8328.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,10 @@ properties:
5050
HPVDD-supply:
5151
description: Regulator providing analog output voltage 3.3V
5252

53+
port:
54+
$ref: audio-graph-port.yaml#
55+
unevaluatedProperties: false
56+
5357
required:
5458
- compatible
5559
- clocks

Documentation/devicetree/bindings/sound/fsl,esai.yaml

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,15 @@ description:
1818

1919
properties:
2020
compatible:
21-
enum:
22-
- fsl,imx35-esai
23-
- fsl,imx6ull-esai
24-
- fsl,imx8qm-esai
25-
- fsl,vf610-esai
21+
oneOf:
22+
- enum:
23+
- fsl,imx35-esai
24+
- fsl,imx6ull-esai
25+
- fsl,vf610-esai
26+
- items:
27+
- enum:
28+
- fsl,imx8qm-esai
29+
- const: fsl,imx6ull-esai
2630

2731
reg:
2832
maxItems: 1
@@ -65,6 +69,9 @@ properties:
6569
- const: rx
6670
- const: tx
6771

72+
power-domains:
73+
maxItems: 1
74+
6875
fsl,fifo-depth:
6976
$ref: /schemas/types.yaml#/definitions/uint32
7077
default: 64
@@ -101,6 +108,17 @@ unevaluatedProperties: false
101108

102109
allOf:
103110
- $ref: dai-common.yaml#
111+
- if:
112+
properties:
113+
compatible:
114+
contains:
115+
const: fsl,imx8qm-esai
116+
then:
117+
required:
118+
- power-domains
119+
else:
120+
properties:
121+
power-domains: false
104122

105123
examples:
106124
- |

0 commit comments

Comments
 (0)