Skip to content

Commit f8824e1

Browse files
committed
Merge tag 'sound-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "Lots of changes as usual, but the only significant stuff in ALSA core part is the MIDI 2.0 support, while ASoC core kept receiving the code refactoring. The majority of changes are seen rather in device drivers, and quite a few new drivers can be found there. Here we go, some highlights: ALSA and ASoC Core: - Support of MIDI 2.0 devices: rawmidi and sequencer API have been extended for the support of the new UMP (Universal MIDI Packet) protocol, USB audio driver got the USB MIDI 2.0 interface support - Continued refactoring around ASoC DAI links and the ordering of trigger callbacks - PCM ABI extension for better drain support ASoC Drivers: - Conversions of many drivers to use maple tree based caches - Everlasting improvement works on ASoC Intel drivers - Compressed audio support for Qualcomm - Support for AMD SoundWire, Analog Devices SSM3515, Google Chameleon, Ingenic X1000, Intel systems with various CODECs, Loongson platforms, Maxim MAX98388, Mediatek MT8188, Nuvoton NAU8825C, NXP platforms with NAU8822, Qualcomm WSA884x, StarFive JH7110, Texas Instruments TAS2781 HD-audio: - Quirks for HP and ASUS machines - CS35L41 HD-audio codec fixes - Loongson HD-audio support Misc: - A new virtual PCM test driver for kselftests - Continued refactoring and improvements on the legacy emu10k1 driver" * tag 'sound-6.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (556 commits) ALSA: hda/realtek: Enable mute/micmute LEDs and limit mic boost on EliteBook ASoC: hdmi-codec: fix channel info for compressed formats ALSA: pcm: fix ELD constraints for (E)AC3, DTS(-HD) and MLP formats ASoC: core: Always store of_node when getting DAI link component ASoC: tas2781: Fix error code in tas2781_load_calibration() ASoC: amd: update pm_runtime enable sequence ALSA: ump: Export MIDI1 / UMP conversion helpers ASoC: tas2781: fix Kconfig dependencies ASoC: amd: acp: remove acp poweroff function ASoC: amd: acp: clear pdm dma interrupt mask ASoC: codecs: max98090: Allow dsp_a mode ASoC: qcom: common: add default jack dapm pins ASoC: loongson: fix address space confusion ASoC: dt-bindings: microchip,sama7g5-pdmc: Simplify "microchip,mic-pos" constraints ASoC: tegra: Remove stale comments in AHUB ASoC: tegra: Use normal system sleep for ASRC ALSA: hda/realtek: Add quirks for ROG ALLY CS35l41 audio ASoC: fsl-asoc-card: Allow passing the number of slots in use ASoC: codecs: wsa884x: Add WSA884x family of speakers ASoC: dt-bindings: qcom,wsa8840: Add WSA884x family of speakers ...
2 parents 86e203e + d6048fd commit f8824e1

607 files changed

Lines changed: 33532 additions & 7069 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.
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/adi,max98388.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Analog Devices MAX98388 Speaker Amplifier
8+
9+
maintainers:
10+
- Ryan Lee <ryans.lee@analog.com>
11+
12+
description:
13+
The MAX98388 is a mono Class-D speaker amplifier with I/V feedback.
14+
The device provides a PCM interface for audio data and a standard
15+
I2C interface for control data communication.
16+
17+
allOf:
18+
- $ref: dai-common.yaml#
19+
20+
properties:
21+
compatible:
22+
enum:
23+
- adi,max98388
24+
25+
reg:
26+
maxItems: 1
27+
28+
'#sound-dai-cells':
29+
const: 0
30+
31+
adi,vmon-slot-no:
32+
description: slot number of the voltage feedback monitor
33+
$ref: /schemas/types.yaml#/definitions/uint32
34+
minimum: 0
35+
maximum: 15
36+
default: 0
37+
38+
adi,imon-slot-no:
39+
description: slot number of the current feedback monitor
40+
$ref: /schemas/types.yaml#/definitions/uint32
41+
minimum: 0
42+
maximum: 15
43+
default: 1
44+
45+
adi,interleave-mode:
46+
description:
47+
For cases where a single combined channel for the I/V feedback data
48+
is not sufficient, the device can also be configured to share
49+
a single data output channel on alternating frames.
50+
In this configuration, the current and voltage data will be frame
51+
interleaved on a single output channel.
52+
type: boolean
53+
54+
reset-gpios:
55+
maxItems: 1
56+
57+
required:
58+
- compatible
59+
- reg
60+
- '#sound-dai-cells'
61+
62+
unevaluatedProperties: false
63+
64+
examples:
65+
- |
66+
#include <dt-bindings/gpio/gpio.h>
67+
i2c {
68+
#address-cells = <1>;
69+
#size-cells = <0>;
70+
max98388: amplifier@39 {
71+
compatible = "adi,max98388";
72+
reg = <0x39>;
73+
#sound-dai-cells = <0>;
74+
adi,vmon-slot-no = <0>;
75+
adi,imon-slot-no = <1>;
76+
adi,interleave-mode;
77+
reset-gpios = <&gpio 4 GPIO_ACTIVE_LOW>;
78+
};
79+
};
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/adi,ssm2518.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Analog Devices SSM2518 audio amplifier
8+
9+
maintainers:
10+
- Lars-Peter Clausen <lars@metafoo.de>
11+
12+
allOf:
13+
- $ref: dai-common.yaml#
14+
15+
properties:
16+
compatible:
17+
const: adi,ssm2518
18+
19+
reg:
20+
maxItems: 1
21+
description: |
22+
I2C address of the device. This will either be 0x34 (ADDR pin low)
23+
or 0x35 (ADDR pin high)
24+
25+
gpios:
26+
maxItems: 1
27+
description: |
28+
GPIO connected to the nSD pin. If the property is not present
29+
it is assumed that the nSD pin is hardwired to always on.
30+
31+
required:
32+
- compatible
33+
- reg
34+
35+
unevaluatedProperties: false
36+
37+
examples:
38+
- |
39+
i2c {
40+
#address-cells = <1>;
41+
#size-cells = <0>;
42+
codec@34 {
43+
compatible = "adi,ssm2518";
44+
reg = <0x34>;
45+
gpios = <&gpio 5 0>;
46+
};
47+
};
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/adi,ssm3515.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Analog Devices SSM3515 Audio Amplifier
8+
9+
maintainers:
10+
- Martin Povišer <povik+lin@cutebit.org>
11+
12+
description: |
13+
SSM3515 is a mono Class-D audio amplifier with digital input.
14+
15+
https://www.analog.com/media/en/technical-documentation/data-sheets/SSM3515.pdf
16+
17+
allOf:
18+
- $ref: dai-common.yaml#
19+
20+
properties:
21+
compatible:
22+
enum:
23+
- adi,ssm3515
24+
25+
reg:
26+
maxItems: 1
27+
28+
'#sound-dai-cells':
29+
const: 0
30+
31+
required:
32+
- compatible
33+
- reg
34+
35+
unevaluatedProperties: false
36+
37+
examples:
38+
- |
39+
i2c {
40+
#address-cells = <1>;
41+
#size-cells = <0>;
42+
43+
codec@14 {
44+
compatible = "adi,ssm3515";
45+
reg = <0x14>;
46+
#sound-dai-cells = <0>;
47+
sound-name-prefix = "Left Tweeter";
48+
};
49+
};

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,11 @@ properties:
2424
connection's sink, the second being the connection's source.
2525
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
2626
widgets:
27-
description: User specified audio sound widgets.
27+
description: |
28+
User specified audio sound widgets.
29+
Each entry is a pair of strings, the first being the type of
30+
widget ("Microphone", "Line", "Headphone", "Speaker"), the
31+
second being the machine specific name for the widget.
2832
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
2933
convert-rate:
3034
$ref: /schemas/sound/dai-params.yaml#/$defs/dai-sample-rate

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ patternProperties:
6262
GPIO pin direction. Valid only when 'gpio-ctrl' is 1
6363
0 = Output
6464
1 = Input
65-
$ref: "/schemas/types.yaml#/definitions/uint32"
65+
$ref: /schemas/types.yaml#/definitions/uint32
6666
minimum: 0
6767
maximum: 1
6868
default: 1
@@ -71,7 +71,7 @@ patternProperties:
7171
GPIO level. Valid only when 'gpio-ctrl' is 1 and 'gpio-dir' is 0
7272
0 = Low
7373
1 = High
74-
$ref: "/schemas/types.yaml#/definitions/uint32"
74+
$ref: /schemas/types.yaml#/definitions/uint32
7575
minimum: 0
7676
maximum: 1
7777
default: 0
@@ -80,7 +80,7 @@ patternProperties:
8080
GPIO level. Valid only when 'gpio-ctrl' is 1 and 'gpio-dir' is 0
8181
0 = CMOS
8282
1 = Open Drain
83-
$ref: "/schemas/types.yaml#/definitions/uint32"
83+
$ref: /schemas/types.yaml#/definitions/uint32
8484
minimum: 0
8585
maximum: 1
8686
default: 0
@@ -90,7 +90,7 @@ patternProperties:
9090
and 'gpio-dir' is 0
9191
0 = Non-inverted, Active High
9292
1 = Inverted, Active Low
93-
$ref: "/schemas/types.yaml#/definitions/uint32"
93+
$ref: /schemas/types.yaml#/definitions/uint32
9494
minimum: 0
9595
maximum: 1
9696
default: 0
@@ -114,7 +114,7 @@ patternProperties:
114114
0 = High impedance input
115115
1 = Pin acts as a GPIO, direction controlled by 'gpio-dir'
116116
2-7 = Reserved
117-
$ref: "/schemas/types.yaml#/definitions/uint32"
117+
$ref: /schemas/types.yaml#/definitions/uint32
118118
minimum: 0
119119
maximum: 7
120120
default: 0

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

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ properties:
4444
VAHP-supply:
4545
description: phandle to voltage regulator of headphone
4646

47+
port:
48+
$ref: audio-graph-port.yaml#
49+
unevaluatedProperties: false
50+
4751
required:
4852
- compatible
4953
- reg
@@ -69,6 +73,13 @@ examples:
6973
VA-supply = <&reg_audio>;
7074
VAHP-supply = <&reg_audio>;
7175
reset-gpios = <&gpiog 9 GPIO_ACTIVE_LOW>;
76+
77+
/* assume audio-graph */
78+
port {
79+
cpu_endpoint: endpoint {
80+
remote-endpoint = <&cpu_endpoint>;
81+
};
82+
};
7283
};
7384
};
7485
...

Documentation/devicetree/bindings/sound/da7219.txt

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

0 commit comments

Comments
 (0)