Skip to content

Commit ddd0c57

Browse files
bardliaobardliao
committed
Merge branch 'sound/upstream-20241112' into merge/sound-upstream-20241112
2 parents 503963d + 70e4167 commit ddd0c57

90 files changed

Lines changed: 5040 additions & 403 deletions

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/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:

‎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/fsl,esai.yaml‎

Lines changed: 9 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

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

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,23 @@ description: |
1616
1717
properties:
1818
compatible:
19-
enum:
20-
- fsl,imx35-spdif
21-
- fsl,vf610-spdif
22-
- fsl,imx6sx-spdif
23-
- fsl,imx8qm-spdif
24-
- fsl,imx8qxp-spdif
25-
- fsl,imx8mq-spdif
26-
- fsl,imx8mm-spdif
27-
- fsl,imx8mn-spdif
28-
- fsl,imx8ulp-spdif
19+
oneOf:
20+
- items:
21+
- enum:
22+
- fsl,imx35-spdif
23+
- fsl,imx6sx-spdif
24+
- fsl,imx8mm-spdif
25+
- fsl,imx8mn-spdif
26+
- fsl,imx8mq-spdif
27+
- fsl,imx8qm-spdif
28+
- fsl,imx8qxp-spdif
29+
- fsl,imx8ulp-spdif
30+
- fsl,vf610-spdif
31+
- items:
32+
- enum:
33+
- fsl,imx6sl-spdif
34+
- fsl,imx6sx-spdif
35+
- const: fsl,imx35-spdif
2936

3037
reg:
3138
maxItems: 1

‎Documentation/devicetree/bindings/sound/irondevice,sma1307.yaml‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/irondevice,sma1307.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Iron Device SMA1307 Audio Amplifier
8+
9+
maintainers:
10+
- Kiseok Jo <kiseok.jo@irondevice.com>
11+
12+
description:
13+
SMA1307 boosted digital speaker amplifier with feedback-loop.
14+
15+
allOf:
16+
- $ref: dai-common.yaml#
17+
18+
properties:
19+
compatible:
20+
enum:
21+
- irondevice,sma1307a
22+
- irondevice,sma1307aq
23+
description:
24+
If a 'q' is added, it indicated the product is AEC-Q100
25+
qualified for automotive applications. SMA1307A supports
26+
both WLCSP and QFN packages. However, SMA1307AQ only
27+
supports the QFN package.
28+
29+
reg:
30+
maxItems: 1
31+
32+
'#sound-dai-cells':
33+
const: 1
34+
35+
required:
36+
- compatible
37+
- reg
38+
- '#sound-dai-cells'
39+
40+
additionalProperties: false
41+
42+
examples:
43+
- |
44+
i2c {
45+
#address-cells = <1>;
46+
#size-cells = <0>;
47+
48+
amplifier@1e {
49+
compatible = "irondevice,sma1307a";
50+
reg = <0x1e>;
51+
#sound-dai-cells = <1>;
52+
};
53+
};

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ title: Maxim Integrated MAX98390 Speaker Amplifier with Integrated Dynamic Speak
99
maintainers:
1010
- Steve Lee <steves.lee@maximintegrated.com>
1111

12+
allOf:
13+
- $ref: dai-common.yaml#
14+
1215
properties:
1316
compatible:
1417
const: maxim,max98390
@@ -32,11 +35,14 @@ properties:
3235
reset-gpios:
3336
maxItems: 1
3437

38+
'#sound-dai-cells':
39+
const: 0
40+
3541
required:
3642
- compatible
3743
- reg
3844

39-
additionalProperties: false
45+
unevaluatedProperties: false
4046

4147
examples:
4248
- |

‎Documentation/devicetree/bindings/sound/mediatek,mt8188-mt6359.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,13 @@ properties:
2929
$ref: /schemas/types.yaml#/definitions/phandle
3030
description: The phandle of MT8188 ASoC platform.
3131

32+
mediatek,adsp:
33+
$ref: /schemas/types.yaml#/definitions/phandle
34+
description:
35+
The phandle of the MT8188 ADSP platform, which is the optional Audio DSP
36+
hardware that provides additional audio functionalities if present.
37+
The AFE will link to ADSP when the phandle is provided.
38+
3239
patternProperties:
3340
"^dai-link-[0-9]+$":
3441
type: object

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ properties:
2525
- enum:
2626
- qcom,sm8550-sndcard
2727
- qcom,sm8650-sndcard
28+
- qcom,sm8750-sndcard
2829
- const: qcom,sm8450-sndcard
2930
- enum:
3031
- qcom,apq8096-sndcard

‎Documentation/devicetree/bindings/sound/sprd,pcm-platform.yaml‎

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/sprd,pcm-platform.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Spreadtrum DMA platform
8+
9+
maintainers:
10+
- Orson Zhai <orsonzhai@gmail.com>
11+
- Baolin Wang <baolin.wang7@gmail.com>
12+
- Chunyan Zhang <zhang.lyra@gmail.com>
13+
14+
properties:
15+
compatible:
16+
const: sprd,pcm-platform
17+
18+
dmas:
19+
maxItems: 10
20+
21+
dma-names:
22+
items:
23+
- const: normal_p_l
24+
- const: normal_p_r
25+
- const: normal_c_l
26+
- const: normal_c_r
27+
- const: voice_c
28+
- const: fast_p
29+
- const: loop_c
30+
- const: loop_p
31+
- const: voip_c
32+
- const: voip_p
33+
34+
required:
35+
- compatible
36+
- dmas
37+
- dma-names
38+
39+
additionalProperties: false
40+
41+
examples:
42+
- |
43+
platform {
44+
compatible = "sprd,pcm-platform";
45+
dmas = <&agcp_dma 1 1>, <&agcp_dma 2 2>,
46+
<&agcp_dma 3 3>, <&agcp_dma 4 4>,
47+
<&agcp_dma 5 5>, <&agcp_dma 6 6>,
48+
<&agcp_dma 7 7>, <&agcp_dma 8 8>,
49+
<&agcp_dma 9 9>, <&agcp_dma 10 10>;
50+
dma-names = "normal_p_l", "normal_p_r",
51+
"normal_c_l", "normal_c_r",
52+
"voice_c", "fast_p",
53+
"loop_c", "loop_p",
54+
"voip_c", "voip_p";
55+
};
56+
...

‎Documentation/devicetree/bindings/sound/sprd,sc9860-mcdt.yaml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/sprd,sc9860-mcdt.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Spreadtrum Multi-Channel Data Transfer controller
8+
9+
description:
10+
The Multi-channel data transfer controller is used for sound stream
11+
transmission between the audio subsystem and other AP/CP subsystem. It
12+
supports 10 DAC channels and 10 ADC channels, and each channel can be
13+
configured with DMA mode or interrupt mode.
14+
15+
maintainers:
16+
- Orson Zhai <orsonzhai@gmail.com>
17+
- Baolin Wang <baolin.wang7@gmail.com>
18+
- Chunyan Zhang <zhang.lyra@gmail.com>
19+
20+
properties:
21+
compatible:
22+
const: sprd,sc9860-mcdt
23+
24+
reg:
25+
maxItems: 1
26+
27+
interrupts:
28+
maxItems: 1
29+
30+
required:
31+
- compatible
32+
- reg
33+
- interrupts
34+
35+
additionalProperties: false
36+
37+
examples:
38+
- |
39+
#include <dt-bindings/interrupt-controller/arm-gic.h>
40+
#include <dt-bindings/interrupt-controller/irq.h>
41+
42+
mcdt@41490000 {
43+
compatible = "sprd,sc9860-mcdt";
44+
reg = <0x41490000 0x170>;
45+
interrupts = <GIC_SPI 48 IRQ_TYPE_LEVEL_HIGH>;
46+
};
47+
...

0 commit comments

Comments
 (0)