Skip to content

Commit 064d7dc

Browse files
committed
Merge tag 'sound-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "The majority of works in this cycle are about ASoC spread over trees. Most of them are for new devices and cleanups / refactoring works, and not much significant changes are seen in the core side. Below are some highlights: ASoC: - Continued refactoring to move into common helper functions - Lots of DT schema conversons and stylistic nits - Continued work on building out the new SOF IPC4 scheme - Continued work for Intel AVS - New drivers for Awinc AT88395, Infineon PEB2466, Iron Device SMA1303, Mediatek MT8188, Realtek RT712, Renesas IDT821034, Samsung/Tesla FSD SoC I2S, and TI TAS5720A-Q1 ALSA: - A few cleanups to make the remove callbacks to void returns - FireWire refactoring and enhancements - PCM kselftest enhancements" * tag 'sound-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (398 commits) ALSA: hda/hdmi: Register with vga_switcheroo on Dual GPU Macbooks ASoC: soc-ac97: Return correct error codes ASoC: soc-dapm.h: fixup warning struct snd_pcm_substream not declared ASoC: cs35l45: Remove separate namespace for tables ASoC: cs35l45: Remove separate tables module ASoC: soc-ac97: Convert to agnostic GPIO API ASoC: dt-bindings: renesas,rsnd.yaml: drop "dmas/dma-names" from "rcar_sound,ssi" ALSA: hda: cs35l41: Enable Amp High Pass Filter ALSA: hda: cs35l41: Ensure firmware/tuning pairs are always loaded ALSA: hda: cs35l41: Correct error condition handling ASoC: codecs: wcd934x: Use min macro for comparison and assignment ASoC: Intel: Skylake: Fix struct definition ASoC: tlv320adcx140: extend list of supported samplerates ASoC: imx-pcm-rpmsg: Remove unused variable SoC: rt5682s: Disable jack detection interrupt during suspend ASoC: SOF: Intel: hda-dsp: Set streaming flag for d0i3 ASoC: SOF: Intel: Enable d0i3 work for ipc4 ASoC: SOF: ipc4: Wake up dsp core before sending ipc msg ASoC: SOF: Intel: hda-dsp: use set_pm_gate according to ipc version ASoC: SOF: Introduce a new set_pm_gate() IPC PM op ...
2 parents f3dd0c5 + 7933b90 commit 064d7dc

File tree

379 files changed

+33352
-3928
lines changed

Some content is hidden

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

379 files changed

+33352
-3928
lines changed

Documentation/devicetree/bindings/dsp/mediatek,mt8186-dsp.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ description: |
1515
1616
properties:
1717
compatible:
18-
const: mediatek,mt8186-dsp
18+
enum:
19+
- mediatek,mt8186-dsp
20+
- mediatek,mt8188-dsp
1921

2022
reg:
2123
items:

Documentation/devicetree/bindings/sound/adi,adau7002.txt

Lines changed: 0 additions & 19 deletions
This file was deleted.
Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
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,adau7002.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Analog Devices ADAU7002 Stereo PDM-to-I2S/TDM Converter
8+
9+
maintainers:
10+
- Krzysztof Kozlowski <[email protected]>
11+
12+
allOf:
13+
- $ref: dai-common.yaml#
14+
15+
properties:
16+
compatible:
17+
const: adi,adau7002
18+
19+
IOVDD-supply:
20+
description:
21+
IOVDD power supply, if skipped then it is assumed that the supply pin is
22+
hardwired to always on.
23+
24+
wakeup-delay-ms:
25+
description:
26+
Delay after power up needed for device to settle.
27+
28+
required:
29+
- compatible
30+
31+
unevaluatedProperties: false
32+
33+
examples:
34+
- |
35+
audio-codec {
36+
compatible = "adi,adau7002";
37+
IOVDD-supply = <&pp1800_l15a>;
38+
#sound-dai-cells = <0>;
39+
wakeup-delay-ms = <80>;
40+
};

Documentation/devicetree/bindings/sound/ak4613.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,13 @@ properties:
2525
"#sound-dai-cells":
2626
const: 0
2727

28+
ports:
29+
$ref: audio-graph-port.yaml#/definitions/ports
30+
31+
port:
32+
$ref: audio-graph-port.yaml#
33+
unevaluatedProperties: false
34+
2835
patternProperties:
2936
"^asahi-kasei,in[1-2]-single-end$":
3037
description: Input Pin 1 - 2.

Documentation/devicetree/bindings/sound/amlogic,axg-fifo.txt

Lines changed: 0 additions & 34 deletions
This file was deleted.
Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/amlogic,axg-fifo.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Amlogic AXG Audio FIFO controllers
8+
9+
maintainers:
10+
- Jerome Brunet <[email protected]>
11+
12+
properties:
13+
compatible:
14+
oneOf:
15+
- enum:
16+
- amlogic,axg-toddr
17+
- amlogic,axg-frddr
18+
- items:
19+
- enum:
20+
- amlogic,g12a-toddr
21+
- amlogic,sm1-toddr
22+
- const: amlogic,axg-toddr
23+
- items:
24+
- enum:
25+
- amlogic,g12a-frddr
26+
- amlogic,sm1-frddr
27+
- const: amlogic,axg-frddr
28+
29+
reg:
30+
maxItems: 1
31+
32+
"#sound-dai-cells":
33+
const: 0
34+
35+
clocks:
36+
items:
37+
- description: Peripheral clock
38+
39+
interrupts:
40+
maxItems: 1
41+
42+
resets:
43+
minItems: 1
44+
maxItems: 2
45+
46+
reset-names:
47+
minItems: 1
48+
maxItems: 2
49+
50+
amlogic,fifo-depth:
51+
$ref: /schemas/types.yaml#/definitions/uint32
52+
description: Size of the controller's fifo in bytes
53+
54+
required:
55+
- compatible
56+
- reg
57+
- "#sound-dai-cells"
58+
- clocks
59+
- interrupts
60+
- resets
61+
- amlogic,fifo-depth
62+
63+
allOf:
64+
- $ref: dai-common.yaml#
65+
- if:
66+
properties:
67+
compatible:
68+
contains:
69+
enum:
70+
- amlogic,g12a-toddr
71+
- amlogic,sm1-toddr
72+
- amlogic,g12a-frddr
73+
- amlogic,sm1-frddr
74+
75+
then:
76+
properties:
77+
resets:
78+
minItems: 2
79+
reset-names:
80+
items:
81+
- const: arb
82+
- const: rst
83+
required:
84+
- reset-names
85+
86+
else:
87+
properties:
88+
resets:
89+
maxItems: 1
90+
reset-names:
91+
const: arb
92+
93+
unevaluatedProperties: false
94+
95+
examples:
96+
- |
97+
#include <dt-bindings/clock/axg-audio-clkc.h>
98+
#include <dt-bindings/interrupt-controller/irq.h>
99+
#include <dt-bindings/interrupt-controller/arm-gic.h>
100+
#include <dt-bindings/reset/amlogic,meson-axg-audio-arb.h>
101+
#include <dt-bindings/reset/amlogic,meson-g12a-audio-reset.h>
102+
103+
audio-controller@1c0 {
104+
compatible = "amlogic,g12a-frddr", "amlogic,axg-frddr";
105+
reg = <0x1c0 0x1c>;
106+
#sound-dai-cells = <0>;
107+
clocks = <&clkc_audio AUD_CLKID_FRDDR_A>;
108+
interrupts = <GIC_SPI 88 IRQ_TYPE_EDGE_RISING>;
109+
resets = <&arb>, <&clkc_audio AUD_RESET_FRDDR_A>;
110+
reset-names = "arb", "rst";
111+
amlogic,fifo-depth = <512>;
112+
};

Documentation/devicetree/bindings/sound/amlogic,axg-pdm.txt

Lines changed: 0 additions & 29 deletions
This file was deleted.
Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/amlogic,axg-pdm.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Amlogic Audio AXG PDM input
8+
9+
maintainers:
10+
- Jerome Brunet <[email protected]>
11+
12+
properties:
13+
compatible:
14+
oneOf:
15+
- items:
16+
- enum:
17+
- amlogic,g12a-pdm
18+
- amlogic,sm1-pdm
19+
- const: amlogic,axg-pdm
20+
- const: amlogic,axg-pdm
21+
22+
reg:
23+
maxItems: 1
24+
25+
"#sound-dai-cells":
26+
const: 0
27+
28+
clocks:
29+
items:
30+
- description: Peripheral clock
31+
- description: PDM digital clock
32+
- description: DSP system clock
33+
34+
clock-names:
35+
items:
36+
- const: pclk
37+
- const: dclk
38+
- const: sysclk
39+
40+
resets:
41+
maxItems: 1
42+
43+
required:
44+
- compatible
45+
- reg
46+
- "#sound-dai-cells"
47+
- clocks
48+
- clock-names
49+
50+
allOf:
51+
- $ref: dai-common.yaml#
52+
53+
- if:
54+
properties:
55+
compatible:
56+
contains:
57+
enum:
58+
- amlogic,g12a-pdm
59+
- amlogic,sm1-pdm
60+
then:
61+
required:
62+
- resets
63+
64+
else:
65+
properties:
66+
resets: false
67+
68+
unevaluatedProperties: false
69+
70+
examples:
71+
- |
72+
#include <dt-bindings/clock/axg-audio-clkc.h>
73+
74+
audio-controller@ff632000 {
75+
compatible = "amlogic,axg-pdm";
76+
reg = <0xff632000 0x34>;
77+
#sound-dai-cells = <0>;
78+
clocks = <&clkc_audio AUD_CLKID_PDM>,
79+
<&clkc_audio AUD_CLKID_PDM_DCLK>,
80+
<&clkc_audio AUD_CLKID_PDM_SYSCLK>;
81+
clock-names = "pclk", "dclk", "sysclk";
82+
};

0 commit comments

Comments
 (0)