Skip to content

Commit 63112e3

Browse files
brooniebroonie
committed
Merge remote-tracking branch 'asoc/for-6.16' into asoc-next
2 parents 6052f05 + 85f8c2d commit 63112e3

204 files changed

Lines changed: 13561 additions & 1551 deletions

File tree

Some content is hidden

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

‎Documentation/devicetree/bindings/sound/cirrus,cs48l32.yaml‎

Lines changed: 195 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,195 @@
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,cs48l32.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Cirrus Logic CS48L32 audio DSP.
8+
9+
maintainers:
10+
- patches@opensource.cirrus.com
11+
12+
description: |
13+
The CS48L32 is a high-performance low-power audio DSP for smartphones and
14+
other portable audio devices. The CS48L32 combines a programmable Halo Core
15+
DSP with a variety of power-efficient fixed-function audio processors.
16+
17+
See also the binding headers:
18+
19+
include/dt-bindings/sound/cs48l32.yaml
20+
21+
allOf:
22+
- $ref: /schemas/spi/spi-peripheral-props.yaml#
23+
- $ref: dai-common.yaml#
24+
25+
properties:
26+
compatible:
27+
enum:
28+
- cirrus,cs48l32
29+
30+
reg:
31+
description: SPI chip-select number.
32+
maxItems: 1
33+
34+
spi-max-frequency:
35+
maximum: 25000000
36+
37+
vdd-a-supply:
38+
description: Regulator supplying VDD_A
39+
40+
vdd-d-supply:
41+
description: Regulator supplying VDD_D
42+
43+
vdd-io-supply:
44+
description: Regulator supplying VDD_IO
45+
46+
vdd-cp-supply:
47+
description: Regulator supplying VDD_CP
48+
49+
reset-gpios:
50+
description:
51+
One entry specifying the GPIO controlling /RESET. Although optional,
52+
it is strongly recommended to use a hardware reset.
53+
maxItems: 1
54+
55+
interrupts:
56+
maxItems: 1
57+
58+
clocks:
59+
items:
60+
- description: The clock supplied on MCLK1
61+
62+
clock-names:
63+
const: mclk1
64+
65+
'#sound-dai-cells':
66+
const: 1
67+
68+
cirrus,in-type:
69+
description: |
70+
A list of input type settings for each ADC input.
71+
Inputs are one of these types:
72+
CS48L32_IN_TYPE_DIFF : analog differential (default)
73+
CS48L32_IN_TYPE_SE : analog single-ended
74+
75+
The type of the left (L) and right (R) channel on each input is
76+
independently configured, as are the two groups of pins muxable to
77+
the input (referred to in the datasheet as "1" and "2").
78+
79+
$ref: /schemas/types.yaml#/definitions/uint32-array
80+
items:
81+
- description:
82+
IN1L_1 analog input type. One of the CS48L32_IN_TYPE_xxx.
83+
minimum: 0
84+
maximum: 1
85+
default: 0
86+
- description:
87+
IN1R_1 analog input type. One of the CS48L32_IN_TYPE_xxx.
88+
minimum: 0
89+
maximum: 1
90+
default: 0
91+
- description:
92+
IN1L_2 analog input type. One of the CS48L32_IN_TYPE_xxx.
93+
minimum: 0
94+
maximum: 1
95+
default: 0
96+
- description:
97+
IN1R_2 analog input type. One of the CS48L32_IN_TYPE_xxx.
98+
minimum: 0
99+
maximum: 1
100+
default: 0
101+
102+
cirrus,pdm-sup:
103+
description: |
104+
Indicate which MICBIAS output supplies bias to the microphone.
105+
There is one cell per input (IN1, IN2, ...).
106+
107+
One of the CS48L32_MICBIAS_xxx values.
108+
CS48L32_PDM_SUP_VOUT_MIC : mic biased from VOUT_MIC
109+
CS48L32_PDM_SUP_MICBIAS1 : mic biased from MICBIAS1
110+
111+
Also see the INn_PDM_SUP field in the datasheet.
112+
$ref: /schemas/types.yaml#/definitions/uint32-array
113+
items:
114+
- description: IN1 PDM supply source
115+
minimum: 0
116+
maximum: 1
117+
default: 0
118+
- description: IN2 PDM supply source
119+
minimum: 0
120+
maximum: 1
121+
default: 0
122+
123+
required:
124+
- compatible
125+
- reg
126+
- vdd-a-supply
127+
- vdd-d-supply
128+
- vdd-io-supply
129+
- vdd-cp-supply
130+
131+
additionalProperties: false
132+
133+
examples:
134+
- |
135+
#include <dt-bindings/sound/cs48l32.h>
136+
137+
spi@e0006000 {
138+
#address-cells = <1>;
139+
#size-cells = <0>;
140+
reg = <0xe0006000 0x1000>;
141+
142+
codec@1 {
143+
compatible = "cirrus,cs48l32";
144+
145+
reg = <0x1>;
146+
spi-max-frequency = <2500000>;
147+
148+
vdd-a-supply = <&regulator_1v8>;
149+
vdd-d-supply = <&regulator_1v2>;
150+
vdd-io-supply = <&regulator_1v8>;
151+
vdd-cp-supply = <&regulator_1v8>;
152+
153+
reset-gpios = <&gpio 0 0>;
154+
155+
clocks = <&clks 0>;
156+
clock-names = "mclk1";
157+
158+
interrupt-parent = <&gpio0>;
159+
interrupts = <56 8>;
160+
161+
#sound-dai-cells = <1>;
162+
163+
cirrus,in-type = <
164+
CS48L32_IN_TYPE_DIFF CS48L32_IN_TYPE_DIFF
165+
CS48L32_IN_TYPE_SE CS48L32_IN_TYPE_SE
166+
>;
167+
168+
cirrus,pdm-sup = <
169+
CS48L32_PDM_SUP_MICBIAS1 CS48L32_PDM_SUP_MICBIAS1
170+
>;
171+
};
172+
};
173+
174+
#
175+
# Minimal config
176+
#
177+
- |
178+
#include <dt-bindings/sound/cs48l32.h>
179+
180+
spi@e0006000 {
181+
#address-cells = <1>;
182+
#size-cells = <0>;
183+
reg = <0xe0006000 0x1000>;
184+
185+
codec@1 {
186+
compatible = "cirrus,cs48l32";
187+
188+
reg = <0x1>;
189+
190+
vdd-a-supply = <&regulator_1v8>;
191+
vdd-d-supply = <&regulator_1v2>;
192+
vdd-io-supply = <&regulator_1v8>;
193+
vdd-cp-supply = <&regulator_1v8>;
194+
};
195+
};

‎Documentation/devicetree/bindings/sound/fsl,mqs.yaml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ properties:
2828
- fsl,imx95-aonmix-mqs
2929
- fsl,imx95-netcmix-mqs
3030

31+
"#sound-dai-cells":
32+
const: 0
33+
3134
clocks:
3235
minItems: 1
3336
maxItems: 2
@@ -49,12 +52,17 @@ properties:
4952
resets:
5053
maxItems: 1
5154

55+
port:
56+
$ref: audio-graph-port.yaml#
57+
unevaluatedProperties: false
58+
5259
required:
5360
- compatible
5461
- clocks
5562
- clock-names
5663

5764
allOf:
65+
- $ref: dai-common.yaml#
5866
- if:
5967
properties:
6068
compatible:
@@ -86,7 +94,7 @@ allOf:
8694
required:
8795
- gpr
8896

89-
additionalProperties: false
97+
unevaluatedProperties: false
9098

9199
examples:
92100
- |

‎Documentation/devicetree/bindings/sound/loongson,ls1b-ac97.yaml‎

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/loongson,ls1b-ac97.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Loongson-1 AC97 Controller
8+
9+
maintainers:
10+
- Keguang Zhang <keguang.zhang@gmail.com>
11+
12+
description:
13+
The Loongson-1 AC97 controller supports 2-channel stereo output and input.
14+
It is paired with the DMA engine to handle playback and capture functions.
15+
16+
allOf:
17+
- $ref: dai-common.yaml#
18+
19+
properties:
20+
compatible:
21+
oneOf:
22+
- const: loongson,ls1b-ac97
23+
- items:
24+
- enum:
25+
- loongson,ls1a-ac97
26+
- loongson,ls1c-ac97
27+
- const: loongson,ls1b-ac97
28+
29+
reg:
30+
maxItems: 3
31+
32+
reg-names:
33+
items:
34+
- const: ac97
35+
- const: audio-tx
36+
- const: audio-rx
37+
38+
dmas:
39+
maxItems: 2
40+
41+
dma-names:
42+
items:
43+
- const: tx
44+
- const: rx
45+
46+
'#sound-dai-cells':
47+
const: 0
48+
49+
required:
50+
- compatible
51+
- reg
52+
- reg-names
53+
- dmas
54+
- dma-names
55+
- '#sound-dai-cells'
56+
57+
unevaluatedProperties: false
58+
59+
examples:
60+
- |
61+
audio-controller@1fe74000 {
62+
compatible = "loongson,ls1b-ac97";
63+
reg = <0x1fe74000 0x60>, <0x1fe72420 0x4>, <0x1fe74c4c 0x4>;
64+
reg-names = "ac97", "audio-tx", "audio-rx";
65+
dmas = <&dma 1>, <&dma 2>;
66+
dma-names = "tx", "rx";
67+
#sound-dai-cells = <0>;
68+
};

‎Documentation/devicetree/bindings/sound/maxim,max98925.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,11 @@ additionalProperties: false
7777

7878
examples:
7979
- |
80+
#include <dt-bindings/gpio/gpio.h>
8081
i2c {
8182
#address-cells = <1>;
8283
#size-cells = <0>;
8384
84-
#include <dt-bindings/gpio/gpio.h>
8585
audio-codec@3a {
8686
compatible = "maxim,max98927";
8787
reg = <0x3a>;

‎Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ properties:
2121
- mediatek,mt8195_mt6359_rt1019_rt5682
2222
- mediatek,mt8195_mt6359_rt1011_rt5682
2323
- mediatek,mt8195_mt6359_max98390_rt5682
24+
- mediatek,mt8195_mt6359
2425

2526
model:
2627
$ref: /schemas/types.yaml#/definitions/string
@@ -44,6 +45,8 @@ properties:
4445
- Right Spk
4546

4647
# Sources
48+
- Headphone L
49+
- Headphone R
4750
- Headset Mic
4851
- HPOL
4952
- HPOR
@@ -88,6 +91,7 @@ patternProperties:
8891
link-name:
8992
description: Indicates dai-link name and PCM stream name
9093
enum:
94+
- DL_SRC_BE
9195
- DPTX_BE
9296
- ETDM1_IN_BE
9397
- ETDM2_IN_BE

‎Documentation/devicetree/bindings/sound/qcom,wcd938x.yaml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,15 @@ properties:
2323
- qcom,wcd9380-codec
2424
- qcom,wcd9385-codec
2525

26+
mux-controls:
27+
description: A reference to the audio mux switch for
28+
switching CTIA/OMTP Headset types
29+
maxItems: 1
30+
2631
us-euro-gpios:
2732
description: GPIO spec for swapping gnd and mic segments
2833
maxItems: 1
34+
deprecated: true
2935

3036
required:
3137
- compatible

‎Documentation/devicetree/bindings/sound/realtek,alc203.yaml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/realtek,alc203.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Realtek ALC203 AC97 Audio Codec
8+
9+
maintainers:
10+
- Keguang Zhang <keguang.zhang@gmail.com>
11+
12+
description:
13+
ALC203 is a full duplex AC97 2.3 compatible stereo audio codec.
14+
15+
allOf:
16+
- $ref: dai-common.yaml#
17+
18+
properties:
19+
compatible:
20+
const: realtek,alc203
21+
22+
'#sound-dai-cells':
23+
const: 0
24+
25+
required:
26+
- compatible
27+
- '#sound-dai-cells'
28+
29+
unevaluatedProperties: false
30+
31+
examples:
32+
- |
33+
audio-codec {
34+
compatible = "realtek,alc203";
35+
#sound-dai-cells = <0>;
36+
};

0 commit comments

Comments
 (0)