Skip to content

Commit c26e1b0

Browse files
ranj063ranj063
authored
Merge pull request #3517 from ranj063/merge/sound-upstream-20220314-2
Merge/sound upstream 20220314
2 parents d293750 + 0d1c976 commit c26e1b0

150 files changed

Lines changed: 6704 additions & 612 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/audio-graph-port.yaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,24 @@ patternProperties:
7171
description: CPU to Codec rate channels.
7272
$ref: /schemas/types.yaml#/definitions/uint32
7373

74+
dai-tdm-slot-width-map:
75+
description: Mapping of sample widths to slot widths. For hardware
76+
that cannot support a fixed slot width or a slot width always
77+
equal to sample width. A matrix of one or more 3-tuples.
78+
$ref: /schemas/types.yaml#/definitions/uint32-matrix
79+
items:
80+
items:
81+
-
82+
description: Sample width in bits
83+
minimum: 8
84+
maximum: 64
85+
-
86+
description: Slot width in bits
87+
minimum: 8
88+
maximum: 256
89+
-
90+
description: Slot count
91+
minimum: 1
92+
maximum: 64
93+
7494
additionalProperties: true

‎Documentation/devicetree/bindings/sound/awinic,aw8738.yaml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/awinic,aw8738.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Awinic AW8738 Audio Amplifier
8+
9+
maintainers:
10+
- Stephan Gerhold <stephan@gerhold.net>
11+
12+
description:
13+
The Awinic AW8738 is a simple audio amplifier with different operation modes
14+
(set using one-wire pulse control). The mode configures the speaker-guard
15+
function (primarily the power limit for the amplifier).
16+
17+
allOf:
18+
- $ref: name-prefix.yaml#
19+
20+
properties:
21+
compatible:
22+
const: awinic,aw8738
23+
24+
mode-gpios:
25+
description:
26+
GPIO used for one-wire pulse control. The pin is typically called SHDN
27+
(active-low), but this is misleading since it is actually more than
28+
just a simple shutdown/enable control.
29+
maxItems: 1
30+
31+
awinic,mode:
32+
description: Operation mode (number of pulses for one-wire pulse control)
33+
$ref: /schemas/types.yaml#/definitions/uint32
34+
minimum: 1
35+
maximum: 7
36+
37+
sound-name-prefix: true
38+
39+
required:
40+
- compatible
41+
- mode-gpios
42+
- awinic,mode
43+
44+
additionalProperties: false
45+
46+
examples:
47+
- |
48+
#include <dt-bindings/gpio/gpio.h>
49+
audio-amplifier {
50+
compatible = "awinic,aw8738";
51+
mode-gpios = <&msmgpio 114 GPIO_ACTIVE_HIGH>;
52+
awinic,mode = <5>;
53+
sound-name-prefix = "Speaker Amp";
54+
};

‎Documentation/devicetree/bindings/sound/microchip,pdmc.yaml‎

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/microchip,pdmc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Microchip Pulse Density Microphone Controller
8+
9+
maintainers:
10+
- Codrin Ciubotariu <codrin.ciubotariu@microchip.com>
11+
12+
description:
13+
The Microchip Pulse Density Microphone Controller (PDMC) interfaces up to 4
14+
digital microphones having Pulse Density Modulated (PDM) outputs.
15+
16+
properties:
17+
compatible:
18+
const: microchip,sama7g5-pdmc
19+
20+
reg:
21+
maxItems: 1
22+
23+
"#sound-dai-cells":
24+
const: 0
25+
26+
interrupts:
27+
maxItems: 1
28+
29+
clocks:
30+
items:
31+
- description: Peripheral Bus Clock
32+
- description: Generic Clock
33+
34+
clock-names:
35+
items:
36+
- const: pclk
37+
- const: gclk
38+
39+
dmas:
40+
description: RX DMA Channel
41+
maxItems: 1
42+
43+
dma-names:
44+
const: rx
45+
46+
microchip,mic-pos:
47+
description: |
48+
Position of PDM microphones on the DS line and the sampling edge (rising
49+
or falling) of the CLK line. A microphone is represented as a pair of DS
50+
line and the sampling edge. The first microphone is mapped to channel 0,
51+
the second to channel 1, etc.
52+
$ref: /schemas/types.yaml#/definitions/uint32-matrix
53+
items:
54+
items:
55+
- description: value for DS line
56+
- description: value for sampling edge
57+
anyOf:
58+
- enum:
59+
- [0, 0]
60+
- [0, 1]
61+
- [1, 0]
62+
- [1, 1]
63+
minItems: 1
64+
maxItems: 4
65+
uniqueItems: true
66+
67+
required:
68+
- compatible
69+
- reg
70+
- "#sound-dai-cells"
71+
- interrupts
72+
- clocks
73+
- clock-names
74+
- dmas
75+
- dma-names
76+
- microchip,mic-pos
77+
78+
additionalProperties: false
79+
80+
examples:
81+
- |
82+
#include <dt-bindings/clock/at91.h>
83+
#include <dt-bindings/dma/at91.h>
84+
#include <dt-bindings/interrupt-controller/arm-gic.h>
85+
#include <dt-bindings/sound/microchip,pdmc.h>
86+
87+
pdmc: sound@e1608000 {
88+
compatible = "microchip,sama7g5-pdmc";
89+
reg = <0xe1608000 0x4000>;
90+
#sound-dai-cells = <0>;
91+
interrupts = <GIC_SPI 68 IRQ_TYPE_LEVEL_HIGH>;
92+
dmas = <&dma0 AT91_XDMAC_DT_PERID(37)>;
93+
dma-names = "rx";
94+
clocks = <&pmc PMC_TYPE_PERIPHERAL 68>, <&pmc PMC_TYPE_GCK 68>;
95+
clock-names = "pclk", "gclk";
96+
microchip,mic-pos = <MCHP_PDMC_DS0 MCHP_PDMC_CLK_POSITIVE>,
97+
<MCHP_PDMC_DS0 MCHP_PDMC_CLK_NEGATIVE>,
98+
<MCHP_PDMC_DS1 MCHP_PDMC_CLK_POSITIVE>,
99+
<MCHP_PDMC_DS1 MCHP_PDMC_CLK_NEGATIVE>;
100+
};

‎Documentation/devicetree/bindings/sound/mt8195-afe-pcm.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@ properties:
1919
interrupts:
2020
maxItems: 1
2121

22+
resets:
23+
maxItems: 1
24+
25+
reset-names:
26+
const: audiosys
27+
2228
memory-region:
2329
maxItems: 1
2430
description: |
@@ -127,6 +133,8 @@ required:
127133
- compatible
128134
- reg
129135
- interrupts
136+
- resets
137+
- reset-names
130138
- mediatek,topckgen
131139
- power-domains
132140
- clocks
@@ -144,6 +152,8 @@ examples:
144152
compatible = "mediatek,mt8195-audio";
145153
reg = <0x10890000 0x10000>;
146154
interrupts = <GIC_SPI 822 IRQ_TYPE_LEVEL_HIGH 0>;
155+
resets = <&watchdog 14>;
156+
reset-names = "audiosys";
147157
mediatek,topckgen = <&topckgen>;
148158
power-domains = <&spm 7>; //MT8195_POWER_DOMAIN_AUDIO
149159
memory-region = <&snd_dma_mem_reserved>;

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@ properties:
3939
items:
4040
- const: mclk
4141

42+
power-domains:
43+
maxItems: 2
44+
45+
power-domain-names:
46+
items:
47+
- const: macro
48+
- const: dcodec
49+
4250
required:
4351
- compatible
4452
- reg

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@ properties:
3939
items:
4040
- const: mclk
4141

42+
power-domains:
43+
maxItems: 2
44+
45+
power-domain-names:
46+
items:
47+
- const: macro
48+
- const: dcodec
49+
4250
qcom,dmic-sample-rate:
4351
description: dmic sample rate
4452
$ref: /schemas/types.yaml#/definitions/uint32

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,14 @@ properties:
3737
items:
3838
- const: fsgen
3939

40+
power-domains:
41+
maxItems: 2
42+
43+
power-domain-names:
44+
items:
45+
- const: macro
46+
- const: dcodec
47+
4048
qcom,dmic-sample-rate:
4149
description: dmic sample rate
4250
$ref: /schemas/types.yaml#/definitions/uint32

‎Documentation/devicetree/bindings/sound/renesas,rsnd.yaml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,7 @@ properties:
123123
$ref: audio-graph-port.yaml#
124124
unevaluatedProperties: false
125125

126-
# use patternProperties to avoid naming "xxx,yyy" issue
127-
patternProperties:
128-
"^rcar_sound,dvc$":
126+
rcar_sound,dvc:
129127
description: DVC subnode.
130128
type: object
131129
patternProperties:
@@ -141,7 +139,7 @@ patternProperties:
141139
- dma-names
142140
additionalProperties: false
143141

144-
"^rcar_sound,mix$":
142+
rcar_sound,mix:
145143
description: MIX subnode.
146144
type: object
147145
patternProperties:
@@ -150,7 +148,7 @@ patternProperties:
150148
# no properties
151149
additionalProperties: false
152150

153-
"^rcar_sound,ctu$":
151+
rcar_sound,ctu:
154152
description: CTU subnode.
155153
type: object
156154
patternProperties:
@@ -159,7 +157,7 @@ patternProperties:
159157
# no properties
160158
additionalProperties: false
161159

162-
"^rcar_sound,src$":
160+
rcar_sound,src:
163161
description: SRC subnode.
164162
type: object
165163
patternProperties:
@@ -182,7 +180,7 @@ patternProperties:
182180
- dma-names
183181
additionalProperties: false
184182

185-
"^rcar_sound,ssiu$":
183+
rcar_sound,ssiu:
186184
description: SSIU subnode.
187185
type: object
188186
patternProperties:
@@ -202,7 +200,7 @@ patternProperties:
202200
- dma-names
203201
additionalProperties: false
204202

205-
"^rcar_sound,ssi$":
203+
rcar_sound,ssi:
206204
description: SSI subnode.
207205
type: object
208206
patternProperties:
@@ -239,7 +237,7 @@ patternProperties:
239237
additionalProperties: false
240238

241239
# For DAI base
242-
"^rcar_sound,dai$":
240+
rcar_sound,dai:
243241
description: DAI subnode.
244242
type: object
245243
patternProperties:

‎Documentation/devicetree/bindings/sound/renesas,rz-ssi.yaml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
$id: http://devicetree.org/schemas/sound/renesas,rz-ssi.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Renesas RZ/G2L ASoC Sound Serial Interface (SSIF-2)
7+
title: Renesas RZ/{G2L,V2L} ASoC Sound Serial Interface (SSIF-2)
88

99
maintainers:
1010
- Biju Das <biju.das.jz@bp.renesas.com>
@@ -14,6 +14,7 @@ properties:
1414
items:
1515
- enum:
1616
- renesas,r9a07g044-ssi # RZ/G2{L,LC}
17+
- renesas,r9a07g054-ssi # RZ/V2L
1718
- const: renesas,rz-ssi
1819

1920
reg:

0 commit comments

Comments
 (0)