Skip to content

Commit e50da55

Browse files
committed
Merge tag 'sound-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "We've received lots of commits at this time, as a result of various cleanup and refactoring works as well as a few new drivers and the generic SoundWire support. Most of changes are device-specific, little about the core changes. Some highlights below: Core: - A couple of (rather minor) race fixes in ALSA sequencer code - A regression fix in ALSA timer code that may lead to a deadlock ASoC: - A large series of code conversion to use modern terminology for the clocking configuration - Conversions of PM ops with the modern macros in all ASoC drivers - Clarification of the control operations - Prepartory work for more generic SoundWire SCDA controls - Support for AMD ACP 7.x, AWINC WM88166, Everest ES8388, Intel AVS PEAKVOL and GAIN DSP modules Mediatek MT8188 DMIC, NXP i.MX95, nVidia Tegra interconnects, Rockchip RK3588 S/PDIF, Texas Instruments SN012776 and TAS5770L, and Wolfson WM8904 DMICs Others: - Conversions of PM ops with the modern macros in the rest drivers - USB-audio quirks and fixes for Presonus Studio, DJM-A9, CME - HD-audio quirks and fixes ASUS, HP, Lenovo, and others" * tag 'sound-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (651 commits) ALSA: hda: tas2781-i2c: Remove unnecessary NULL check before release_firmware() ALSA: hda: cs35l56: Remove unnecessary NULL check before release_firmware() ALSA: hda/realtek: Bass speaker fixup for ASUS UM5606KA ALSA: hda/realtek: Fix built-in mic assignment on ASUS VivoBook X515UA ALSA: hda/realtek: Add support for various HP Laptops using CS35L41 HDA ALSA: timer: Don't take register_mutex with copy_from/to_user() ASoC: SDCA: Correct handling of selected mode DisCo property ASoC: amd: yc: update quirk data for new Lenovo model ALSA: hda/realtek: fix micmute LEDs on HP Laptops with ALC3247 ALSA: hda/realtek: fix micmute LEDs on HP Laptops with ALC3315 ASoC: SOF: mediatek: Commonize duplicated functions ASoC: dmic: Fix NULL pointer dereference ASoC: wm8904: add DMIC support ASoC: wm8904: get platform data from DT ASoC: dt-bindings: wm8904: Add DMIC, GPIO, MIC and EQ support ASoC: wm8904: Don't touch GPIO configs set to 0xFFFF of: Add of_property_read_u16_index ALSA: oxygen: Fix dependency on CONFIG_PM_SLEEP ASoC: ops: Apply platform_max after deciding control type ASoC: ops: Remove some unnecessary local variables ...
2 parents 1e26c5e + 3a949fc commit e50da55

File tree

610 files changed

+19560
-8549
lines changed

Some content is hidden

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

610 files changed

+19560
-8549
lines changed

Documentation/devicetree/bindings/mfd/motorola-cpcap.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ node must be named "audio-codec".
3131
Required properties for the audio-codec subnode:
3232

3333
- #sound-dai-cells = <1>;
34+
- interrupts : should contain jack detection interrupts, with headset
35+
detect interrupt matching "hs" and microphone bias 2
36+
detect interrupt matching "mb2" in interrupt-names.
37+
- interrupt-names : Contains "hs", "mb2"
3438

3539
The audio-codec provides two DAIs. The first one is connected to the
3640
Stereo HiFi DAC and the second one is connected to the Voice DAC.
@@ -52,6 +56,8 @@ Example:
5256

5357
audio-codec {
5458
#sound-dai-cells = <1>;
59+
interrupts-extended = <&cpcap 9 0>, <&cpcap 10 0>;
60+
interrupt-names = "hs", "mb2";
5561

5662
/* HiFi */
5763
port@0 {

Documentation/devicetree/bindings/misc/atmel-ssc.txt

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

Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-codec.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ properties:
102102
maxItems: 1
103103
description: GPIO to enable the external amplifier
104104

105+
hp-det-gpios:
106+
maxItems: 1
107+
description: GPIO for headphone/line-out detection
108+
105109
required:
106110
- "#sound-dai-cells"
107111
- compatible
@@ -251,8 +255,10 @@ allOf:
251255
allwinner,audio-routing:
252256
items:
253257
enum:
258+
- Headphone
254259
- LINEOUT
255260
- Line Out
261+
- Speaker
256262

257263
dmas:
258264
items:
Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/atmel,at91-ssc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Atmel Serial Synchronous Serial (SSC)
8+
9+
maintainers:
10+
- Andrei Simion <andrei.simion@microchip.com>
11+
12+
description:
13+
The Atmel Synchronous Serial Controller (SSC) provides a versatile
14+
synchronous communication link for audio and telecom applications,
15+
supporting protocols like I2S, Short Frame Sync, and Long Frame Sync.
16+
17+
properties:
18+
compatible:
19+
enum:
20+
- atmel,at91rm9200-ssc
21+
- atmel,at91sam9g45-ssc
22+
23+
reg:
24+
maxItems: 1
25+
26+
interrupts:
27+
maxItems: 1
28+
29+
clocks:
30+
maxItems: 1
31+
32+
clock-names:
33+
items:
34+
- const: pclk
35+
36+
dmas:
37+
items:
38+
- description: TX DMA Channel
39+
- description: RX DMA Channel
40+
41+
dma-names:
42+
items:
43+
- const: tx
44+
- const: rx
45+
46+
atmel,clk-from-rk-pin:
47+
description:
48+
Specify the clock source for the SSC (Synchronous Serial Controller)
49+
when operating in slave mode. By default, the clock is sourced from
50+
the TK pin.
51+
type: boolean
52+
53+
"#sound-dai-cells":
54+
const: 0
55+
56+
required:
57+
- compatible
58+
- reg
59+
- interrupts
60+
- clocks
61+
- clock-names
62+
63+
allOf:
64+
- $ref: dai-common.yaml#
65+
- if:
66+
properties:
67+
compatible:
68+
contains:
69+
enum:
70+
- atmel,at91sam9g45-ssc
71+
then:
72+
required:
73+
- dmas
74+
- dma-names
75+
76+
unevaluatedProperties: false
77+
78+
examples:
79+
- |
80+
#include <dt-bindings/clock/at91.h>
81+
#include <dt-bindings/dma/at91.h>
82+
#include <dt-bindings/interrupt-controller/irq.h>
83+
84+
ssc@100000 {
85+
compatible = "atmel,at91sam9g45-ssc";
86+
reg = <0x100000 0x4000>;
87+
interrupts = <28 IRQ_TYPE_LEVEL_HIGH 5>;
88+
dmas = <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
89+
AT91_XDMAC_DT_PERID(38))>,
90+
<&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
91+
AT91_XDMAC_DT_PERID(39))>;
92+
dma-names = "tx", "rx";
93+
clocks = <&pmc PMC_TYPE_PERIPHERAL 28>;
94+
clock-names = "pclk";
95+
#sound-dai-cells = <0>;
96+
};
97+
98+
ssc@c00000 {
99+
compatible = "atmel,at91rm9200-ssc";
100+
reg = <0xc00000 0x4000>;
101+
interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>;
102+
clocks = <&pmc PMC_TYPE_PERIPHERAL 14>;
103+
clock-names = "pclk";
104+
};
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/atmel,at91sam9g20ek-wm8731.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Atmel at91sam9g20ek wm8731 audio complex
8+
9+
maintainers:
10+
- Balakrishnan Sambath <balakrishnan.s@microchip.com>
11+
12+
description:
13+
The audio complex configuration for Atmel at91sam9g20ek with WM8731 audio codec.
14+
15+
properties:
16+
compatible:
17+
const: atmel,at91sam9g20ek-wm8731-audio
18+
19+
atmel,model:
20+
$ref: /schemas/types.yaml#/definitions/string
21+
description: The user-visible name of this sound complex.
22+
23+
atmel,audio-routing:
24+
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
25+
description: A list of the connections between audio components.
26+
minItems: 2
27+
maxItems: 4
28+
items:
29+
enum:
30+
# Board Connectors
31+
- Ext Spk
32+
- Int Mic
33+
34+
# CODEC Pins
35+
- LOUT
36+
- ROUT
37+
- LHPOUT
38+
- RHPOUT
39+
- LLINEIN
40+
- RLINEIN
41+
- MICIN
42+
43+
atmel,ssc-controller:
44+
$ref: /schemas/types.yaml#/definitions/phandle
45+
description: The phandle of the SSC controller.
46+
47+
atmel,audio-codec:
48+
$ref: /schemas/types.yaml#/definitions/phandle
49+
description: The phandle of WM8731 audio codec.
50+
51+
required:
52+
- compatible
53+
- atmel,model
54+
- atmel,audio-routing
55+
- atmel,ssc-controller
56+
- atmel,audio-codec
57+
58+
additionalProperties: false
59+
60+
examples:
61+
- |
62+
sound {
63+
compatible = "atmel,at91sam9g20ek-wm8731-audio";
64+
pinctrl-names = "default";
65+
pinctrl-0 = <&pinctrl_pck0_as_mck>;
66+
atmel,model = "wm8731 @ AT91SAMG20EK";
67+
atmel,audio-routing =
68+
"Ext Spk", "LHPOUT",
69+
"Int Mic", "MICIN";
70+
atmel,ssc-controller = <&ssc0>;
71+
atmel,audio-codec = <&wm8731>;
72+
};

Documentation/devicetree/bindings/sound/atmel-at91sam9g20ek-wm8731-audio.txt

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

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ properties:
3737
codec2codec:
3838
type: object
3939
description: Codec to Codec node
40+
hp-det-gpios:
41+
$ref: audio-graph.yaml#/properties/hp-det-gpios
42+
widgets:
43+
$ref: audio-graph.yaml#/properties/widgets
4044

4145
required:
4246
- compatible

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ properties:
1919
enum:
2020
- awinic,aw88081
2121
- awinic,aw88083
22+
- awinic,aw88166
2223
- awinic,aw88261
2324
- awinic,aw88395
2425
- awinic,aw88399

Documentation/devicetree/bindings/sound/dmic-codec.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ properties:
1919
'#sound-dai-cells':
2020
const: 0
2121

22+
vref-supply:
23+
description: Phandle to the digital microphone reference supply
24+
2225
dmicen-gpios:
2326
description: GPIO specifier for DMIC to control start and stop
2427
maxItems: 1

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,13 @@ maintainers:
2424

2525
properties:
2626
compatible:
27-
enum:
28-
- everest,es8328
29-
- everest,es8388
27+
oneOf:
28+
- enum:
29+
- everest,es8328
30+
- items:
31+
- enum:
32+
- everest,es8388
33+
- const: everest,es8328
3034

3135
reg:
3236
maxItems: 1
@@ -56,6 +60,7 @@ properties:
5660

5761
required:
5862
- compatible
63+
- reg
5964
- clocks
6065
- DVDD-supply
6166
- AVDD-supply

0 commit comments

Comments
 (0)