Skip to content

Commit 05a54fa

Browse files
committed
Merge tag 'sound-6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "It's been relatively calm in this cycle from the feature POV, but there were lots of cleanup works in the wide-range of code for converting with the auto-cleanup macros like guard(). The mostly user-visible changes are the support of a couple of new compress-offload API extensions, and the support of new ASoC codec / platform drivers as well as USB-audio quirks. Here we go with some highlights: Core: - Compress-offload API extension for 64bit timestamp support - Compress-offload API extension for OPUS codec support - Workaround for PCM locking issue with PREEMPT_RT and softirq - KCSAN warning fix for ALSA sequencer core ASoC: - Continued cleanup works for ASoC core APIs - Lots of cleanups and conversions of DT bindings - Substantial maintainance work on the Intel AVS drivers - Support for Qualcomm Glymur and PM4125, Realtek RT1321, Shanghai FourSemi FS2104/5S, Texas Instruments PCM1754 and TAS2783A - Remove support for TI WL1273 for old Nokia systems USB-audio: - Support for Tascam US-144mkII, Presonus S1824c support - More flexible quirk option handling - Fix for USB MIDI timer bug triggered by fuzzer Others: - A large series of cleanups with guard() & co macros over (non-ASoC) sound drivers (PCI, ISA, HD-audio, USB-audio, drivers, etc) - TAS5825 HD-audio side-codec support" * tag 'sound-6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (454 commits) ALSA: usb-audio: don't hardcode gain for output channel of Presonus Studio ALSA: usb-audio: add the initial mix for Presonus Studio 1824c ALSA: doc: improved docs about quirk_flags in snd-usb-audio ALSA: usb-audio: make param quirk_flags change-able in runtime ALSA: usb-audio: improve module param quirk_flags ALSA: usb-audio: add two-way convert between name and bit for QUIRK_FLAG_* ALSA: usb-audio: fix race condition to UAF in snd_usbmidi_free ALSA: usb-audio: add mono main switch to Presonus S1824c ALSA: compress: document 'chan_map' member in snd_dec_opus ASoC: cs35l56: Add support for CS35L56 B2 silicon ASoC: cs35l56: Set fw_regs table after getting REVID ALSA: hda/realtek: Add quirk for HP Spectre 14t-ea100 ASoc: tas2783A: Fix an error code in probe() ASoC: tlv320aic3x: Fix class-D initialization for tlv320aic3007 ASoC: qcom: sc8280xp: use sa8775p/ subdir for QCS9100 / QCS9075 ASoC: stm32: sai: manage context in set_sysclk callback ASoC: renesas: msiof: ignore 1st FSERR ASoC: renesas: msiof: Add note for The possibility of R/L opposite Capture ASoC: renesas: msiof: setup both (Playback/Capture) in the same time ASoC: renesas: msiof: tidyup DMAC stop timing ...
2 parents e1b1d03 + f65dc3b commit 05a54fa

File tree

602 files changed

+24397
-16206
lines changed

Some content is hidden

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

602 files changed

+24397
-16206
lines changed

Documentation/devicetree/bindings/mfd/twl4030-audio.txt

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

Documentation/devicetree/bindings/sound/alc5623.txt

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

Documentation/devicetree/bindings/sound/asahi-kasei,ak4458.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ properties:
1515
- asahi-kasei,ak4458
1616
- asahi-kasei,ak4497
1717

18+
"#sound-dai-cells":
19+
const: 0
20+
1821
reg:
1922
maxItems: 1
2023

@@ -46,6 +49,7 @@ required:
4649
- reg
4750

4851
allOf:
52+
- $ref: dai-common.yaml#
4953
- if:
5054
properties:
5155
compatible:

Documentation/devicetree/bindings/sound/brcm,bcm2835-i2s.txt

Lines changed: 0 additions & 24 deletions
This file was deleted.
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/brcm,bcm2835-i2s.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Broadcom BCM2835 SoC I2S/PCM module
8+
9+
maintainers:
10+
- Florian Fainelli <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: brcm,bcm2835-i2s
15+
16+
reg:
17+
maxItems: 1
18+
19+
clocks:
20+
maxItems: 1
21+
22+
dmas:
23+
items:
24+
- description: Transmission DMA controller phandle and request line.
25+
- description: Reception DMA controller phandle and request line.
26+
27+
dma-names:
28+
items:
29+
- const: tx
30+
- const: rx
31+
32+
required:
33+
- compatible
34+
- reg
35+
- clocks
36+
- dmas
37+
- dma-names
38+
39+
additionalProperties: false
40+
41+
examples:
42+
- |
43+
#include <dt-bindings/clock/bcm2835.h>
44+
45+
i2s@7e203000 {
46+
compatible = "brcm,bcm2835-i2s";
47+
reg = <0x7e203000 0x24>;
48+
clocks = <&clocks BCM2835_CLOCK_PCM>;
49+
dmas = <&dma 2>, <&dma 3>;
50+
dma-names = "tx", "rx";
51+
};

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,12 @@ properties:
151151
minimum: 0
152152
maximum: 5
153153

154+
cirrus,subsystem-id:
155+
$ref: /schemas/types.yaml#/definitions/string
156+
description:
157+
Subsystem ID. If this property is present, it sets the system name,
158+
used to identify the firmware and tuning to load.
159+
154160
required:
155161
- compatible
156162
- reg

Documentation/devicetree/bindings/sound/everest,es8316.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,22 @@ maintainers:
1212
- Matteo Martelli <[email protected]>
1313
- Binbin Zhou <[email protected]>
1414

15+
description: |
16+
Everest ES8311, ES8316 and ES8323 audio CODECs
17+
18+
Pins on the device (for linking into audio routes):
19+
20+
Outputs:
21+
* LOUT: Left Analog Output
22+
* ROUT: Right Analog Output
23+
* MICBIAS: Microphone Bias
24+
25+
Inputs:
26+
* MIC1P: Microphone 1 Positive Analog Input
27+
* MIC1N: Microphone 1 Negative Analog Input
28+
* MIC2P: Microphone 2 Positive Analog Input
29+
* MIC2N: Microphone 2 Negative Analog Input
30+
1531
allOf:
1632
- $ref: dai-common.yaml#
1733

Lines changed: 101 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,101 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/foursemi,fs2105s.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: FourSemi FS2104/5S Digital Audio Amplifier
8+
9+
maintainers:
10+
- Nick Li <[email protected]>
11+
12+
description:
13+
The FS2104 is a 15W Inductor-Less, Stereo, Closed-Loop,
14+
Digital Input Class-D Power Amplifier with Enhanced Signal Processing.
15+
The FS2105S is a 30W Inductor-Less, Stereo, Closed-Loop,
16+
Digital Input Class-D Power Amplifier with Enhanced Signal Processing.
17+
18+
properties:
19+
compatible:
20+
oneOf:
21+
- items:
22+
- enum:
23+
- foursemi,fs2104
24+
- const: foursemi,fs2105s
25+
- enum:
26+
- foursemi,fs2105s
27+
28+
reg:
29+
maxItems: 1
30+
31+
clocks:
32+
items:
33+
- description: The clock of I2S BCLK
34+
35+
clock-names:
36+
items:
37+
- const: bclk
38+
39+
interrupts:
40+
maxItems: 1
41+
42+
'#sound-dai-cells':
43+
const: 0
44+
45+
pvdd-supply:
46+
description:
47+
Regulator for power supply(PVDD in datasheet).
48+
49+
dvdd-supply:
50+
description:
51+
Regulator for digital supply(DVDD in datasheet).
52+
53+
reset-gpios:
54+
maxItems: 1
55+
description:
56+
It's the SDZ pin in datasheet, the pin is active low,
57+
it will power down and reset the chip to shut down state.
58+
59+
firmware-name:
60+
maxItems: 1
61+
description: |
62+
The firmware(*.bin) contains:
63+
a. Register initialization settings
64+
b. DSP effect parameters
65+
c. Multi-scene sound effect configurations(optional)
66+
It's gernerated by FourSemi's tuning tool.
67+
68+
required:
69+
- compatible
70+
- reg
71+
- '#sound-dai-cells'
72+
- pvdd-supply
73+
- dvdd-supply
74+
- reset-gpios
75+
- firmware-name
76+
77+
allOf:
78+
- $ref: dai-common.yaml#
79+
80+
unevaluatedProperties: false
81+
82+
examples:
83+
- |
84+
#include <dt-bindings/gpio/gpio.h>
85+
i2c {
86+
#address-cells = <1>;
87+
#size-cells = <0>;
88+
audio-codec@68 {
89+
compatible = "foursemi,fs2105s";
90+
reg = <0x68>;
91+
clocks = <&clocks 18>;
92+
clock-names = "bclk";
93+
#sound-dai-cells = <0>;
94+
pvdd-supply = <&pvdd_supply>;
95+
dvdd-supply = <&dvdd_supply>;
96+
reset-gpios = <&gpio 18 GPIO_ACTIVE_LOW>;
97+
firmware-name = "fs2105s-btl-2p0-0s.bin";
98+
pinctrl-names = "default";
99+
pinctrl-0 = <&fs210x_pins_default>;
100+
};
101+
};

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,6 @@ examples:
104104
"ctx2_rx", "ctx2_tx",
105105
"ctx3_rx", "ctx3_tx";
106106
firmware-name = "imx/easrc/easrc-imx8mn.bin";
107-
fsl,asrc-rate = <8000>;
107+
fsl,asrc-rate = <8000>;
108108
fsl,asrc-format = <2>;
109109
};

Documentation/devicetree/bindings/sound/fsl,imx-asrc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ examples:
176176
<&sdma 20 23 1>, <&sdma 21 23 1>, <&sdma 22 23 1>;
177177
dma-names = "rxa", "rxb", "rxc",
178178
"txa", "txb", "txc";
179-
fsl,asrc-rate = <48000>;
179+
fsl,asrc-rate = <48000>;
180180
fsl,asrc-width = <16>;
181181
182182
port {

0 commit comments

Comments
 (0)