Skip to content

Commit 33e02dc

Browse files
committed
Merge tag 'sound-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound updates from Takashi Iwai: "This one became bigger than usual, not in the total size but rather containing lots of small changes all over the places. The majority of changes are about ASoC, especially SOF / Intel stuff, and we see an interesting work for ASoC DAPM graph visualization, while there are many other code cleanup and refactoring, too. Core: - A deadlock fix at device disconnection - A new tool dapm-graph for visualising the DAPM state ASoC: - Large updates throughout the Intel audio drivers - Fixes and clarifications for the DAPM documentation - Cleanups of accessors for driver data, module labelling, and for constification - Modernsation and cleanup work in the Mediatek drivers - Several fixes and features for the DaVinci I2S driver - New drivers for several AMD and Intel platforms, Nuvoton NAU8325, Rockchip RK3308 and Texas Instruments PCM6240 HD-audio: - Cleanup for CONFIG_PM dependencies - Cirrus HD-audio codec fixes and quirks Others: - Series of tree-wide fixes in Makefiles to use *-y - Additions of missing module descriptions - Scarlett2 USB mixer enhancements - A series of legacy emu10k1 fixes and improvements" * tag 'sound-6.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (603 commits) ALSA: hda/realtek: Drop doubly quirk entry for 103c:8a2e ALSA: hda/realtek - fixed headset Mic not show ASoC: SOF: amd: Fix build error with built-in config ALSA: scarlett2: Increase mixer range to +12dB ALSA: scarlett2: Add S/PDIF source selection controls ALSA: core: Remove superfluous CONFIG_PM ALSA: Fix deadlocks with kctl removals at disconnection ASoC: audio-graph-card2: call of_node_get() before of_get_next_child() ASoC: SOF: amd: Correct spaces in Makefile ASoC: rt715-sdca-sdw: Fix wrong complete waiting in rt715_dev_resume() ASoC: Intel: sof_sdw_rt_amp: use dai parameter ASoC: Intel: sof_sdw: add dai parameter to rtd_init callback ASoC: Intel: sof_sdw: use .controls/.widgets to add controls/widgets ASoC: Intel: sof_sdw: add controls and dapm widgets in codec_info ASoC: Intel: sof_sdw: use generic name for controls/widgets ASoC: Intel: sof_sdw_cs_amp: rename Speakers to Speaker ASoC: Intel: maxim-common: change max98373 data to static ASoC: Intel: sof_sdw: add max98373 dapm routes ASoC: Intel: sof_rt5682: use max_98373_dai_link function ASoC: Intel: sof_nau8825: use max_98373_dai_link function ...
2 parents d346727 + d731b1e commit 33e02dc

File tree

814 files changed

+22111
-13761
lines changed

Some content is hidden

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

814 files changed

+22111
-13761
lines changed

Documentation/devicetree/bindings/sound/davinci-mcbsp.txt

Lines changed: 0 additions & 50 deletions
This file was deleted.
Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/davinci-mcbsp.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: McBSP Controller for TI SoCs
8+
9+
maintainers:
10+
- Bastien Curutchet <bastien.curutchet@bootlin.com>
11+
12+
allOf:
13+
- $ref: dai-common.yaml#
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- ti,da850-mcbsp
19+
20+
reg:
21+
minItems: 1
22+
items:
23+
- description: CFG registers
24+
- description: data registers
25+
26+
reg-names:
27+
minItems: 1
28+
items:
29+
- const: mpu
30+
- const: dat
31+
32+
dmas:
33+
items:
34+
- description: transmission DMA channel
35+
- description: reception DMA channel
36+
37+
dma-names:
38+
items:
39+
- const: tx
40+
- const: rx
41+
42+
interrupts:
43+
items:
44+
- description: RX interrupt
45+
- description: TX interrupt
46+
47+
interrupt-names:
48+
items:
49+
- const: rx
50+
- const: tx
51+
52+
clocks:
53+
minItems: 1
54+
items:
55+
- description: functional clock
56+
- description: external input clock for sample rate generator.
57+
58+
clock-names:
59+
minItems: 1
60+
items:
61+
- const: fck
62+
- const: clks
63+
64+
power-domains:
65+
maxItems: 1
66+
67+
"#sound-dai-cells":
68+
const: 0
69+
70+
ti,T1-framing-tx:
71+
$ref: /schemas/types.yaml#/definitions/flag
72+
description:
73+
If the property is present, tx data delay is set to 2 bit clock periods.
74+
McBSP will insert a blank period (high-impedance period) before the first
75+
data bit. This can be used to interface to T1-framing devices.
76+
77+
ti,T1-framing-rx:
78+
$ref: /schemas/types.yaml#/definitions/flag
79+
description:
80+
If the property is present, rx data delay is set to 2 bit clock periods.
81+
McBSP will discard the bit preceding the data stream (called framing bit).
82+
This can be used to interface to T1-framing devices.
83+
84+
required:
85+
- "#sound-dai-cells"
86+
- compatible
87+
- reg
88+
- reg-names
89+
- dmas
90+
- dma-names
91+
- clocks
92+
93+
unevaluatedProperties: false
94+
95+
examples:
96+
- |
97+
mcbsp0@1d10000 {
98+
#sound-dai-cells = <0>;
99+
compatible = "ti,da850-mcbsp";
100+
pinctrl-names = "default";
101+
pinctrl-0 = <&mcbsp0_pins>;
102+
103+
reg = <0x111000 0x1000>,
104+
<0x311000 0x1000>;
105+
reg-names = "mpu", "dat";
106+
interrupts = <97>, <98>;
107+
interrupt-names = "rx", "tx";
108+
dmas = <&edma0 3 1>,
109+
<&edma0 2 1>;
110+
dma-names = "tx", "rx";
111+
112+
clocks = <&psc1 14>;
113+
};

Documentation/devicetree/bindings/sound/fsl,audmix.txt

Lines changed: 0 additions & 50 deletions
This file was deleted.
Lines changed: 83 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,83 @@
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,audmix.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NXP Audio Mixer (AUDMIX).
8+
9+
maintainers:
10+
- Shengjiu Wang <shengjiu.wang@nxp.com>
11+
- Frank Li <Frank.Li@nxp.com>
12+
13+
description: |
14+
The Audio Mixer is a on-chip functional module that allows mixing of two
15+
audio streams into a single audio stream. Audio Mixer has two input serial
16+
audio interfaces. These are driven by two Synchronous Audio interface
17+
modules (SAI). Each input serial interface carries 8 audio channels in its
18+
frame in TDM manner. Mixer mixes audio samples of corresponding channels
19+
from two interfaces into a single sample. Before mixing, audio samples of
20+
two inputs can be attenuated based on configuration. The output of the
21+
Audio Mixer is also a serial audio interface. Like input interfaces it has
22+
the same TDM frame format. This output is used to drive the serial DAC TDM
23+
interface of audio codec and also sent to the external pins along with the
24+
receive path of normal audio SAI module for readback by the CPU.
25+
26+
The output of Audio Mixer can be selected from any of the three streams
27+
- serial audio input 1
28+
- serial audio input 2
29+
- mixed audio
30+
31+
Mixing operation is independent of audio sample rate but the two audio
32+
input streams must have same audio sample rate with same number of channels
33+
in TDM frame to be eligible for mixing.
34+
35+
properties:
36+
compatible:
37+
const: fsl,imx8qm-audmix
38+
39+
reg:
40+
maxItems: 1
41+
42+
clocks:
43+
maxItems: 1
44+
45+
clock-names:
46+
items:
47+
- const: ipg
48+
49+
power-domains:
50+
maxItems: 1
51+
52+
dais:
53+
description: contain a list of phandles to AUDMIX connected DAIs.
54+
$ref: /schemas/types.yaml#/definitions/phandle-array
55+
minItems: 2
56+
items:
57+
- description: the AUDMIX output
58+
maxItems: 1
59+
- description: serial audio input 1
60+
maxItems: 1
61+
- description: serial audio input 2
62+
maxItems: 1
63+
64+
required:
65+
- compatible
66+
- reg
67+
- clocks
68+
- clock-names
69+
- power-domains
70+
- dais
71+
72+
unevaluatedProperties: false
73+
74+
examples:
75+
- |
76+
audmix@59840000 {
77+
compatible = "fsl,imx8qm-audmix";
78+
reg = <0x59840000 0x10000>;
79+
clocks = <&amix_lpcg 0>;
80+
clock-names = "ipg";
81+
power-domains = <&pd_audmix>;
82+
dais = <&sai4>, <&sai5>;
83+
};

Documentation/devicetree/bindings/sound/fsl,esai.txt

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

0 commit comments

Comments
 (0)