Skip to content

Commit eaf291d

Browse files
brooniebroonie
committed
Merge remote-tracking branch 'asoc/for-5.19' into asoc-next
2 parents 817479f + 83f48ad commit eaf291d

412 files changed

Lines changed: 12416 additions & 5818 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,cs35l45.yaml‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
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,cs35l45.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Cirrus Logic CS35L45 Speaker Amplifier
8+
9+
maintainers:
10+
- Ricardo Rivera-Matos <rriveram@opensource.cirrus.com>
11+
- Richard Fitzgerald <rf@opensource.cirrus.com>
12+
13+
description: |
14+
CS35L45 is a Boosted Mono Class D Amplifier with DSP
15+
Speaker Protection and Adaptive Battery Management.
16+
17+
properties:
18+
compatible:
19+
enum:
20+
- cirrus,cs35l45
21+
22+
reg:
23+
maxItems: 1
24+
25+
'#sound-dai-cells':
26+
const: 1
27+
28+
reset-gpios:
29+
maxItems: 1
30+
31+
vdd-a-supply:
32+
description: voltage regulator phandle for the VDD_A supply
33+
34+
vdd-batt-supply:
35+
description: voltage regulator phandle for the VDD_BATT supply
36+
37+
spi-max-frequency:
38+
maximum: 5000000
39+
40+
cirrus,asp-sdout-hiz-ctrl:
41+
description:
42+
Audio serial port SDOUT Hi-Z control. Sets the Hi-Z
43+
configuration for SDOUT pin of amplifier. Logical OR of
44+
CS35L45_ASP_TX_HIZ_xxx values.
45+
$ref: "/schemas/types.yaml#/definitions/uint32"
46+
minimum: 0
47+
maximum: 3
48+
default: 2
49+
50+
required:
51+
- compatible
52+
- reg
53+
- "#sound-dai-cells"
54+
55+
additionalProperties: false
56+
57+
examples:
58+
- |
59+
#include <dt-bindings/sound/cs35l45.h>
60+
spi {
61+
#address-cells = <1>;
62+
#size-cells = <0>;
63+
64+
cs35l45: cs35l45@2 {
65+
#sound-dai-cells = <1>;
66+
compatible = "cirrus,cs35l45";
67+
reg = <2>;
68+
spi-max-frequency = <5000000>;
69+
vdd-a-supply = <&dummy_vreg>;
70+
vdd-batt-supply = <&dummy_vreg>;
71+
reset-gpios = <&gpio 110 0>;
72+
cirrus,asp-sdout-hiz-ctrl = <(CS35L45_ASP_TX_HIZ_UNUSED |
73+
CS35L45_ASP_TX_HIZ_DISABLED)>;
74+
};
75+
};

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ properties:
2929
minimum: 1
3030
maximum: 8388607
3131

32+
reset-gpios:
33+
maxItems: 1
34+
3235
required:
3336
- compatible
3437
- reg
@@ -37,6 +40,7 @@ additionalProperties: false
3740

3841
examples:
3942
- |
43+
#include <dt-bindings/gpio/gpio.h>
4044
i2c {
4145
#address-cells = <1>;
4246
#size-cells = <0>;
@@ -45,5 +49,6 @@ examples:
4549
reg = <0x38>;
4650
maxim,temperature_calib = <1024>;
4751
maxim,r0_calib = <100232>;
52+
reset-gpios = <&gpio 9 GPIO_ACTIVE_LOW>;
4853
};
4954
};

‎Documentation/devicetree/bindings/sound/mt8192-mt6359-rt1015-rt5682.yaml‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
enum:
1919
- mediatek,mt8192_mt6359_rt1015_rt5682
2020
- mediatek,mt8192_mt6359_rt1015p_rt5682
21+
- mediatek,mt8192_mt6359_rt1015p_rt5682s
2122

2223
mediatek,platform:
2324
$ref: "/schemas/types.yaml#/definitions/phandle"
@@ -27,11 +28,33 @@ properties:
2728
$ref: "/schemas/types.yaml#/definitions/phandle"
2829
description: The phandle of HDMI codec.
2930

31+
headset-codec:
32+
type: object
33+
properties:
34+
sound-dai:
35+
$ref: /schemas/types.yaml#/definitions/phandle
36+
required:
37+
- sound-dai
38+
39+
speaker-codecs:
40+
type: object
41+
properties:
42+
sound-dai:
43+
minItems: 1
44+
maxItems: 2
45+
items:
46+
maxItems: 1
47+
$ref: /schemas/types.yaml#/definitions/phandle-array
48+
required:
49+
- sound-dai
50+
3051
additionalProperties: false
3152

3253
required:
3354
- compatible
3455
- mediatek,platform
56+
- headset-codec
57+
- speaker-codecs
3558

3659
examples:
3760
- |
@@ -44,6 +67,15 @@ examples:
4467
"aud_clk_mosi_on";
4568
pinctrl-0 = <&aud_clk_mosi_off>;
4669
pinctrl-1 = <&aud_clk_mosi_on>;
70+
71+
headset-codec {
72+
sound-dai = <&rt5682>;
73+
};
74+
75+
speaker-codecs {
76+
sound-dai = <&rt1015_l>,
77+
<&rt1015_r>;
78+
};
4779
};
4880
4981
...

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

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

Documentation/devicetree/bindings/sound/mt8195-mt6359-rt1019-rt5682.yaml renamed to Documentation/devicetree/bindings/sound/mt8195-mt6359.yaml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: http://devicetree.org/schemas/sound/mt8195-mt6359-rt1019-rt5682.yaml#
4+
$id: http://devicetree.org/schemas/sound/mt8195-mt6359.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Mediatek MT8195 with MT6359, RT1019 and RT5682 ASoC sound card driver
7+
title: MediaTek MT8195 ASoC sound card driver
88

99
maintainers:
1010
- Trevor Wu <trevor.wu@mediatek.com>
@@ -14,7 +14,10 @@ description:
1414

1515
properties:
1616
compatible:
17-
const: mediatek,mt8195_mt6359_rt1019_rt5682
17+
enum:
18+
- mediatek,mt8195_mt6359_rt1019_rt5682
19+
- mediatek,mt8195_mt6359_rt1011_rt5682
20+
- mediatek,mt8195_mt6359_max98390_rt5682
1821

1922
model:
2023
$ref: /schemas/types.yaml#/definitions/string

‎Documentation/devicetree/bindings/sound/nvidia,tegra186-asrc.yaml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/nvidia,tegra186-asrc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Tegra186 ASRC Device Tree Bindings
8+
9+
description: |
10+
Asynchronous Sample Rate Converter (ASRC) converts the sampling frequency
11+
of the input signal from one frequency to another. It can handle over a
12+
wide range of sample rate ratios (freq_in/freq_out) from 1:24 to 24:1.
13+
ASRC has two modes of operation. One where ratio can be programmed in SW
14+
and the other where it gets the information from ratio estimator module.
15+
16+
It supports sample rate conversions in the range of 8 to 192 kHz and
17+
supports 6 streams upto 12 total channels. The input data size can be
18+
16, 24 and 32 bits.
19+
20+
maintainers:
21+
- Jon Hunter <jonathanh@nvidia.com>
22+
- Mohan Kumar <mkumard@nvidia.com>
23+
- Sameer Pujar <spujar@nvidia.com>
24+
25+
allOf:
26+
- $ref: name-prefix.yaml#
27+
28+
properties:
29+
$nodename:
30+
pattern: "^asrc@[0-9a-f]*$"
31+
32+
compatible:
33+
oneOf:
34+
- const: nvidia,tegra186-asrc
35+
- items:
36+
- enum:
37+
- nvidia,tegra234-asrc
38+
- nvidia,tegra194-asrc
39+
- const: nvidia,tegra186-asrc
40+
41+
reg:
42+
maxItems: 1
43+
44+
sound-name-prefix:
45+
pattern: "^ASRC[1-9]$"
46+
47+
ports:
48+
$ref: /schemas/graph.yaml#/properties/ports
49+
description: |
50+
ASRC has seven input ports and six output ports. Accordingly ACIF
51+
(Audio Client Interfaces) port nodes are defined to represent the
52+
ASRC inputs (port 0 to 6) and outputs (port 7 to 12). These are
53+
connected to corresponding ports on AHUB (Audio Hub). Additional
54+
input (port 6) is for receiving ratio information from estimator.
55+
56+
patternProperties:
57+
'^port@[0-6]':
58+
$ref: audio-graph-port.yaml#
59+
unevaluatedProperties: false
60+
description: ASRC ACIF input ports
61+
'^port@[7-9]|1[1-2]':
62+
$ref: audio-graph-port.yaml#
63+
unevaluatedProperties: false
64+
description: ASRC ACIF output ports
65+
66+
required:
67+
- compatible
68+
- reg
69+
70+
additionalProperties: false
71+
72+
examples:
73+
- |
74+
75+
asrc@2910000 {
76+
compatible = "nvidia,tegra186-asrc";
77+
reg = <0x2910000 0x2000>;
78+
sound-name-prefix = "ASRC1";
79+
};
80+
81+
...

‎Documentation/devicetree/bindings/sound/nvidia,tegra210-ahub.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,6 +106,10 @@ patternProperties:
106106
type: object
107107
$ref: nvidia,tegra210-mixer.yaml#
108108

109+
'^asrc@[0-9a-f]+$':
110+
type: object
111+
$ref: nvidia,tegra186-asrc.yaml#
112+
109113
required:
110114
- compatible
111115
- reg

‎Documentation/devicetree/bindings/sound/qcom,lpass-cpu.yaml‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ properties:
3838
maxItems: 7
3939

4040
clock-names:
41-
minItems: 3
42-
maxItems: 7
41+
minItems: 1
42+
maxItems: 10
4343

4444
interrupts:
4545
minItems: 2
@@ -62,6 +62,9 @@ properties:
6262
power-domains:
6363
maxItems: 1
6464

65+
power-domain-names:
66+
maxItems: 1
67+
6568
'#sound-dai-cells':
6669
const: 1
6770

@@ -192,15 +195,19 @@ allOf:
192195
oneOf:
193196
- items: #for I2S
194197
- const: aon_cc_audio_hm_h
198+
- const: audio_cc_ext_mclk0
195199
- const: core_cc_sysnoc_mport_core
200+
- const: core_cc_ext_if0_ibit
196201
- const: core_cc_ext_if1_ibit
197202
- items: #for Soundwire
198203
- const: aon_cc_audio_hm_h
204+
- const: audio_cc_codec_mem
199205
- const: audio_cc_codec_mem0
200206
- const: audio_cc_codec_mem1
201207
- const: audio_cc_codec_mem2
208+
- const: aon_cc_va_mem0
202209
- items: #for HDMI
203-
- const: aon_cc_audio_hm_h
210+
- const: core_cc_sysnoc_mport_core
204211

205212
reg-names:
206213
anyOf:
@@ -228,6 +235,10 @@ allOf:
228235
- const: lpass-irq-hdmi
229236
- const: lpass-irq-vaif
230237
- const: lpass-irq-rxtxif
238+
power-domain-names:
239+
allOf:
240+
- items:
241+
- const: lcx
231242

232243
required:
233244
- iommus

0 commit comments

Comments
 (0)