Skip to content

Commit 2aa680d

Browse files
committed
Merge tag 'sound-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "The majority of changes at this time were about ASoC with a lot of code refactoring works. From the functionality POV, there isn't much to see, but we have a wide range of device-specific fixes and updates. Here are some highlights: - Continued ASoC API cleanup work, spanned over many files - Added a SoundWire SCDA generic class driver with regmap support - Enhancements and fixes for Cirrus, Intel, Maxim and Qualcomm. - Support for ASoC Allwinner A523, Mediatek MT8189, Qualcomm QCM2290, QRB2210 and SM6115, SpacemiT K1, and TI TAS2568, TAS5802, TAS5806, TAS5815, TAS5828 and TAS5830 - Usual HD-audio and USB-audio quirks and fixups - Support for Onkyo SE-300PCIE, TASCAM IF-FW/DM MkII Some gpiolib changes for shared GPIOs are included along with this PR for covering ASoC drivers changes" * tag 'sound-6.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (739 commits) ALSA: hda/realtek: Add PCI SSIDs to HP ProBook quirks ALSA: usb-audio: Simplify with usb_endpoint_max_periodic_payload() ALSA: hda/realtek: fix mute/micmute LEDs don't work for more HP laptops ALSA: rawmidi: Fix inconsistent indenting warning reported by smatch ALSA: dice: fix buffer overflow in detect_stream_formats() ASoC: codecs: Modify awinic amplifier dsp read and write functions ASoC: SDCA: Fixup some more Kconfig issues ASoC: cs35l56: Log a message if firmware is missing ASoC: nau8325: Delete a stray tab firmware: cs_dsp: Add test cases for client_ops == NULL firmware: cs_dsp: Don't require client to provide a struct cs_dsp_client_ops ASoC: fsl_micfil: Set channel range control ASoC: fsl_micfil: Add default quality for different platforms ASoC: intel: sof_sdw: Add codec_info for cs42l45 ASoC: sdw_utils: Add cs42l45 support functions ASoC: intel: sof_sdw: Add ability to have auxiliary devices ASoC: sdw_utils: Move codec_name to dai info ASoC: sdw_utils: Add codec_conf for every DAI ASoC: SDCA: Add terminal type into input/output widget name ASoC: SDCA: Align mute controls to ALSA expectations ...
2 parents 6dfafbd + eaf526c commit 2aa680d

615 files changed

Lines changed: 33147 additions & 5677 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/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

Documentation/devicetree/bindings/sound/cs4265.txt

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

Documentation/devicetree/bindings/sound/cs4341.txt

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

Documentation/devicetree/bindings/sound/cs4349.txt

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

0 commit comments

Comments
 (0)