Skip to content

Commit fe46a7d

Browse files
committed
Merge tag 'sound-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "This was a relatively calm development cycle. Most of changes are rather small device-specific fixes and enhancements. The only significant changes in ALSA core are code refactoring with the recent cleanup infrastructure, which should bring no functionality changes. Some highlights below: Core: - Lots of cleanups in ALSA core code with automatic kfree cleanup and locking guard macros - New ALSA core kunit test ASoC: - SoundWire support for AMD ACP 6.3 systems - Support for reporting version information for AVS firmware - Support DSPless mode for Intel Soundwire systems - Support for configuring CS35L56 amplifiers using EFI calibration data - Log which component is being operated on as part of power management trace events. - Support for Microchip SAM9x7, NXP i.MX95 and Qualcomm WCD939x HD- and USB-audio: - More Cirrus HD-audio codec support - TAS2781 HD-audio codec fixes - Scarlett2 mixer fixes Others: - Enhancement of virtio driver for audio control supports - Cleanups of legacy PM code with new macros - Firewire sound updates" * tag 'sound-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (307 commits) ALSA: usb-audio: Stop parsing channels bits when all channels are found. ALSA: hda/tas2781: remove unnecessary runtime_pm calls ALSA: hda/realtek - ALC236 fix volume mute & mic mute LED on some HP models ALSA: aaci: Delete unused variable in aaci_do_suspend ALSA: scarlett2: Fix Scarlett 4th Gen input gain range again ALSA: scarlett2: Fix Scarlett 4th Gen input gain range ALSA: scarlett2: Fix Scarlett 4th Gen autogain status values ALSA: scarlett2: Fix Scarlett 4th Gen 4i4 low-voltage detection ALSA: hda/tas2781: restore power state after system_resume ALSA: hda/tas2781: do not call pm_runtime_force_* in system_resume/suspend ALSA: hda/tas2781: do not reset cur_* values in runtime_suspend ALSA: hda/tas2781: add lock to system_suspend ALSA: hda/tas2781: use dev_dbg in system_resume ALSA: hda/realtek: fix ALC285 issues on HP Envy x360 laptops platform/x86: serial-multi-instantiate: Add support for CS35L54 and CS35L57 ALSA: hda: cs35l56: Add support for CS35L54 and CS35L57 ASoC: cs35l56: Add support for CS35L54 and CS35L57 ASoC: Intel: catpt: Carefully use PCI bitwise constants ALSA: hda: hda_component: Include sound/hda_codec.h ALSA: hda: hda_component: Add missing #include guards ...
2 parents 705c1da + a39d51f commit fe46a7d

File tree

344 files changed

+16592
-5305
lines changed

Some content is hidden

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

344 files changed

+16592
-5305
lines changed
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
What: /sys/devices/pci0000:00/<dev>/avs/fw_version
2+
Date: February 2024
3+
Contact: Cezary Rojewski <[email protected]>
4+
Description:
5+
Version of AudioDSP firmware ASoC avs driver is communicating
6+
with.
7+
8+
Format: %d.%d.%d.%d, type:major:minor:build.
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/atmel,asoc-wm8904.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Atmel wm8904 audio codec complex
8+
9+
maintainers:
10+
- Dharma Balasubiramani <[email protected]>
11+
12+
description:
13+
The ASoC audio complex configuration for Atmel with WM8904 audio codec.
14+
15+
properties:
16+
compatible:
17+
const: atmel,asoc-wm8904
18+
19+
atmel,model:
20+
$ref: /schemas/types.yaml#/definitions/string
21+
description: The user-visible name of this sound complex.
22+
23+
atmel,ssc-controller:
24+
$ref: /schemas/types.yaml#/definitions/phandle
25+
description: The phandle of the SSC controller.
26+
27+
atmel,audio-codec:
28+
$ref: /schemas/types.yaml#/definitions/phandle
29+
description: The phandle of the WM8731 audio codec.
30+
31+
atmel,audio-routing:
32+
description:
33+
A list of the connections between audio components. Each entry is a pair
34+
of strings, the first being the connection's sink, the second being the
35+
connection's source.
36+
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
37+
items:
38+
enum:
39+
# Board Connectors
40+
- Headphone Jack
41+
- Line In Jack
42+
- Mic
43+
# WM8904 CODEC Pins
44+
- IN1L
45+
- IN1R
46+
- IN2L
47+
- IN2R
48+
- IN3L
49+
- IN3R
50+
- HPOUTL
51+
- HPOUTR
52+
- LINEOUTL
53+
- LINEOUTR
54+
- MICBIAS
55+
56+
required:
57+
- compatible
58+
- atmel,model
59+
- atmel,audio-routing
60+
- atmel,ssc-controller
61+
- atmel,audio-codec
62+
63+
additionalProperties: false
64+
65+
examples:
66+
- |
67+
sound {
68+
compatible = "atmel,asoc-wm8904";
69+
pinctrl-names = "default";
70+
pinctrl-0 = <&pinctrl_pck0_as_mck>;
71+
72+
atmel,model = "wm8904 @ AT91SAM9N12EK";
73+
74+
atmel,audio-routing =
75+
"Headphone Jack", "HPOUTL",
76+
"Headphone Jack", "HPOUTR",
77+
"IN2L", "Line In Jack",
78+
"IN2R", "Line In Jack",
79+
"Mic", "MICBIAS",
80+
"IN1L", "Mic";
81+
82+
atmel,ssc-controller = <&ssc0>;
83+
atmel,audio-codec = <&wm8904>;
84+
};
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/atmel,sam9x5-wm8731-audio.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Atmel at91sam9x5ek wm8731 audio complex
8+
9+
maintainers:
10+
- Dharma Balasubiramani <[email protected]>
11+
12+
description:
13+
The audio complex configuration for Atmel at91sam9x5ek with WM8731 audio codec.
14+
15+
properties:
16+
compatible:
17+
const: atmel,sam9x5-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,ssc-controller:
24+
$ref: /schemas/types.yaml#/definitions/phandle
25+
description: The phandle of the SSC controller.
26+
27+
atmel,audio-codec:
28+
$ref: /schemas/types.yaml#/definitions/phandle
29+
description: The phandle of the WM8731 audio codec.
30+
31+
atmel,audio-routing:
32+
description:
33+
A list of the connections between audio components. Each entry is a pair
34+
of strings, the first being the connection's sink, the second being the
35+
connection's source.
36+
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
37+
items:
38+
enum:
39+
# Board Connectors
40+
- Headphone Jack
41+
- Line In Jack
42+
43+
# CODEC Pins
44+
- LOUT
45+
- ROUT
46+
- LHPOUT
47+
- RHPOUT
48+
- LLINEIN
49+
- RLINEIN
50+
- MICIN
51+
52+
required:
53+
- compatible
54+
- atmel,model
55+
- atmel,ssc-controller
56+
- atmel,audio-codec
57+
- atmel,audio-routing
58+
59+
additionalProperties: false
60+
61+
examples:
62+
- |
63+
sound {
64+
compatible = "atmel,sam9x5-wm8731-audio";
65+
66+
atmel,model = "wm8731 @ AT91SAM9X5EK";
67+
68+
atmel,audio-routing =
69+
"Headphone Jack", "RHPOUT",
70+
"Headphone Jack", "LHPOUT",
71+
"LLINEIN", "Line In Jack",
72+
"RLINEIN", "Line In Jack";
73+
74+
atmel,ssc-controller = <&ssc0>;
75+
atmel,audio-codec = <&wm8731>;
76+
};

Documentation/devicetree/bindings/sound/atmel,sama5d2-classd.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ description:
1818

1919
properties:
2020
compatible:
21-
const: atmel,sama5d2-classd
21+
oneOf:
22+
- items:
23+
- const: atmel,sama5d2-classd
24+
- items:
25+
- const: microchip,sam9x7-classd
26+
- const: atmel,sama5d2-classd
2227

2328
reg:
2429
maxItems: 1

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

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

Documentation/devicetree/bindings/sound/atmel-wm8904.txt

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ definitions:
5151
- $ref: /schemas/types.yaml#/definitions/phandle
5252
clocks:
5353
description: Indicates system clock
54-
$ref: /schemas/types.yaml#/definitions/phandle
54+
maxItems: 1
5555
system-clock-frequency:
5656
$ref: simple-card.yaml#/definitions/system-clock-frequency
5757
system-clock-direction-out:

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ properties:
2525
reg:
2626
maxItems: 1
2727

28+
interrupts:
29+
maxItems: 1
30+
2831
'#sound-dai-cells':
2932
const: 1
3033

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ properties:
3838
default: 0x0f
3939

4040
everest,mic1-src:
41+
deprecated: true
4142
$ref: /schemas/types.yaml#/definitions/uint8
4243
description:
4344
the value of reg 2A when headset plugged.
@@ -46,6 +47,7 @@ properties:
4647
default: 0x22
4748

4849
everest,mic2-src:
50+
deprecated: true
4951
$ref: /schemas/types.yaml#/definitions/uint8
5052
description:
5153
the value of reg 2A when headset unplugged.
@@ -87,7 +89,7 @@ properties:
8789
0 means the chip detect jack type again after button released.
8890
minimum: 0
8991
maximum: 0x7f
90-
default: 0x45
92+
default: 0x00
9193

9294
required:
9395
- compatible
@@ -107,10 +109,8 @@ examples:
107109
clocks = <&clks 10>;
108110
clock-names = "mclk";
109111
#sound-dai-cells = <0>;
110-
everest,mic1-src = [22];
111-
everest,mic2-src = [44];
112112
everest,jack-pol = [0e];
113113
everest,interrupt-src = [08];
114-
everest,interrupt-clk = [45];
114+
everest,interrupt-clk = [00];
115115
};
116116
};

0 commit comments

Comments
 (0)