Skip to content

Commit 4fb0dac

Browse files
committed
Merge tag 'sound-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "We've received a fairly wide range of changes at this time, including for ALSA and ASoC core, but all of them are rather small changes. Here are some highlights: ALSA / ASoC Core: - Fixes of inconsistent locking around control API helpers - A few new control API functions and cleanups - Workarounds for potential UAFs by delayed kobj releases - Unified PCM copy ops with iov_iter - Continued efforts for ASoC API cleanups ASoC: - An adaptor to allow use of IIO DACs and ADCs in ASoC which pulls in some IIO changes - Create a library function for intlog10() and use it in the NAU8825 driver - Convert drivers to use the more modern maple tree register cache - Lots of work on the SOF framework, AMD and Intel drivers, including a lot of cleanup and new device support - Standardization of the presentation of jacks from drivers - Provision of some generic sound card DT properties - Support for AMD Van Gogh, AMD machines with MAX98388 and NAU8821, AWInic AW88261, Cirrus Logic CS35L36 and CS42L43, various Intel platforms including AVS machines with ES8336 and RT5663, Mediatek MT7986, NXP i.MX93, RealTek RT1017 and StarFive JH7110 Others: - New test coverage including ASoC and topology tests in KUnit; this also involves enabling UML builds of ALSA since that's the default KUnit test environment which pulls in the addition of some stubs to the driver - More enhancement of pcmtest driver - A few fixes / enhancements of MIDI 2.0 UMP core - Using PCI definitions in allover HD-audio code - Support for Cirrus CS35L56 and TI TAS2781 HD-audio sub-codecs - CS35L41 HD-audio sub-codec improvements - Continued emu10k1 improvements" * tag 'sound-6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (693 commits) ALSA: pcm: Fix missing fixup call in compat hw_refine ioctl ASoC: dwc: i2s: Fix unused functions ALSA: usb-audio: Don't try to submit URBs after disconnection ALSA: emu10k1: add separate documentation for E-MU cards ALSA: emu10k1: more documentation updates ALSA: emu10k1: de-duplicate audigy-mixer.rst vs. sb-live-mixer.rst ALSA: ump: Fix -Wformat-truncation warnings ALSA: hda: Add missing dependency on CONFIG_EFI for Cirrus/TI sub-codecs ALSA: doc: Fix missing backquote in midi-2.0.rst ALSA: hda/realtek: Add quirk for mute LEDs on HP ENVY x360 15-eu0xxx ALSA: hda/tas2781: Switch back to use struct i2c_driver's .probe() ASoC: soc-core.c: Do not error if a DAI link component is not found ASoC: codecs: Fix error code in aw88261_i2c_probe() ASoC: audio-graph-card.c: move audio_graph_parse_of() ASoC: cs42l43: Use new-style PM runtime macros ALSA: documentation: Add description for USB MIDI 2.0 gadget driver ALSA: ump: Don't create unused substreams for static blocks ALSA: ump: Fill group names for legacy rawmidi substreams ALSA: usb-audio: Attach legacy rawmidi after probing all UMP EPs ALSA: ac97: Fix possible error value of *rac97 ...
2 parents 461f35f + 358040e commit 4fb0dac

File tree

663 files changed

+23653
-7607
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

663 files changed

+23653
-7607
lines changed

Documentation/core-api/kernel-api.rst

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,10 @@ Base 2 log and power Functions
162162
.. kernel-doc:: include/linux/log2.h
163163
:internal:
164164

165-
Integer power Functions
166-
-----------------------
165+
Integer log and power Functions
166+
-------------------------------
167+
168+
.. kernel-doc:: include/linux/int_log.h
167169

168170
.. kernel-doc:: lib/math/int_pow.c
169171
:export:

Documentation/devicetree/bindings/sound/amlogic,axg-sound-card.yaml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ title: Amlogic AXG sound card
99
maintainers:
1010
- Jerome Brunet <jbrunet@baylibre.com>
1111

12+
allOf:
13+
- $ref: sound-card-common.yaml#
14+
1215
properties:
1316
compatible:
1417
const: amlogic,axg-sound-card
@@ -17,23 +20,12 @@ properties:
1720
$ref: /schemas/types.yaml#/definitions/phandle-array
1821
description: list of auxiliary devices
1922

20-
audio-routing:
21-
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
22-
description:
23-
A list of the connections between audio components. Each entry is a
24-
pair of strings, the first being the connection's sink, the second
25-
being the connection's source.
26-
2723
audio-widgets:
2824
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
2925
description:
3026
A list off component DAPM widget. Each entry is a pair of strings,
3127
the first being the widget type, the second being the widget name
3228

33-
model:
34-
$ref: /schemas/types.yaml#/definitions/string
35-
description: User specified audio sound card name
36-
3729
patternProperties:
3830
"^dai-link-[0-9]+$":
3931
type: object
@@ -108,7 +100,6 @@ patternProperties:
108100
- sound-dai
109101

110102
required:
111-
- model
112103
- dai-link-0
113104

114105
unevaluatedProperties: false

Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ title: Amlogic GX sound card
99
maintainers:
1010
- Jerome Brunet <jbrunet@baylibre.com>
1111

12+
allOf:
13+
- $ref: sound-card-common.yaml#
14+
1215
properties:
1316
compatible:
1417
items:
@@ -18,25 +21,13 @@ properties:
1821
$ref: /schemas/types.yaml#/definitions/phandle-array
1922
description: list of auxiliary devices
2023

21-
audio-routing:
22-
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
23-
minItems: 2
24-
description: |-
25-
A list of the connections between audio components. Each entry is a
26-
pair of strings, the first being the connection's sink, the second
27-
being the connection's source.
28-
2924
audio-widgets:
3025
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
3126
minItems: 2
3227
description: |-
3328
A list off component DAPM widget. Each entry is a pair of strings,
3429
the first being the widget type, the second being the widget name
3530
36-
model:
37-
$ref: /schemas/types.yaml#/definitions/string
38-
description: User specified audio sound card name
39-
4031
patternProperties:
4132
"^dai-link-[0-9]+$":
4233
type: object
@@ -86,7 +77,7 @@ required:
8677
- model
8778
- dai-link-0
8879

89-
additionalProperties: false
80+
unevaluatedProperties: false
9081

9182
examples:
9283
- |
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/audio-iio-aux.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Audio IIO auxiliary
8+
9+
maintainers:
10+
- Herve Codina <herve.codina@bootlin.com>
11+
12+
description:
13+
Auxiliary device based on Industrial I/O device channels
14+
15+
allOf:
16+
- $ref: dai-common.yaml#
17+
18+
properties:
19+
compatible:
20+
const: audio-iio-aux
21+
22+
io-channels:
23+
description:
24+
Industrial I/O device channels used
25+
26+
io-channel-names:
27+
description:
28+
Industrial I/O channel names related to io-channels.
29+
These names are used to provides sound controls, widgets and routes names.
30+
31+
snd-control-invert-range:
32+
$ref: /schemas/types.yaml#/definitions/uint32-array
33+
description: |
34+
A list of 0/1 flags defining whether or not the related channel is
35+
inverted
36+
items:
37+
enum: [0, 1]
38+
default: 0
39+
description: |
40+
Invert the sound control value compared to the IIO channel raw value.
41+
- 1: The related sound control value is inverted meaning that the
42+
minimum sound control value correspond to the maximum IIO channel
43+
raw value and the maximum sound control value correspond to the
44+
minimum IIO channel raw value.
45+
- 0: The related sound control value is not inverted meaning that the
46+
minimum (resp maximum) sound control value correspond to the
47+
minimum (resp maximum) IIO channel raw value.
48+
49+
required:
50+
- compatible
51+
- io-channels
52+
- io-channel-names
53+
54+
unevaluatedProperties: false
55+
56+
examples:
57+
- |
58+
iio-aux {
59+
compatible = "audio-iio-aux";
60+
io-channels = <&iio 0>, <&iio 1>, <&iio 2>, <&iio 3>;
61+
io-channel-names = "CH0", "CH1", "CH2", "CH3";
62+
/* Invert CH1 and CH2 */
63+
snd-control-invert-range = <0 1 1 0>;
64+
};

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ allOf:
1919

2020
properties:
2121
compatible:
22-
const: awinic,aw88395
22+
enum:
23+
- awinic,aw88395
24+
- awinic,aw88261
2325

2426
reg:
2527
maxItems: 1

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ description: |
1717
such as SAI, MICFIL, .etc through building rpmsg channels between
1818
Cortex-A and Cortex-M.
1919
20+
allOf:
21+
- $ref: sound-card-common.yaml#
22+
2023
properties:
2124
compatible:
2225
enum:
@@ -25,10 +28,7 @@ properties:
2528
- fsl,imx8mm-rpmsg-audio
2629
- fsl,imx8mp-rpmsg-audio
2730
- fsl,imx8ulp-rpmsg-audio
28-
29-
model:
30-
$ref: /schemas/types.yaml#/definitions/string
31-
description: User specified audio sound card name
31+
- fsl,imx93-rpmsg-audio
3232

3333
clocks:
3434
items:
@@ -65,13 +65,6 @@ properties:
6565
$ref: /schemas/types.yaml#/definitions/phandle
6666
description: The phandle to a node of audio codec
6767

68-
audio-routing:
69-
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
70-
description: |
71-
A list of the connections between audio components. Each entry is a
72-
pair of strings, the first being the connection's sink, the second
73-
being the connection's source.
74-
7568
fsl,enable-lpa:
7669
$ref: /schemas/types.yaml#/definitions/flag
7770
description: enable low power audio path.
@@ -100,9 +93,8 @@ properties:
10093

10194
required:
10295
- compatible
103-
- model
10496

105-
additionalProperties: false
97+
unevaluatedProperties: false
10698

10799
examples:
108100
- |

Documentation/devicetree/bindings/sound/google,sc7180-trogdor.yaml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,15 @@ maintainers:
1313
description:
1414
This binding describes the SC7180 sound card which uses LPASS for audio.
1515

16+
allOf:
17+
- $ref: sound-card-common.yaml#
18+
1619
properties:
1720
compatible:
1821
enum:
1922
- google,sc7180-trogdor
2023
- google,sc7180-coachz
2124

22-
audio-routing:
23-
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
24-
description:
25-
A list of the connections between audio components. Each entry is a
26-
pair of strings, the first being the connection's sink, the second
27-
being the connection's source.
28-
29-
model:
30-
$ref: /schemas/types.yaml#/definitions/string
31-
description: User specified audio sound card name
32-
3325
"#address-cells":
3426
const: 1
3527

@@ -86,11 +78,10 @@ patternProperties:
8678

8779
required:
8880
- compatible
89-
- model
9081
- "#address-cells"
9182
- "#size-cells"
9283

93-
additionalProperties: false
84+
unevaluatedProperties: false
9485

9586
examples:
9687

Documentation/devicetree/bindings/sound/google,sc7280-herobrine.yaml

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,14 @@ maintainers:
1313
description:
1414
This binding describes the SC7280 sound card which uses LPASS for audio.
1515

16+
allOf:
17+
- $ref: sound-card-common.yaml#
18+
1619
properties:
1720
compatible:
1821
enum:
1922
- google,sc7280-herobrine
2023

21-
audio-routing:
22-
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
23-
description:
24-
A list of the connections between audio components. Each entry is a
25-
pair of strings, the first being the connection's sink, the second
26-
being the connection's source.
27-
28-
model:
29-
$ref: /schemas/types.yaml#/definitions/string
30-
description: User specified audio sound card name
31-
3224
"#address-cells":
3325
const: 1
3426

@@ -97,11 +89,10 @@ patternProperties:
9789

9890
required:
9991
- compatible
100-
- model
10192
- "#address-cells"
10293
- "#size-cells"
10394

104-
additionalProperties: false
95+
unevaluatedProperties: false
10596

10697
examples:
10798

Documentation/devicetree/bindings/sound/gtm601.txt

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

Documentation/devicetree/bindings/sound/imx-audio-card.yaml

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,14 @@ title: NXP i.MX audio sound card.
99
maintainers:
1010
- Shengjiu Wang <shengjiu.wang@nxp.com>
1111

12+
allOf:
13+
- $ref: sound-card-common.yaml#
14+
1215
properties:
1316
compatible:
1417
enum:
1518
- fsl,imx-audio-card
1619

17-
model:
18-
$ref: /schemas/types.yaml#/definitions/string
19-
description: User specified audio sound card name
20-
21-
audio-routing:
22-
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
23-
description:
24-
A list of the connections between audio components. Each entry is a
25-
pair of strings, the first being the connection's sink, the second
26-
being the connection's source. Valid names could be power supplies,
27-
MicBias of codec and the jacks on the board.
28-
2920
patternProperties:
3021
".*-dai-link$":
3122
description:
@@ -84,9 +75,8 @@ patternProperties:
8475

8576
required:
8677
- compatible
87-
- model
8878

89-
additionalProperties: false
79+
unevaluatedProperties: false
9080

9181
examples:
9282
- |

0 commit comments

Comments
 (0)