Skip to content

Commit 12cc3d5

Browse files
committed
Merge tag 'sound-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "Lots of changes in this cycle, but mostly for cleanups and refactoring. Significant amount of changes are about DT schema conversions for ASoC at this time while we see other usual suspects, too. Some highlights below: Core: - Re-introduction of PCM sync ID support API - MIDI2 time-base extension in ALSA sequencer API ASoC: - Syncing of features between simple-audio-card and the two audio-graph cards - Support for specifying the order of operations for components within cards to allow quirking for unusual systems - Lots of DT schema conversions - Continued SOF/Intel updates for topology, SoundWire, IPC3/4 - New support for Asahi Kasei AK4619, Cirrus Logic CS530x, Everest Semiconductors ES8311, NXP i.MX95 and LPC32xx, Qualcomm LPASS v2.5 and WCD937x, Realtek RT1318 and RT1320 and Texas Instruments PCM5242 HD-audio: - More quirks, Intel PantherLake support, senarytech codec support - Refactoring of Cirrus codec component-binding Others: - ALSA control kselftest improvements, and fixes for input value checks in various drivers" * tag 'sound-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (349 commits) kselftest/alsa: Log the PCM ID in pcm-test kselftest/alsa: Use card name rather than number in test names ALSA: hda/realtek: Fix the speaker output on Samsung Galaxy Book Pro 360 ALSA: hda/tas2781: Add new quirk for Lenovo Hera2 Laptop ALSA: seq: ump: Skip useless ports for static blocks ALSA: pcm_dmaengine: Don't synchronize DMA channel when DMA is paused ALSA: usb: Use BIT() for bit values ALSA: usb: Fix UBSAN warning in parse_audio_unit() ALSA: hda/realtek: Enable headset mic on Positivo SU C1400 ASoC: tas2781: Add new Kontrol to set tas2563 digital Volume ASoC: codecs: wcd937x: Remove separate handling for vdd-buck supply ASoC: codecs: wcd937x: Remove the string compare in MIC BIAS widget settings ASoC: codecs: wcd937x-sdw: Fix Unbalanced pm_runtime_enable ASoC: dt-bindings: cirrus,cs42xx8: Convert to dtschema ASoC: cs530x: Remove bclk from private structure ASoC: cs530x: Calculate proper bclk rate using TDM ASoC: dt-bindings: cirrus,cs4270: Convert to dtschema firmware: cs_dsp: Rename fw_ver to wmfw_ver firmware: cs_dsp: Clarify wmfw format version log message firmware: cs_dsp: Make wmfw and bin filename arguments const char * ...
2 parents a4f9285 + 4594d26 commit 12cc3d5

File tree

352 files changed

+21495
-4509
lines changed

Some content is hidden

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

352 files changed

+21495
-4509
lines changed

Documentation/devicetree/bindings/sound/ak4104.txt

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

Documentation/devicetree/bindings/sound/ak4554.txt

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

Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.txt

Lines changed: 0 additions & 58 deletions
This file was deleted.
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/amlogic,g12a-tohdmitx.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Amlogic G12a HDMI TX Control Glue
8+
9+
maintainers:
10+
- Jerome Brunet <[email protected]>
11+
12+
allOf:
13+
- $ref: dai-common.yaml#
14+
15+
properties:
16+
$nodename:
17+
pattern: "^audio-controller@.*"
18+
19+
compatible:
20+
oneOf:
21+
- items:
22+
- const: amlogic,g12a-tohdmitx
23+
- items:
24+
- enum:
25+
- amlogic,sm1-tohdmitx
26+
- const: amlogic,g12a-tohdmitx
27+
28+
reg:
29+
maxItems: 1
30+
31+
resets:
32+
maxItems: 1
33+
34+
"#sound-dai-cells":
35+
const: 1
36+
37+
required:
38+
- compatible
39+
- reg
40+
- resets
41+
- "#sound-dai-cells"
42+
43+
unevaluatedProperties: false
44+
45+
examples:
46+
- |
47+
#include <dt-bindings/reset/amlogic,meson-g12a-audio-reset.h>
48+
49+
tohdmitx: audio-controller@744 {
50+
compatible = "amlogic,g12a-tohdmitx";
51+
reg = <0x744 0x4>;
52+
resets = <&clkc_audio AUD_RESET_TOHDMITX>;
53+
#sound-dai-cells = <1>;
54+
};

Documentation/devicetree/bindings/sound/amlogic,gx-sound-card.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ properties:
2323

2424
audio-widgets:
2525
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
26-
minItems: 2
2726
description: |-
2827
A list off component DAPM widget. Each entry is a pair of strings,
2928
the first being the widget type, the second being the widget name
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/asahi-kasei,ak4104.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: AK4104 S/PDIF transmitter
8+
9+
allOf:
10+
- $ref: dai-common.yaml#
11+
12+
maintainers:
13+
- Daniel Mack <[email protected]>
14+
- Xiaxi Shen <[email protected]>
15+
16+
properties:
17+
compatible:
18+
const: asahi-kasei,ak4104
19+
20+
reg:
21+
description: Chip select number on the SPI bus
22+
maxItems: 1
23+
24+
vdd-supply:
25+
description: A regulator node providing between 2.7V and 3.6V.
26+
27+
reset-gpios:
28+
maxItems: 1
29+
description: Optional GPIO spec for the reset pin, deasserted
30+
before communication starts.
31+
32+
required:
33+
- compatible
34+
- reg
35+
- vdd-supply
36+
37+
unevaluatedProperties: false
38+
39+
examples:
40+
- |
41+
i2c {
42+
#address-cells = <1>;
43+
#size-cells = <0>;
44+
codec@0 {
45+
compatible = "asahi-kasei,ak4104";
46+
reg = <0>;
47+
vdd-supply = <&vdd_3v3_reg>;
48+
};
49+
};

Documentation/devicetree/bindings/sound/ak4375.yaml renamed to Documentation/devicetree/bindings/sound/asahi-kasei,ak4375.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: http://devicetree.org/schemas/sound/ak4375.yaml#
4+
$id: http://devicetree.org/schemas/sound/asahi-kasei,ak4375.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: AK4375 DAC and headphones amplifier
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/asahi-kasei,ak4554.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: AK4554 sound codec
8+
9+
maintainers:
10+
- Kuninori Morimoto <[email protected]>
11+
- Liam Girdwood <[email protected]>
12+
- Mark Brown <[email protected]>
13+
14+
properties:
15+
compatible:
16+
const: asahi-kasei,ak4554
17+
18+
required:
19+
- compatible
20+
21+
additionalProperties: false
22+
23+
examples:
24+
- |
25+
codec {
26+
compatible = "asahi-kasei,ak4554";
27+
};

Documentation/devicetree/bindings/sound/ak4613.yaml renamed to Documentation/devicetree/bindings/sound/asahi-kasei,ak4613.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: http://devicetree.org/schemas/sound/ak4613.yaml#
4+
$id: http://devicetree.org/schemas/sound/asahi-kasei,ak4613.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: AK4613 I2C transmitter
Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/asahi-kasei,ak4619.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: AK4619 I2C transmitter
8+
9+
maintainers:
10+
- Kuninori Morimoto <[email protected]>
11+
- Khanh Le <[email protected]>
12+
13+
allOf:
14+
- $ref: dai-common.yaml#
15+
16+
properties:
17+
compatible:
18+
const: asahi-kasei,ak4619
19+
20+
reg:
21+
maxItems: 1
22+
23+
clocks:
24+
maxItems: 1
25+
26+
clock-names:
27+
items:
28+
- const: mclk
29+
30+
"#sound-dai-cells":
31+
const: 0
32+
33+
port:
34+
$ref: audio-graph-port.yaml#
35+
unevaluatedProperties: false
36+
37+
required:
38+
- compatible
39+
- reg
40+
41+
unevaluatedProperties: false
42+
43+
examples:
44+
- |
45+
i2c {
46+
#address-cells = <1>;
47+
#size-cells = <0>;
48+
codec@10 {
49+
compatible = "asahi-kasei,ak4619";
50+
reg = <0x10>;
51+
52+
clocks = <&rcar_sound>;
53+
clock-names = "mclk";
54+
55+
#sound-dai-cells = <0>;
56+
port {
57+
ak4619_endpoint: endpoint {
58+
remote-endpoint = <&rsnd_endpoint>;
59+
};
60+
};
61+
};
62+
};

0 commit comments

Comments
 (0)