Skip to content

Commit 9747b22

Browse files
committed
Merge tag 'asoc-v6.19' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v6.19 This is a very large set of updates, as well as some more extensive cleanup work from Morimto-san we've also added a generic SCDA class driver for SoundWire devices enabling us to support many chips with no custom code. There's also a batch of new drivers added for both SoCs and CODECs. - Added a SoundWire SCDA generic class driver, pulling in a little regmap work to support it. - A *lot* of cleaup and API improvement work from Morimoto-san. - Lots of work on the existing Cirrus, Intel, Maxim and Qualcomm drivers. - Support for Allwinner A523, Mediatek MT8189, Qualcomm QCM2290, QRB2210 and SM6115, SpacemiT K1, and TI TAS2568, TAS5802, TAS5806, TAS5815, TAS5828 and TAS5830. This also pulls in some gpiolib changes supporting shared GPIOs in the core there so we can convert some of the ASoC drivers open coding handling of that to the core functionality.
2 parents ef5e0a0 + c5fae31 commit 9747b22

802 files changed

Lines changed: 34175 additions & 6630 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: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -438,6 +438,7 @@ Krishna Manikandan <quic_mkrishn@quicinc.com> <mkrishn@codeaurora.org>
438438
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com>
439439
Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com>
440440
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@canonical.com>
441+
Krzysztof Kozlowski <krzk@kernel.org> <krzysztof.kozlowski@linaro.org>
441442
Krzysztof Wilczyński <kwilczynski@kernel.org> <krzysztof.wilczynski@linux.com>
442443
Krzysztof Wilczyński <kwilczynski@kernel.org> <kw@linux.com>
443444
Kshitiz Godara <quic_kgodara@quicinc.com> <kgodara@codeaurora.org>

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/adi,max98363.yaml

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

Documentation/devicetree/bindings/sound/adi,ssm2602.txt

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

Documentation/devicetree/bindings/sound/adi,ssm3515.yaml

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

Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-i2s.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,9 @@ properties:
3333
- const: allwinner,sun50i-h6-i2s
3434
- const: allwinner,sun50i-r329-i2s
3535
- items:
36-
- const: allwinner,sun20i-d1-i2s
36+
- enum:
37+
- allwinner,sun20i-d1-i2s
38+
- allwinner,sun55i-a523-i2s
3739
- const: allwinner,sun50i-r329-i2s
3840

3941
reg:

Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-spdif.yaml

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ properties:
2323
- const: allwinner,sun8i-h3-spdif
2424
- const: allwinner,sun50i-h6-spdif
2525
- const: allwinner,sun50i-h616-spdif
26+
- const: allwinner,sun55i-a523-spdif
2627
- items:
2728
- const: allwinner,sun8i-a83t-spdif
2829
- const: allwinner,sun8i-h3-spdif
@@ -37,14 +38,12 @@ properties:
3738
maxItems: 1
3839

3940
clocks:
40-
items:
41-
- description: Bus Clock
42-
- description: Module Clock
41+
minItems: 2
42+
maxItems: 3
4343

4444
clock-names:
45-
items:
46-
- const: apb
47-
- const: spdif
45+
minItems: 2
46+
maxItems: 3
4847

4948
# Even though it only applies to subschemas under the conditionals,
5049
# not listing them here will trigger a warning because of the
@@ -65,6 +64,7 @@ allOf:
6564
- allwinner,sun8i-h3-spdif
6665
- allwinner,sun50i-h6-spdif
6766
- allwinner,sun50i-h616-spdif
67+
- allwinner,sun55i-a523-spdif
6868

6969
then:
7070
required:
@@ -98,6 +98,38 @@ allOf:
9898
- const: rx
9999
- const: tx
100100

101+
- if:
102+
properties:
103+
compatible:
104+
contains:
105+
enum:
106+
- allwinner,sun55i-a523-spdif
107+
108+
then:
109+
properties:
110+
clocks:
111+
items:
112+
- description: Bus Clock
113+
- description: TX Clock
114+
- description: RX Clock
115+
116+
clock-names:
117+
items:
118+
- const: apb
119+
- const: tx
120+
- const: rx
121+
else:
122+
properties:
123+
clocks:
124+
items:
125+
- description: Bus Clock
126+
- description: Module Clock
127+
128+
clock-names:
129+
items:
130+
- const: apb
131+
- const: spdif
132+
101133
required:
102134
- "#sound-dai-cells"
103135
- compatible

Documentation/devicetree/bindings/sound/cirrus,cs4271.yaml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,16 @@ properties:
2525
reg:
2626
maxItems: 1
2727

28+
clocks:
29+
items:
30+
- description:
31+
Master clock connected to the MCLK pin if MCLK is an input (i.e. no
32+
crystal used).
33+
34+
clock-names:
35+
items:
36+
- const: mclk
37+
2838
spi-cpha: true
2939

3040
spi-cpol: true

Documentation/devicetree/bindings/sound/cirrus,cs530x.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,25 @@ description:
1515

1616
allOf:
1717
- $ref: dai-common.yaml#
18+
- $ref: /schemas/spi/spi-peripheral-props.yaml#
1819

1920
properties:
2021
compatible:
2122
enum:
23+
- cirrus,cs4282
24+
- cirrus,cs4302
25+
- cirrus,cs4304
26+
- cirrus,cs4308
2227
- cirrus,cs5302
2328
- cirrus,cs5304
2429
- cirrus,cs5308
2530

2631
reg:
2732
maxItems: 1
2833

34+
spi-max-frequency:
35+
maximum: 24000000
36+
2937
'#sound-dai-cells':
3038
const: 1
3139

0 commit comments

Comments
 (0)