Skip to content

Commit 177bf86

Browse files
committed
Merge tag 'sound-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "This includes lots of file shuffling due to HD-audio code reorganization and many trivial changes, but otherwise there shouldn't be much surprise from the functionality POV. The PR includes the PM changes as prerequisite, too. Some highlights below: Core: - Performance optimizations in PCM core code - Refactoring of ASoC Kconfig menus to be hopefully more consistant and easier to navigate. - Refactoring of ASoC DAPM code, mainly hiding functionality that doesn't need to be exposed to drivers HD-audio reorganization: - All code are moved under sound/hda with a bit more understandable tree structure, as well as file renames - The huge Realtek driver code is split to several parts, a common helper module with driver modules per probe entry - HDMI and Cirrus codec drivers also split ASoC: - Further work on the generic handling for SoundWire SDCA devices - Support for AMD ACP7.2 and SoundWire on ACP 7.1, Fairphone 4 & 5, various Intel systems, Qualcomm QCS8275, Richtek RTQ9124 and TI TAS5753 HD-audio and USB-audio: - TAS2781 driver cleanup and TAS2770 support - EQ enablement in CA0132 driver - USB audio quirk code cleanups Others: - Cleanups of PM autosuspend call patterns with the update from the PM tree - Lots of strcpy() -> strscpy() conversions for fixed size arrays" * tag 'sound-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (385 commits) ALSA: hda: Add TAS2770 support ASoC: qcom: sm8250: Add Fairphone 4 soundcard compatible ASoC: dt-bindings: qcom,sm8250: Add Fairphone 4 sound card ASoC: dt-bindings: qcom,q6afe: Document q6usb subnode ASoC: SDCA: Fix implicit cast from le16 ASoC: SDCA: Shrink detected_mode_handler() stack frame ASoC: SDCA: Check devm_mutex_init() return value ASoC: SDCA: add route by the number of input pins in MU entity ALSA: hda/realtek: Add support for ASUS Commercial laptops using CS35L41 HDA ASoC: Intel: sof_rt5682: Add HDMI-In capture with rt5682 support for PTL. ASoC: codec: tlv320aic32x4: Fix reset GPIO check ASoC: dt-bindings: qcom,lpass-va-macro: Define clock-names in top-level ASoC: SDCA: Add hw_params() helper function ASoC: SDCA: Add a helper to get the SoundWire port number ASoC: SDCA: Add helper to add DAI constraints ASoC: soc-dai: Add private data to snd_soc_dai ASoC: SDCA: Move SDCA search functions and export ASoC: SDCA: Remove overly chatty input pin list warning ASoC: SDCA: Allow read-only controls to be deferrable ASoC: SDCA: Update memory allocations to zero initialise ...
2 parents e30fc09 + bca53a1 commit 177bf86

File tree

572 files changed

+27434
-23053
lines changed

Some content is hidden

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

572 files changed

+27434
-23053
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,10 @@ properties:
4141
description: This pin is connected to the chip's RESET pin.
4242
maxItems: 1
4343

44+
port:
45+
$ref: audio-graph-port.yaml#
46+
unevaluatedProperties: false
47+
4448
required:
4549
- compatible
4650
- reg
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/fsl,mxs-audio-sgtl5000.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Freescale MXS audio complex with SGTL5000 codec
8+
9+
maintainers:
10+
- Frank Li <[email protected]>
11+
12+
properties:
13+
compatible:
14+
items:
15+
- enum:
16+
- bluegiga,apx4devkit-sgtl5000
17+
- denx,m28evk-sgtl5000
18+
- fsl,imx28-evk-sgtl5000
19+
- fsl,imx28-mbmx28lc-sgtl5000
20+
- fsl,imx28-tx28-sgtl5000
21+
- const: fsl,mxs-audio-sgtl5000
22+
23+
model:
24+
$ref: /schemas/types.yaml#/definitions/string
25+
description: The user-visible name of this sound complex
26+
27+
saif-controllers:
28+
$ref: /schemas/types.yaml#/definitions/phandle-array
29+
description: The phandle list of the MXS SAIF controller
30+
31+
audio-codec:
32+
$ref: /schemas/types.yaml#/definitions/phandle
33+
description: The phandle of the SGTL5000 audio codec
34+
35+
audio-routing:
36+
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
37+
description: |
38+
A list of the connections between audio components.
39+
Each entry is a pair of strings, the first being the
40+
connection's sink, the second being the connection's
41+
source. Valid names could be power supplies, SGTL5000
42+
pins, and the jacks on the board:
43+
44+
Power supplies:
45+
* Mic Bias
46+
47+
SGTL5000 pins:
48+
* MIC_IN
49+
* LINE_IN
50+
* HP_OUT
51+
* LINE_OUT
52+
53+
Board connectors:
54+
* Mic Jack
55+
* Line In Jack
56+
* Headphone Jack
57+
* Line Out Jack
58+
* Ext Spk
59+
60+
required:
61+
- compatible
62+
- saif-controllers
63+
- audio-codec
64+
65+
allOf:
66+
- $ref: dai-common.yaml#
67+
68+
unevaluatedProperties: false
69+
70+
examples:
71+
- |
72+
sound {
73+
compatible = "fsl,imx28-evk-sgtl5000", "fsl,mxs-audio-sgtl5000";
74+
model = "imx28-evk-sgtl5000";
75+
saif-controllers = <&saif0 &saif1>;
76+
audio-codec = <&sgtl5000>;
77+
audio-routing =
78+
"MIC_IN", "Mic Jack",
79+
"Mic Jack", "Mic Bias",
80+
"Headphone Jack", "HP_OUT";
81+
};
Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/mediatek,mt8173-afe-pcm.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Mediatek AFE PCM controller for MT8173
8+
9+
maintainers:
10+
- Trevor Wu <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: mediatek,mt8173-afe-pcm
15+
16+
reg:
17+
maxItems: 1
18+
19+
interrupts:
20+
maxItems: 1
21+
22+
clocks:
23+
items:
24+
- description: audio infra sys clock
25+
- description: audio top mux
26+
- description: audio intbus mux
27+
- description: apll1 clock
28+
- description: apll2 clock
29+
- description: i2s0 mclk mux
30+
- description: i2s1 mclk mux
31+
- description: i2s2 mclk mux
32+
- description: i2s3 mclk mux
33+
- description: i2s3 bclk mux
34+
35+
clock-names:
36+
items:
37+
- const: infra_sys_audio_clk
38+
- const: top_pdn_audio
39+
- const: top_pdn_aud_intbus
40+
- const: bck0
41+
- const: bck1
42+
- const: i2s0_m
43+
- const: i2s1_m
44+
- const: i2s2_m
45+
- const: i2s3_m
46+
- const: i2s3_b
47+
48+
power-domains:
49+
maxItems: 1
50+
51+
memory-region:
52+
description: memory region for audio DMA buffers
53+
maxItems: 1
54+
55+
required:
56+
- compatible
57+
- reg
58+
- interrupts
59+
- clocks
60+
- clock-names
61+
- power-domains
62+
63+
additionalProperties: false
64+
65+
examples:
66+
- |
67+
#include <dt-bindings/clock/mt8173-clk.h>
68+
#include <dt-bindings/interrupt-controller/arm-gic.h>
69+
#include <dt-bindings/interrupt-controller/irq.h>
70+
#include <dt-bindings/power/mt8173-power.h>
71+
72+
mt8173-afe-pcm@11220000 {
73+
compatible = "mediatek,mt8173-afe-pcm";
74+
reg = <0x11220000 0x1000>;
75+
interrupts = <GIC_SPI 134 IRQ_TYPE_EDGE_FALLING>;
76+
power-domains = <&spm MT8173_POWER_DOMAIN_AUDIO>;
77+
clocks = <&infracfg CLK_INFRA_AUDIO>,
78+
<&topckgen CLK_TOP_AUDIO_SEL>,
79+
<&topckgen CLK_TOP_AUD_INTBUS_SEL>,
80+
<&topckgen CLK_TOP_APLL1_DIV0>,
81+
<&topckgen CLK_TOP_APLL2_DIV0>,
82+
<&topckgen CLK_TOP_I2S0_M_SEL>,
83+
<&topckgen CLK_TOP_I2S1_M_SEL>,
84+
<&topckgen CLK_TOP_I2S2_M_SEL>,
85+
<&topckgen CLK_TOP_I2S3_M_SEL>,
86+
<&topckgen CLK_TOP_I2S3_B_SEL>;
87+
clock-names = "infra_sys_audio_clk",
88+
"top_pdn_audio",
89+
"top_pdn_aud_intbus",
90+
"bck0",
91+
"bck1",
92+
"i2s0_m",
93+
"i2s1_m",
94+
"i2s2_m",
95+
"i2s3_m",
96+
"i2s3_b";
97+
memory-region = <&afe_dma_mem>;
98+
};

Documentation/devicetree/bindings/sound/mt8186-afe-pcm.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ properties:
2525
reset-names:
2626
const: audiosys
2727

28+
memory-region:
29+
description: memory region for audio DMA buffers
30+
maxItems: 1
31+
2832
mediatek,apmixedsys:
2933
$ref: /schemas/types.yaml#/definitions/phandle
3034
description: The phandle of the mediatek apmixedsys controller
@@ -170,6 +174,7 @@ examples:
170174
"top_apll12_div_tdm",
171175
"top_mux_audio_h",
172176
"top_clk26m_clk";
177+
memory-region = <&afe_dma_mem>;
173178
};
174179
175180
...

Documentation/devicetree/bindings/sound/mt8192-afe-pcm.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,10 @@ properties:
2323
reset-names:
2424
const: audiosys
2525

26+
memory-region:
27+
description: memory region for audio DMA buffers
28+
maxItems: 1
29+
2630
mediatek,apmixedsys:
2731
$ref: /schemas/types.yaml#/definitions/phandle
2832
description: The phandle of the mediatek apmixedsys controller
@@ -95,6 +99,7 @@ examples:
9599
"aud_dac_predis_clk",
96100
"aud_infra_clk",
97101
"aud_infra_26m_clk";
102+
memory-region = <&afe_dma_mem>;
98103
};
99104
100105
...

Documentation/devicetree/bindings/sound/mtk-afe-pcm.txt

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

Documentation/devicetree/bindings/sound/mxs-audio-sgtl5000.txt

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

Documentation/devicetree/bindings/sound/qcom,lpass-va-macro.yaml

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@ properties:
4040

4141
clock-names:
4242
minItems: 1
43-
maxItems: 4
43+
items:
44+
- const: mclk
45+
- const: macro
46+
- const: dcodec
47+
- const: npl
4448

4549
clock-output-names:
4650
maxItems: 1
@@ -80,8 +84,7 @@ allOf:
8084
clocks:
8185
maxItems: 1
8286
clock-names:
83-
items:
84-
- const: mclk
87+
maxItems: 1
8588

8689
- if:
8790
properties:
@@ -94,10 +97,8 @@ allOf:
9497
minItems: 3
9598
maxItems: 3
9699
clock-names:
97-
items:
98-
- const: mclk
99-
- const: macro
100-
- const: dcodec
100+
minItems: 3
101+
maxItems: 3
101102

102103
- if:
103104
properties:
@@ -112,11 +113,8 @@ allOf:
112113
minItems: 4
113114
maxItems: 4
114115
clock-names:
115-
items:
116-
- const: mclk
117-
- const: macro
118-
- const: dcodec
119-
- const: npl
116+
minItems: 4
117+
maxItems: 4
120118

121119
- if:
122120
properties:
@@ -130,10 +128,8 @@ allOf:
130128
minItems: 3
131129
maxItems: 3
132130
clock-names:
133-
items:
134-
- const: mclk
135-
- const: macro
136-
- const: dcodec
131+
minItems: 3
132+
maxItems: 3
137133

138134
unevaluatedProperties: false
139135

0 commit comments

Comments
 (0)