Skip to content

Commit edd8e84

Browse files
committed
Merge tag 'sound-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "Most of changes at this time are for ASoC, spread over ASoC core and drivers due to the API prefix standardization. Other than that, there have little change wrt API, rather lots of driver-specific updates and fixes. Some highlight below: ASoC: - Standardization of API prefix - GPIO API usage improvements - Support for HDA patches - Lots of work on SOF, including crash dump support - Fixes for noise when stopping some Sounwire CODECs - Support for AMD platforms with es83xx, AMD ACP 6.3 and 7.0, Awinc AT87390 and AW88399, many Intel platforms, many Mediatek platforms, Qualcomm SM6115 and SC7180 platforms, Richtek RTQ9128 and Texas Instruments TAS575x HD-audio and USB-audio: - Deferred probe support of audio component binding - More fixes and enhancements for Cirrus subcodecs - USB Scarlett2 mixer and McIntosh DSD quirk Others: - More enhancement of snd-aloop driver - Update MAINTAINERS entry for linux-sound mailing list" * tag 'sound-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (485 commits) ALSA: hda: cs35l41: Fix missing error code in cs35l41_smart_amp() ALSA: hda: cs35l41: mark cs35l41_verify_id() static ASoC: codecs: wsa883x: make use of new mute_unmute_on_trigger flag ASoC: soc-dai: add flag to mute and unmute stream during trigger ASoC: ams-delta.c: use component after check ASoC: amd: acp: select SND_SOC_AMD_ACP_LEGACY_COMMON for ACP63 ASoC: codecs: aw88399: fix typo in Kconfig select ASoC: amd: acp: add ACPI dependency ASoC: Intel: avs: Add rt5514 machine board ASoC: Intel: avs: Add rt5514 machine board ALSA: scarlett2: Add missing check with firmware version control ALSA: virtio: use ack callback ALSA: scarlett2: Remap Level Meter values ALSA: scarlett2: Allow passing any output to line_out_remap() ALSA: scarlett2: Add support for reading firmware version ALSA: scarlett2: Rename Gen 3 config sets ALSA: scarlett2: Rename scarlett_gen2 to scarlett2 ASoC: cs35l41: Detect CSPL errors when sending CSPL commands ALSA: hda: cs35l41: Check CSPL state after loading firmware ALSA: hda: cs35l41: Do not unload firmware before reset in system suspend ...
2 parents 4ea4ed2 + dc6e08b commit edd8e84

File tree

713 files changed

+16734
-6003
lines changed

Some content is hidden

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

713 files changed

+16734
-6003
lines changed

Documentation/devicetree/bindings/sound/audio-graph-port.yaml

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,19 +13,17 @@ select: false
1313

1414
definitions:
1515
port-base:
16-
$ref: /schemas/graph.yaml#/$defs/port-base
16+
allOf:
17+
- $ref: /schemas/graph.yaml#/$defs/port-base
18+
- $ref: /schemas/sound/dai-params.yaml#
1719
properties:
18-
convert-rate:
19-
$ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-rate
20-
convert-channels:
21-
$ref: /schemas/sound/dai-params.yaml#/$defs/dai-channels
22-
convert-sample-format:
23-
$ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-format
2420
mclk-fs:
2521
$ref: simple-card.yaml#/definitions/mclk-fs
2622

2723
endpoint-base:
28-
$ref: /schemas/graph.yaml#/$defs/endpoint-base
24+
allOf:
25+
- $ref: /schemas/graph.yaml#/$defs/endpoint-base
26+
- $ref: /schemas/sound/dai-params.yaml#
2927
properties:
3028
mclk-fs:
3129
$ref: simple-card.yaml#/definitions/mclk-fs
@@ -68,12 +66,6 @@ definitions:
6866
- pdm
6967
- msb
7068
- lsb
71-
convert-rate:
72-
$ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-rate
73-
convert-channels:
74-
$ref: /schemas/sound/dai-params.yaml#/$defs/dai-channels
75-
convert-sample-format:
76-
$ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-format
7769

7870
dai-tdm-slot-num:
7971
description: Number of slots in use.

Documentation/devicetree/bindings/sound/audio-graph.yaml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ title: Audio Graph
99
maintainers:
1010
- Kuninori Morimoto <[email protected]>
1111

12+
allOf:
13+
- $ref: /schemas/sound/dai-params.yaml#
14+
1215
properties:
1316
dais:
1417
$ref: /schemas/types.yaml#/definitions/phandle-array
@@ -30,12 +33,6 @@ properties:
3033
widget ("Microphone", "Line", "Headphone", "Speaker"), the
3134
second being the machine specific name for the widget.
3235
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
33-
convert-rate:
34-
$ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-rate
35-
convert-channels:
36-
$ref: /schemas/sound/dai-params.yaml#/$defs/dai-channels
37-
convert-sample-format:
38-
$ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-format
3936

4037
pa-gpios:
4138
maxItems: 1
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
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,aw87390.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Awinic Aw87390 Audio Amplifier
8+
9+
maintainers:
10+
- Weidong Wang <[email protected]>
11+
12+
description:
13+
The awinic aw87390 is specifically designed to improve
14+
the musical output dynamic range, enhance the overall
15+
sound quallity, which is a new high efficiency, low
16+
noise, constant large volume, 6th Smart K audio amplifier.
17+
18+
allOf:
19+
- $ref: dai-common.yaml#
20+
21+
properties:
22+
compatible:
23+
const: awinic,aw87390
24+
25+
reg:
26+
maxItems: 1
27+
28+
"#sound-dai-cells":
29+
const: 0
30+
31+
awinic,audio-channel:
32+
description:
33+
It is used to distinguish multiple PA devices, so that different
34+
configurations can be loaded to different PA devices
35+
$ref: /schemas/types.yaml#/definitions/uint32
36+
minimum: 0
37+
maximum: 7
38+
39+
required:
40+
- compatible
41+
- reg
42+
- "#sound-dai-cells"
43+
- awinic,audio-channel
44+
45+
unevaluatedProperties: false
46+
47+
examples:
48+
- |
49+
i2c {
50+
#address-cells = <1>;
51+
#size-cells = <0>;
52+
audio-codec@58 {
53+
compatible = "awinic,aw87390";
54+
reg = <0x58>;
55+
#sound-dai-cells = <0>;
56+
awinic,audio-channel = <0>;
57+
};
58+
};

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

Lines changed: 29 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,12 @@ description:
1414
digital Smart K audio amplifier with an integrated 10.25V
1515
smart boost convert.
1616

17-
allOf:
18-
- $ref: dai-common.yaml#
19-
2017
properties:
2118
compatible:
2219
enum:
2320
- awinic,aw88395
2421
- awinic,aw88261
22+
- awinic,aw88399
2523

2624
reg:
2725
maxItems: 1
@@ -32,11 +30,36 @@ properties:
3230
reset-gpios:
3331
maxItems: 1
3432

33+
awinic,audio-channel:
34+
description:
35+
It is used to distinguish multiple PA devices, so that different
36+
configurations can be loaded to different PA devices
37+
$ref: /schemas/types.yaml#/definitions/uint32
38+
minimum: 0
39+
maximum: 7
40+
41+
awinic,sync-flag:
42+
description:
43+
Flag bit used to keep the phase synchronized in the case of multiple PA
44+
$ref: /schemas/types.yaml#/definitions/flag
45+
3546
required:
3647
- compatible
3748
- reg
3849
- '#sound-dai-cells'
39-
- reset-gpios
50+
- awinic,audio-channel
51+
52+
allOf:
53+
- $ref: dai-common.yaml#
54+
- if:
55+
properties:
56+
compatible:
57+
contains:
58+
enum:
59+
- awinic,aw88261
60+
then:
61+
properties:
62+
reset-gpios: false
4063

4164
unevaluatedProperties: false
4265

@@ -51,5 +74,7 @@ examples:
5174
reg = <0x34>;
5275
#sound-dai-cells = <0>;
5376
reset-gpios = <&gpio 10 GPIO_ACTIVE_LOW>;
77+
awinic,audio-channel = <0>;
78+
awinic,sync-flag;
5479
};
5580
};

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ properties:
8383
Current at which the headset micbias sense clamp will engage, 0 to
8484
disable.
8585
enum: [ 0, 14, 24, 43, 52, 61, 71, 90, 99 ]
86-
default: 0
86+
default: 14
8787

8888
cirrus,bias-ramp-ms:
8989
description:
@@ -97,7 +97,7 @@ properties:
9797
Time in microseconds the type detection will run for. Long values will
9898
cause more audible effects, but give more accurate detection.
9999
enum: [ 20, 100, 1000, 10000, 50000, 75000, 100000, 200000 ]
100-
default: 10000
100+
default: 1000
101101

102102
cirrus,button-automute:
103103
type: boolean

Documentation/devicetree/bindings/sound/dai-params.yaml

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@ maintainers:
1111

1212
select: false
1313

14-
$defs:
15-
16-
dai-channels:
14+
properties:
15+
convert-channels:
1716
description: Number of audio channels used by DAI
1817
$ref: /schemas/types.yaml#/definitions/uint32
1918
minimum: 1
2019
maximum: 32
2120

22-
dai-sample-format:
21+
convert-sample-format:
2322
description: Audio sample format used by DAI
2423
$ref: /schemas/types.yaml#/definitions/string
2524
enum:
@@ -29,12 +28,10 @@ $defs:
2928
- s24_3le
3029
- s32_le
3130

32-
dai-sample-rate:
31+
convert-rate:
3332
description: Audio sample rate used by DAI
3433
$ref: /schemas/types.yaml#/definitions/uint32
3534
minimum: 8000
3635
maximum: 192000
3736

38-
properties: {}
39-
4037
additionalProperties: true

Documentation/devicetree/bindings/sound/dialog,da7219.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@ properties:
8989

9090
da7219_aad:
9191
type: object
92+
additionalProperties: false
9293
description:
9394
Configuration of advanced accessory detection.
9495
properties:

Documentation/devicetree/bindings/sound/fsl,qmc-audio.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ patternProperties:
3333
description:
3434
A DAI managed by this controller
3535
type: object
36+
additionalProperties: false
3637

3738
properties:
3839
reg:

Documentation/devicetree/bindings/sound/mediatek,mt8188-mt6359.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ properties:
1717
enum:
1818
- mediatek,mt8188-mt6359-evb
1919
- mediatek,mt8188-nau8825
20+
- mediatek,mt8188-rt5682s
2021

2122
audio-routing:
2223
description:

Documentation/devicetree/bindings/sound/mt8186-mt6366-rt1019-rt5682s.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ properties:
1717
enum:
1818
- mediatek,mt8186-mt6366-rt1019-rt5682s-sound
1919
- mediatek,mt8186-mt6366-rt5682s-max98360-sound
20+
- mediatek,mt8186-mt6366-rt5650-sound
2021

2122
mediatek,platform:
2223
$ref: /schemas/types.yaml#/definitions/phandle

0 commit comments

Comments
 (0)