Skip to content

Commit 1e9049c

Browse files
bardliaobardliao
committed
Merge branch 'sound/upstream-20251201' into merge/sound-upstream-20251201
2 parents 636ca2d + 797a04f commit 1e9049c

1,142 files changed

Lines changed: 33528 additions & 6031 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.

‎.mailmap‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ Danilo Krummrich <dakr@kernel.org> <dakr@redhat.com>
206206
David Brownell <david-b@pacbell.net>
207207
David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>
208208
David Heidelberg <david@ixit.cz> <d.okias@gmail.com>
209+
David Hildenbrand <david@kernel.org> <david@redhat.com>
209210
David Rheinsberg <david@readahead.eu> <dh.herrmann@gmail.com>
210211
David Rheinsberg <david@readahead.eu> <dh.herrmann@googlemail.com>
211212
David Rheinsberg <david@readahead.eu> <david.rheinsberg@gmail.com>
@@ -426,7 +427,7 @@ Kenneth W Chen <kenneth.w.chen@intel.com>
426427
Kenneth Westfield <quic_kwestfie@quicinc.com> <kwestfie@codeaurora.org>
427428
Kiran Gunda <quic_kgunda@quicinc.com> <kgunda@codeaurora.org>
428429
Kirill Tkhai <tkhai@ya.ru> <ktkhai@virtuozzo.com>
429-
Kirill A. Shutemov <kas@kernel.org> <kirill.shutemov@linux.intel.com>
430+
Kiryl Shutsemau <kas@kernel.org> <kirill.shutemov@linux.intel.com>
430431
Kishon Vijay Abraham I <kishon@kernel.org> <kishon@ti.com>
431432
Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@linaro.org>
432433
Konrad Dybcio <konradybcio@kernel.org> <konrad.dybcio@somainline.org>
@@ -437,6 +438,7 @@ Krishna Manikandan <quic_mkrishn@quicinc.com> <mkrishn@codeaurora.org>
437438
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
438439
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
439440
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>
441+
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@linaro.org>
440442
Krzysztof Wilczyński <kwilczynski@kernel.org> <krzysztof.wilczynski@linux.com>
441443
Krzysztof Wilczyński <kwilczynski@kernel.org> <kw@linux.com>
442444
Kshitiz Godara <quic_kgodara@quicinc.com> <kgodara@codeaurora.org>
@@ -605,7 +607,8 @@ Oleksij Rempel <o.rempel@pengutronix.de>
605607
Oleksij Rempel <o.rempel@pengutronix.de> <ore@pengutronix.de>
606608
Oliver Hartkopp <socketcan@hartkopp.net> <oliver.hartkopp@volkswagen.de>
607609
Oliver Hartkopp <socketcan@hartkopp.net> <oliver@hartkopp.net>
608-
Oliver Upton <oliver.upton@linux.dev> <oupton@google.com>
610+
Oliver Upton <oupton@kernel.org> <oupton@google.com>
611+
Oliver Upton <oupton@kernel.org> <oliver.upton@linux.dev>
609612
Ondřej Jirman <megi@xff.cz> <megous@megous.com>
610613
Oza Pawandeep <quic_poza@quicinc.com> <poza@codeaurora.org>
611614
Pali Rohár <pali@kernel.org> <pali.rohar@gmail.com>

‎Documentation/devicetree/bindings/gpio/ti,twl4030-gpio.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: http://devicetree.org/schemas/ti,twl4030-gpio.yaml#
4+
$id: http://devicetree.org/schemas/gpio/ti,twl4030-gpio.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: TI TWL4030 GPIO controller

‎Documentation/devicetree/bindings/pinctrl/toshiba,visconti-pinctrl.yaml‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,18 +50,20 @@ patternProperties:
5050
groups:
5151
description:
5252
Name of the pin group to use for the functions.
53-
$ref: /schemas/types.yaml#/definitions/string
54-
enum: [i2c0_grp, i2c1_grp, i2c2_grp, i2c3_grp, i2c4_grp,
55-
i2c5_grp, i2c6_grp, i2c7_grp, i2c8_grp,
56-
spi0_grp, spi0_cs0_grp, spi0_cs1_grp, spi0_cs2_grp,
57-
spi1_grp, spi2_grp, spi3_grp, spi4_grp, spi5_grp, spi6_grp,
58-
uart0_grp, uart1_grp, uart2_grp, uart3_grp,
59-
pwm0_gpio4_grp, pwm0_gpio8_grp, pwm0_gpio12_grp,
60-
pwm0_gpio16_grp, pwm1_gpio5_grp, pwm1_gpio9_grp,
61-
pwm1_gpio13_grp, pwm1_gpio17_grp, pwm2_gpio6_grp,
62-
pwm2_gpio10_grp, pwm2_gpio14_grp, pwm2_gpio18_grp,
63-
pwm3_gpio7_grp, pwm3_gpio11_grp, pwm3_gpio15_grp,
64-
pwm3_gpio19_grp, pcmif_out_grp, pcmif_in_grp]
53+
items:
54+
enum: [i2c0_grp, i2c1_grp, i2c2_grp, i2c3_grp, i2c4_grp,
55+
i2c5_grp, i2c6_grp, i2c7_grp, i2c8_grp,
56+
spi0_grp, spi0_cs0_grp, spi0_cs1_grp, spi0_cs2_grp,
57+
spi1_grp, spi2_grp, spi3_grp, spi4_grp, spi5_grp, spi6_grp,
58+
uart0_grp, uart1_grp, uart2_grp, uart3_grp,
59+
pwm0_gpio4_grp, pwm0_gpio8_grp, pwm0_gpio12_grp,
60+
pwm0_gpio16_grp, pwm1_gpio5_grp, pwm1_gpio9_grp,
61+
pwm1_gpio13_grp, pwm1_gpio17_grp, pwm2_gpio6_grp,
62+
pwm2_gpio10_grp, pwm2_gpio14_grp, pwm2_gpio18_grp,
63+
pwm3_gpio7_grp, pwm3_gpio11_grp, pwm3_gpio15_grp,
64+
pwm3_gpio19_grp, pcmif_out_grp, pcmif_in_grp]
65+
minItems: 1
66+
maxItems: 8
6567

6668
drive-strength:
6769
enum: [2, 4, 6, 8, 16, 24, 32]

‎Documentation/devicetree/bindings/pinctrl/xlnx,versal-pinctrl.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ patternProperties:
7474

7575
'^conf':
7676
type: object
77+
unevaluatedProperties: false
7778
description:
7879
Pinctrl node's client devices use subnodes for pin configurations,
7980
which in turn use the standard properties below.

‎Documentation/devicetree/bindings/sound/mediatek,mt8189-afe-pcm.yaml‎

Lines changed: 178 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,178 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/mediatek,mt8189-afe-pcm.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: MediaTek Audio Front End PCM controller for MT8189
8+
9+
maintainers:
10+
- Darren Ye <darren.ye@mediatek.com>
11+
- Cyril Chao <cyril.chao@mediatek.com>
12+
13+
properties:
14+
compatible:
15+
const: mediatek,mt8189-afe-pcm
16+
17+
reg:
18+
maxItems: 1
19+
20+
interrupts:
21+
maxItems: 1
22+
23+
memory-region:
24+
maxItems: 1
25+
26+
mediatek,apmixedsys:
27+
$ref: /schemas/types.yaml#/definitions/phandle
28+
description: To set up the apll12 tuner
29+
30+
power-domains:
31+
maxItems: 1
32+
33+
clocks:
34+
items:
35+
- description: mux for audio intbus
36+
- description: mux for audio engen1
37+
- description: mux for audio engen2
38+
- description: mux for audio h
39+
- description: audio apll1 clock
40+
- description: audio apll2 clock
41+
- description: audio apll1 divide4
42+
- description: audio apll2 divide4
43+
- description: audio apll12 divide for i2sin0
44+
- description: audio apll12 divide for i2sin1
45+
- description: audio apll12 divide for i2sout0
46+
- description: audio apll12 divide for i2sout1
47+
- description: audio apll12 divide for fmi2s
48+
- description: audio apll12 divide for tdmout mck
49+
- description: audio apll12 divide for tdmout bck
50+
- description: mux for audio apll1
51+
- description: mux for audio apll2
52+
- description: mux for i2sin0 mck
53+
- description: mux for i2sin1 mck
54+
- description: mux for i2sout0 mck
55+
- description: mux for i2sout1 mck
56+
- description: mux for fmi2s mck
57+
- description: mux for tdmout mck
58+
- description: 26m clock
59+
- description: audio slv clock
60+
- description: audio mst clock
61+
- description: audio intbus clock
62+
63+
clock-names:
64+
items:
65+
- const: top_aud_intbus
66+
- const: top_aud_eng1
67+
- const: top_aud_eng2
68+
- const: top_aud_h
69+
- const: apll1
70+
- const: apll2
71+
- const: apll1_d4
72+
- const: apll2_d4
73+
- const: apll12_div_i2sin0
74+
- const: apll12_div_i2sin1
75+
- const: apll12_div_i2sout0
76+
- const: apll12_div_i2sout1
77+
- const: apll12_div_fmi2s
78+
- const: apll12_div_tdmout_m
79+
- const: apll12_div_tdmout_b
80+
- const: top_apll1
81+
- const: top_apll2
82+
- const: top_i2sin0
83+
- const: top_i2sin1
84+
- const: top_i2sout0
85+
- const: top_i2sout1
86+
- const: top_fmi2s
87+
- const: top_dptx
88+
- const: clk26m
89+
- const: aud_slv_ck_peri
90+
- const: aud_mst_ck_peri
91+
- const: aud_intbus_ck_peri
92+
93+
required:
94+
- compatible
95+
- reg
96+
- interrupts
97+
- memory-region
98+
- power-domains
99+
- clocks
100+
- clock-names
101+
102+
additionalProperties: false
103+
104+
examples:
105+
- |
106+
#include <dt-bindings/interrupt-controller/arm-gic.h>
107+
#include <dt-bindings/interrupt-controller/irq.h>
108+
109+
soc {
110+
#address-cells = <2>;
111+
#size-cells = <2>;
112+
113+
afe@11050000 {
114+
compatible = "mediatek,mt8189-afe-pcm";
115+
reg = <0 0x11050000 0 0x10000>;
116+
interrupts = <GIC_SPI 392 IRQ_TYPE_LEVEL_HIGH 0>;
117+
memory-region = <&afe_dma_mem_reserved>;
118+
pinctrl-names = "default";
119+
pinctrl-0 = <&aud_pins_default>;
120+
power-domains = <&scpsys 1>; //MT8189_POWER_DOMAIN_AUDIO
121+
clocks = <&topckgen_clk 23>, //CLK_TOP_AUD_INTBUS_SEL
122+
<&topckgen_clk 39>, //CLK_TOP_AUD_ENGEN1_SEL
123+
<&topckgen_clk 40>, //CLK_TOP_AUD_ENGEN2_SEL
124+
<&topckgen_clk 49>, //CLK_TOP_AUDIO_H_SEL
125+
<&topckgen_clk 146>, //CLK_TOP_APLL1
126+
<&topckgen_clk 151>, //CLK_TOP_APLL2
127+
<&topckgen_clk 148>, //CLK_TOP_APLL1_D4
128+
<&topckgen_clk 153>, //CLK_TOP_APLL2_D4
129+
<&topckgen_clk 93>, //CLK_TOP_APLL12_CK_DIV_I2SIN0
130+
<&topckgen_clk 94>, //CLK_TOP_APLL12_CK_DIV_I2SIN1
131+
<&topckgen_clk 95>, //CLK_TOP_APLL12_CK_DIV_I2SOUT0
132+
<&topckgen_clk 96>, //CLK_TOP_APLL12_CK_DIV_I2SOUT1
133+
<&topckgen_clk 97>, //CLK_TOP_APLL12_CK_DIV_FMI2S
134+
<&topckgen_clk 98>, //CLK_TOP_APLL12_CK_DIV_TDMOUT_M
135+
<&topckgen_clk 99>, //CLK_TOP_APLL12_CK_DIV_TDMOUT_B
136+
<&topckgen_clk 44>, //CLK_TOP_AUD_1_SEL
137+
<&topckgen_clk 45>, //CLK_TOP_AUD_2_SEL
138+
<&topckgen_clk 78>, //CLK_TOP_APLL_I2SIN0_MCK_SEL
139+
<&topckgen_clk 79>, //CLK_TOP_APLL_I2SIN1_MCK_SEL
140+
<&topckgen_clk 84>, //CLK_TOP_APLL_I2SOUT0_MCK_SEL
141+
<&topckgen_clk 85>, //CLK_TOP_APLL_I2SOUT1_MCK_SEL
142+
<&topckgen_clk 90>, //CLK_TOP_APLL_FMI2S_MCK_SEL
143+
<&topckgen_clk 91>, //CLK_TOP_APLL_TDMOUT_MCK_SEL
144+
<&topckgen_clk 191>, //CLK_TOP_TCK_26M_MX9
145+
<&pericfg_ao_clk 77>, //CLK_PERAO_AUDIO0
146+
<&pericfg_ao_clk 78>, //CLK_PERAO_AUDIO1
147+
<&pericfg_ao_clk 79>; //CLK_PERAO_AUDIO2
148+
clock-names = "top_aud_intbus",
149+
"top_aud_eng1",
150+
"top_aud_eng2",
151+
"top_aud_h",
152+
"apll1",
153+
"apll2",
154+
"apll1_d4",
155+
"apll2_d4",
156+
"apll12_div_i2sin0",
157+
"apll12_div_i2sin1",
158+
"apll12_div_i2sout0",
159+
"apll12_div_i2sout1",
160+
"apll12_div_fmi2s",
161+
"apll12_div_tdmout_m",
162+
"apll12_div_tdmout_b",
163+
"top_apll1",
164+
"top_apll2",
165+
"top_i2sin0",
166+
"top_i2sin1",
167+
"top_i2sout0",
168+
"top_i2sout1",
169+
"top_fmi2s",
170+
"top_dptx",
171+
"clk26m",
172+
"aud_slv_ck_peri",
173+
"aud_mst_ck_peri",
174+
"aud_intbus_ck_peri";
175+
};
176+
};
177+
178+
...

‎Documentation/devicetree/bindings/sound/mediatek,mt8189-nau8825.yaml‎

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/mediatek,mt8189-nau8825.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: MediaTek MT8189 ASoC sound card
8+
9+
maintainers:
10+
- Darren Ye <darren.ye@mediatek.com>
11+
- Cyril Chao <cyril.chao@mediatek.com>
12+
13+
allOf:
14+
- $ref: sound-card-common.yaml#
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- mediatek,mt8189-nau8825
20+
- mediatek,mt8189-rt5650
21+
- mediatek,mt8189-rt5682s
22+
- mediatek,mt8189-rt5682i
23+
- mediatek,mt8189-es8326
24+
25+
mediatek,platform:
26+
$ref: /schemas/types.yaml#/definitions/phandle
27+
description: The phandle of MT8189 ASoC platform.
28+
29+
patternProperties:
30+
"^dai-link-[0-9]+$":
31+
type: object
32+
description:
33+
Container for dai-link level properties and CODEC sub-nodes.
34+
35+
properties:
36+
link-name:
37+
description:
38+
This property corresponds to the name of the BE dai-link to which
39+
we are going to update parameters in this node.
40+
enum:
41+
- TDM_DPTX_BE
42+
- I2SOUT0_BE
43+
- I2SIN0_BE
44+
- I2SOUT1_BE
45+
46+
codec:
47+
description: Holds subnode which indicates codec dai.
48+
type: object
49+
additionalProperties: false
50+
51+
properties:
52+
sound-dai:
53+
minItems: 1
54+
maxItems: 2
55+
required:
56+
- sound-dai
57+
58+
dai-format:
59+
description: audio format.
60+
enum:
61+
- i2s
62+
- right_j
63+
- left_j
64+
- dsp_a
65+
- dsp_b
66+
67+
mediatek,clk-provider:
68+
$ref: /schemas/types.yaml#/definitions/string
69+
description: Indicates dai-link clock master.
70+
enum:
71+
- cpu
72+
- codec
73+
74+
additionalProperties: false
75+
76+
required:
77+
- link-name
78+
79+
required:
80+
- compatible
81+
- mediatek,platform
82+
83+
unevaluatedProperties: false
84+
85+
examples:
86+
- |
87+
sound {
88+
compatible = "mediatek,mt8189-nau8825";
89+
model = "mt8189_rt9123_8825";
90+
mediatek,platform = <&afe>;
91+
dai-link-0 {
92+
link-name = "I2SOUT1_BE";
93+
dai-format = "i2s";
94+
mediatek,clk-provider = "cpu";
95+
codec {
96+
sound-dai = <&nau8825>;
97+
};
98+
};
99+
};
100+
101+
...

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ properties:
1414
oneOf:
1515
- enum:
1616
- qcom,sc7280-lpass-rx-macro
17+
- qcom,sm6115-lpass-rx-macro
1718
- qcom,sm8250-lpass-rx-macro
1819
- qcom,sm8450-lpass-rx-macro
1920
- qcom,sm8550-lpass-rx-macro
@@ -81,6 +82,23 @@ allOf:
8182
- const: npl
8283
- const: fsgen
8384

85+
- if:
86+
properties:
87+
compatible:
88+
enum:
89+
- qcom,sm6115-lpass-rx-macro
90+
then:
91+
properties:
92+
clocks:
93+
minItems: 4
94+
maxItems: 4
95+
clock-names:
96+
items:
97+
- const: mclk
98+
- const: npl
99+
- const: dcodec
100+
- const: fsgen
101+
84102
- if:
85103
properties:
86104
compatible:

0 commit comments

Comments
 (0)