Skip to content

Commit a8e7ef3

Browse files
committed
Merge tag 'sound-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "Nothing too thrilling here, but we see lots of driver updates and bug fixes, including quirk additions and refactoring works, while there have been little changes in the core functionality. Here are some highlights: Core: - Add validation for the control API put callback - Fixes in compress-offload API timestamp handling - Continued ASoC core API cleanups ASoC: - Add support for bus keepers (for Apple devices in future) - Enhancements to the SDCA support, including retaskable jacks - Test improvements for Cirrus Logic drivers - Lots of fixes for the NXP, nVidia and Qualcomm - Support for AMD RPL DMIC, Cirrus Logic CS42L43 and CS47L47, nVidia machines with CPCAP and WM8962 USB-audio: - Quirks for Huawei Headset, Focusrite Novation, MV-Silicon, Studio 1824, Arturia AF16Rig, Hotone Audio, Feaulle Rainbow, PreSonus AudioBox, Moondrop Ju Jiu, Scarlett 18i20, etc - Extended mixer volume quirk handling - UAF and other fixes for us144mkii, 6fire and caiaq drivers HD-audio: - Add quirks or fixes for Acer, Lenovo, HP, ASUS machines - Fixes & cleanups of GPIO helper code Misc: - Add suspend/resume support for multiple legacy ISA and Apple drivers - Further regression fixes for ctxfi driver" * tag 'sound-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (359 commits) ALSA: control: Validate buf_len before strnlen() in snd_ctl_elem_init_enum_names() ALSA: usb-audio: Fix missing error handling for get_min_max*() ALSA: hda/realtek - fixed speaker no sound update ALSA: hda/realtek: Add quirk for Acer PT316-51S headset mic ALSA: usb-audio: Exclude Scarlett 18i20 1st Gen from SKIP_IFACE_SETUP ALSA: hda/realtek: Add quirk for Legion S7 15IMH ALSA: hda/realtek: Add quirk for HP Spectre x360 14-ea ALSA: caiaq: take a reference on the USB device in create_card() ASoC: dt-bindings: rockchip: convert rk3399-gru-sound to DT Schema ALSA: sscape: Add suspend and resume support ALSA: sscape: Cache per-card resources for board reinitialization ALSA: usb-audio: Do not expose sticky mixers ALSA: usb-audio: Move volume control resolution check into a function ALSA: usb-audio: Add error checks against get_min_max*() ALSA: usb-audio: Add quirk for PreSonus AudioBox USB ALSA: interwave: guard PM-only restore helpers with CONFIG_PM ALSA: usb-audio: Evaluate packsize caps at the right place ALSA: sc6000: Restore board setup across suspend ALSA: sc6000: Keep the programmed board state in card-private data ALSA: 6fire: fix use-after-free on disconnect ...
2 parents 4a57e09 + e0da8a8 commit a8e7ef3

376 files changed

Lines changed: 9033 additions & 3316 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,ssm2305.txt

Lines changed: 0 additions & 14 deletions
This file was deleted.
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
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,ssm2305.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Analog Devices SSM2305 Class-D Speaker Amplifier
8+
9+
maintainers:
10+
- Lars-Peter Clausen <[email protected]>
11+
12+
description:
13+
The SSM2305 is a filterless, high efficiency, mono 2.8 W Class-D
14+
audio amplifier with a micropower shutdown mode controlled via a
15+
dedicated active-low GPIO pin.
16+
17+
allOf:
18+
- $ref: dai-common.yaml#
19+
20+
properties:
21+
compatible:
22+
const: adi,ssm2305
23+
24+
shutdown-gpios:
25+
maxItems: 1
26+
description:
27+
GPIO connected to the shutdown pin (SD) of the SSM2305.
28+
The pin is active-low; asserting it puts the device into
29+
micropower shutdown mode.
30+
31+
required:
32+
- compatible
33+
- shutdown-gpios
34+
35+
unevaluatedProperties: false
36+
37+
examples:
38+
- |
39+
#include <dt-bindings/gpio/gpio.h>
40+
41+
analog-amplifier {
42+
compatible = "adi,ssm2305";
43+
shutdown-gpios = <&gpio3 20 GPIO_ACTIVE_LOW>;
44+
};
45+
46+
...

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ properties:
3535

3636
dvdd-supply: true
3737

38+
firmware-name:
39+
maxItems: 1
40+
description: Name of the *_acf.bin file used for amplifier initialization
41+
3842
awinic,audio-channel:
3943
description:
4044
It is used to distinguish multiple PA devices, so that different

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ description: |
1616
DAC for headphone output, two integrated Class D amplifiers for
1717
loudspeakers, and two ADCs for wired headset microphone input or
1818
stereo line input. PDM inputs are provided for digital microphones.
19+
CS42L43B variant adds dedicated PDM interface, SoundWire Clock Gearing
20+
support and more decimators to ISRCs.
1921
2022
allOf:
2123
- $ref: dai-common.yaml#
@@ -24,6 +26,7 @@ properties:
2426
compatible:
2527
enum:
2628
- cirrus,cs42l43
29+
- cirrus,cs42l43b
2730

2831
reg:
2932
maxItems: 1

Documentation/devicetree/bindings/sound/hisilicon,hi6210-i2s.txt

Lines changed: 0 additions & 42 deletions
This file was deleted.
Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/hisilicon,hi6210-i2s.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: HiSilicon hi6210 I2S controller
8+
9+
maintainers:
10+
- John Stultz <[email protected]>
11+
12+
allOf:
13+
- $ref: dai-common.yaml#
14+
15+
properties:
16+
compatible:
17+
const: hisilicon,hi6210-i2s
18+
19+
reg:
20+
maxItems: 1
21+
22+
interrupts:
23+
maxItems: 1
24+
25+
clocks:
26+
maxItems: 2
27+
28+
clock-names:
29+
items:
30+
- const: dacodec
31+
- const: i2s-base
32+
33+
dmas:
34+
maxItems: 2
35+
36+
dma-names:
37+
items:
38+
- const: tx
39+
- const: rx
40+
41+
hisilicon,sysctrl-syscon:
42+
$ref: /schemas/types.yaml#/definitions/phandle
43+
description: phandle to sysctrl syscon
44+
45+
"#sound-dai-cells":
46+
const: 1
47+
description: |
48+
The dai cell indexes reference the following interfaces:
49+
0: S2 interface
50+
51+
required:
52+
- compatible
53+
- reg
54+
- interrupts
55+
- clocks
56+
- clock-names
57+
- dmas
58+
- dma-names
59+
- hisilicon,sysctrl-syscon
60+
- "#sound-dai-cells"
61+
62+
unevaluatedProperties: false
63+
64+
examples:
65+
- |
66+
#include <dt-bindings/interrupt-controller/arm-gic.h>
67+
#include <dt-bindings/clock/hi6220-clock.h>
68+
69+
i2s@f7118000 {
70+
compatible = "hisilicon,hi6210-i2s";
71+
reg = <0xf7118000 0x8000>;
72+
interrupts = <GIC_SPI 123 IRQ_TYPE_LEVEL_HIGH>;
73+
clocks = <&sys_ctrl HI6220_DACODEC_PCLK>,
74+
<&sys_ctrl HI6220_BBPPLL0_DIV>;
75+
clock-names = "dacodec", "i2s-base";
76+
dmas = <&dma0 14>, <&dma0 15>;
77+
dma-names = "tx", "rx";
78+
hisilicon,sysctrl-syscon = <&sys_ctrl>;
79+
#sound-dai-cells = <1>;
80+
};

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ patternProperties:
2424
cpu/codec dais.
2525

2626
type: object
27+
$ref: tdm-slot.yaml#
2728

2829
properties:
2930
link-name:
@@ -38,13 +39,9 @@ patternProperties:
3839
- i2s
3940
- dsp_b
4041

41-
dai-tdm-slot-num:
42-
description: see tdm-slot.txt.
43-
$ref: /schemas/types.yaml#/definitions/uint32
42+
dai-tdm-slot-num: true
4443

45-
dai-tdm-slot-width:
46-
description: see tdm-slot.txt.
47-
$ref: /schemas/types.yaml#/definitions/uint32
44+
dai-tdm-slot-width: true
4845

4946
playback-only:
5047
description: link is used only for playback

Documentation/devicetree/bindings/sound/mediatek,mt2701-wm8960.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ properties:
2828
$ref: /schemas/types.yaml#/definitions/phandle
2929
description: The phandle of the WM8960 audio codec.
3030

31-
unevaluatedProperties: false
32-
3331
required:
3432
- compatible
3533
- mediatek,platform
@@ -38,6 +36,8 @@ required:
3836
- pinctrl-names
3937
- pinctrl-0
4038

39+
additionalProperties: false
40+
4141
examples:
4242
- |
4343
sound {

Documentation/devicetree/bindings/sound/mediatek,mt7986-wm8960.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ properties:
3636
required:
3737
- sound-dai
3838

39-
unevaluatedProperties: false
40-
4139
required:
4240
- compatible
4341
- audio-routing
4442
- platform
4543
- codec
4644

45+
unevaluatedProperties: false
46+
4747
examples:
4848
- |
4949
sound {
Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/mediatek,mt8173-rt5650-rt5514.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Mediatek MT8173 with RT5650 and RT5514 audio codecs
8+
9+
maintainers:
10+
- Koro Chen <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: mediatek,mt8173-rt5650-rt5514
15+
16+
mediatek,audio-codec:
17+
$ref: /schemas/types.yaml#/definitions/phandle-array
18+
description: Phandles of rt5650 and rt5514 codecs
19+
items:
20+
- description: phandle of rt5650 codec
21+
- description: phandle of rt5514 codec
22+
23+
mediatek,platform:
24+
$ref: /schemas/types.yaml#/definitions/phandle
25+
description: The phandle of MT8173 ASoC platform.
26+
27+
required:
28+
- compatible
29+
- mediatek,audio-codec
30+
- mediatek,platform
31+
32+
additionalProperties: false
33+
34+
examples:
35+
- |
36+
sound {
37+
compatible = "mediatek,mt8173-rt5650-rt5514";
38+
mediatek,audio-codec = <&rt5650>, <&rt5514>;
39+
mediatek,platform = <&afe>;
40+
};
41+
...

0 commit comments

Comments
 (0)