Skip to content

Commit d061251

Browse files
committed
Merge tag 'sound-7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "It's been relatively calm for a new era; majority of changes are for ASoC, mostly device-specific changes, while there are a bit of cleanups in core stuff. A few SPI API and regmap updates are included to be used by sound drivers, too. Core: - A few trivial cleanups about __free() and runtime PM macros - Convert to new snd_seq_bus binding ASoC: - Generic SDCA support for reporting jack events - Continuing platform support, cleanup and feature improvements for AMD, Intel, Qualcomm and SOF code - Platform description improvements for the Cirrus drivers - Support for NXP i.MX952, Realtek RT1320 and RT5575, and Sophogo CV1800B HD- and USB-audio: - Many quirks as usual" * tag 'sound-7.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (341 commits) ALSA: usb-audio: Add DSD support for iBasso DC04U ALSA: mixer: oss: Add card disconnect checkpoints ASoC: SOF: ipc4-control: Set correct error code in refresh_bytes_control ASoC: SOF: Intel: select CONFIG_SND_HDA_EXT_CORE from SND_SOC_SOF_HDA_COMMON ALSA: usb-audio: Add iface reset and delay quirk for AB13X USB Audio ASoC: amd: maintainer information ALSA: ctxfi: Add quirk for SE-300PCIE variant (160b:0102) ALSA: hda/generic: fix typos in comments ALSA: hda/realtek - Enable mute LEDs on HP ENVY x360 15-es0xxx ALSA: hda/conexant: Add quirk for HP ZBook Studio G4 ASoC: fsl_asrc_dma: allocate memory from dma device ASoC: fsl_asrc: Add support for i.MX952 platform ASoC: fsl_asrc_m2m: Add option to start ASRC before DMA device for M2M ASoC: dt-bindings: fsl,imx-asrc: Add support for i.MX952 platform ALSA: oss: delete self assignment ASoC: rockchip: spdif: Convert to FIELD_PREP ASoC: rockchip: spdif: Fill IEC958 CS info per params ASoC: rockchip: spdif: Add support for format S32_LE ASoC: rockchip: spdif: Add support for set mclk rate ASoC: rockchip: spdif: Swap PCM and DAI component registration order ...
2 parents 0d6dd47 + dd03dd6 commit d061251

330 files changed

Lines changed: 14410 additions & 4688 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/goldfish/audio.txt

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

Documentation/devicetree/bindings/sound/awinic,aw87390.yaml

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,15 @@ description:
1515
sound quallity, which is a new high efficiency, low
1616
noise, constant large volume, 6th Smart K audio amplifier.
1717

18-
allOf:
19-
- $ref: dai-common.yaml#
20-
2118
properties:
2219
compatible:
23-
const: awinic,aw87390
20+
oneOf:
21+
- enum:
22+
- awinic,aw87390
23+
- items:
24+
- enum:
25+
- anbernic,rgds-amp
26+
- const: awinic,aw87391
2427

2528
reg:
2629
maxItems: 1
@@ -40,10 +43,31 @@ required:
4043
- compatible
4144
- reg
4245
- "#sound-dai-cells"
43-
- awinic,audio-channel
4446

4547
unevaluatedProperties: false
4648

49+
allOf:
50+
- $ref: dai-common.yaml#
51+
- if:
52+
properties:
53+
compatible:
54+
contains:
55+
enum:
56+
- awinic,aw87390
57+
then:
58+
required:
59+
- awinic,audio-channel
60+
61+
- if:
62+
properties:
63+
compatible:
64+
contains:
65+
enum:
66+
- anbernic,rgds-amp
67+
then:
68+
properties:
69+
vdd-supply: true
70+
4771
examples:
4872
- |
4973
i2c {

Documentation/devicetree/bindings/sound/awinic,aw88395.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ properties:
3333
reset-gpios:
3434
maxItems: 1
3535

36+
dvdd-supply: true
37+
3638
awinic,audio-channel:
3739
description:
3840
It is used to distinguish multiple PA devices, so that different
@@ -65,6 +67,17 @@ allOf:
6567
then:
6668
properties:
6769
reset-gpios: false
70+
- if:
71+
properties:
72+
compatible:
73+
contains:
74+
const: awinic,aw88261
75+
then:
76+
required:
77+
- dvdd-supply
78+
else:
79+
properties:
80+
dvdd-supply: false
6881

6982
unevaluatedProperties: false
7083

Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml

Lines changed: 66 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,33 @@ properties:
4040
tdm-slots:
4141
$ref: /schemas/types.yaml#/definitions/uint32
4242
description:
43-
number of channels over one serializer
44-
the property is ignored in DIT mode
43+
Number of channels over one serializer. This property
44+
specifies the TX playback TDM slot count, along with default RX slot count
45+
if tdm-slots-rx is not specified.
46+
The property is ignored in DIT mode.
4547
minimum: 2
4648
maximum: 32
4749

50+
tdm-slots-rx:
51+
$ref: /schemas/types.yaml#/definitions/uint32
52+
description:
53+
Number of RX capture channels over one serializer. If specified,
54+
allows independent RX TDM slot count separate from TX. Requires
55+
ti,async-mode to be enabled for independent TX/RX clock rates.
56+
The property is ignored in DIT mode.
57+
minimum: 2
58+
maximum: 32
59+
60+
ti,async-mode:
61+
description:
62+
Specify to allow independent TX & RX clocking,
63+
to enable audio playback & record with different sampling rate,
64+
and different number of bits per frame.
65+
if property is omitted, TX and RX will share same bit clock and frame clock signals,
66+
thus RX need to use same bits per frame and sampling rate as TX in synchronous mode.
67+
the property is ignored in DIT mode (as DIT is TX-only)
68+
type: boolean
69+
4870
serial-dir:
4971
description:
5072
A list of serializer configuration
@@ -125,7 +147,21 @@ properties:
125147

126148
auxclk-fs-ratio:
127149
$ref: /schemas/types.yaml#/definitions/uint32
128-
description: ratio of AUCLK and FS rate if applicable
150+
description:
151+
Ratio of AUCLK and FS rate if applicable. This property specifies
152+
the TX ratio, along with default RX ratio if auxclk-fs-ratio-rx
153+
is not specified.
154+
When not specified, the inputted system clock frequency via set_sysclk
155+
callback by the machine driver is used for divider calculation.
156+
157+
auxclk-fs-ratio-rx:
158+
$ref: /schemas/types.yaml#/definitions/uint32
159+
description:
160+
Ratio of AUCLK and FS rate for RX. If specified, allows
161+
for a different RX ratio. Requires ti,async-mode to be
162+
enabled when the ratio differs from auxclk-fs-ratio.
163+
When not specified, it defaults to the value of auxclk-fs-ratio.
164+
The property is ignored in DIT mode.
129165

130166
gpio-controller: true
131167

@@ -170,14 +206,38 @@ allOf:
170206
- $ref: dai-common.yaml#
171207
- if:
172208
properties:
173-
opmode:
209+
op-mode:
174210
enum:
175211
- 0
176-
177212
then:
178213
required:
179214
- tdm-slots
180215

216+
- if:
217+
properties:
218+
op-mode:
219+
const: 1
220+
then:
221+
properties:
222+
tdm-slots: false
223+
tdm-slots-rx: false
224+
ti,async-mode: false
225+
auxclk-fs-ratio-rx: false
226+
227+
- if:
228+
required:
229+
- tdm-slots-rx
230+
then:
231+
required:
232+
- ti,async-mode
233+
234+
- if:
235+
required:
236+
- auxclk-fs-ratio-rx
237+
then:
238+
required:
239+
- ti,async-mode
240+
181241
unevaluatedProperties: false
182242

183243
examples:
@@ -190,6 +250,7 @@ examples:
190250
interrupt-names = "tx", "rx";
191251
op-mode = <0>; /* MCASP_IIS_MODE */
192252
tdm-slots = <2>;
253+
ti,async-mode;
193254
dmas = <&main_udmap 0xc400>, <&main_udmap 0x4400>;
194255
dma-names = "tx", "rx";
195256
serial-dir = <

Documentation/devicetree/bindings/sound/everest,es8389.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,20 @@ properties:
3030
"#sound-dai-cells":
3131
const: 0
3232

33+
vdda-supply:
34+
description:
35+
Analogue power supply.
36+
37+
vddd-supply:
38+
description:
39+
Interface power supply.
40+
3341
required:
3442
- compatible
3543
- reg
3644
- "#sound-dai-cells"
45+
- vddd-supply
46+
- vdda-supply
3747

3848
additionalProperties: false
3949

@@ -46,5 +56,7 @@ examples:
4656
compatible = "everest,es8389";
4757
reg = <0x10>;
4858
#sound-dai-cells = <0>;
59+
vddd-supply = <&vdd3v3>;
60+
vdda-supply = <&vdd3v3>;
4961
};
5062
};

Documentation/devicetree/bindings/sound/fsl,audmix.yaml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ description: |
3434
3535
properties:
3636
compatible:
37-
const: fsl,imx8qm-audmix
37+
enum:
38+
- fsl,imx8qm-audmix
39+
- fsl,imx952-audmix
3840

3941
reg:
4042
maxItems: 1
@@ -80,7 +82,17 @@ required:
8082
- reg
8183
- clocks
8284
- clock-names
83-
- power-domains
85+
86+
allOf:
87+
- if:
88+
properties:
89+
compatible:
90+
contains:
91+
enum:
92+
- fsl,imx8qm-audmix
93+
then:
94+
required:
95+
- power-domains
8496

8597
unevaluatedProperties: false
8698

Documentation/devicetree/bindings/sound/fsl,imx-asrc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ properties:
2525
- fsl,imx53-asrc
2626
- fsl,imx8qm-asrc
2727
- fsl,imx8qxp-asrc
28+
- fsl,imx952-asrc
2829
- items:
2930
- enum:
3031
- fsl,imx6sx-asrc

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

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,16 @@ required:
6363

6464
allOf:
6565
- $ref: dai-common.yaml#
66+
- if:
67+
properties:
68+
compatible:
69+
contains:
70+
enum:
71+
- fsl,imx6sx-mqs
72+
- fsl,imx93-mqs
73+
then:
74+
required:
75+
- gpr
6676
- if:
6777
properties:
6878
compatible:
@@ -91,8 +101,6 @@ allOf:
91101
clock-names:
92102
items:
93103
- const: mclk
94-
required:
95-
- gpr
96104

97105
unevaluatedProperties: false
98106

Documentation/devicetree/bindings/sound/fsl,rpmsg.yaml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,20 @@ allOf:
2222

2323
properties:
2424
compatible:
25-
enum:
26-
- fsl,imx7ulp-rpmsg-audio
27-
- fsl,imx8mn-rpmsg-audio
28-
- fsl,imx8mm-rpmsg-audio
29-
- fsl,imx8mp-rpmsg-audio
30-
- fsl,imx8ulp-rpmsg-audio
31-
- fsl,imx93-rpmsg-audio
32-
- fsl,imx95-rpmsg-audio
25+
oneOf:
26+
- enum:
27+
- fsl,imx7ulp-rpmsg-audio
28+
- fsl,imx8mn-rpmsg-audio
29+
- fsl,imx8mm-rpmsg-audio
30+
- fsl,imx8mp-rpmsg-audio
31+
- fsl,imx8ulp-rpmsg-audio
32+
- fsl,imx93-rpmsg-audio
33+
- fsl,imx95-rpmsg-audio
34+
- items:
35+
- enum:
36+
- fsl,imx94-rpmsg-audio
37+
- fsl,imx952-rpmsg-audio
38+
- const: fsl,imx95-rpmsg-audio
3339

3440
clocks:
3541
items:

Documentation/devicetree/bindings/sound/fsl,sai.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,13 @@ properties:
133133
- description: dataline mask for 'rx'
134134
- description: dataline mask for 'tx'
135135

136+
fsl,sai-amix-mode:
137+
$ref: /schemas/types.yaml#/definitions/string
138+
description:
139+
The audmix module is bypassed from hardware or not.
140+
enum: [none, bypass, audmix]
141+
default: none
142+
136143
fsl,sai-mclk-direction-output:
137144
description: SAI will output the SAI MCLK clock.
138145
type: boolean
@@ -180,6 +187,15 @@ allOf:
180187
properties:
181188
fsl,sai-synchronous-rx: false
182189

190+
- if:
191+
required:
192+
- fsl,sai-amix-mode
193+
then:
194+
properties:
195+
compatible:
196+
contains:
197+
const: fsl,imx952-sai
198+
183199
required:
184200
- compatible
185201
- reg

0 commit comments

Comments
 (0)