Skip to content

Commit a98a9c1

Browse files
committed
ASoC: Updates for v6.15 This is a very big release due to a combination of some big new work, mainly new drivers and generic SoundWire support, and some wide ranging cleanup work that made small changes to a lot of drivers. - Morimoto-san has completed the conversion to use modern terminology for the clocking configuration, and several other cleanups with narrower impact. - All the power management operation configuration was updated to use current idioms by Takashi Iwai. - Clarification of the control operations from Charles Keepax. - Prepartory work for more generic SoundWire SCDA controls from Charles Keepax. - Support for AMD ACP 7.x, AWINC WM88166, Everest ES8388, Intel AVS PEAKVOL and GAIN DSP modules Mediatek MT8188 DMIC, NXP i.MX95, nVidia Tegra interconnects, Rockchip RK3588 S/PDIF, Texas Instruments SN012776 and TAS5770L, and Wolfson WM8904 DMICs, Some changes from the tip tree adding APIs needed by the AMD code are included, these were unfortunately rebased in the tip tree after being pulled in. There's also some regmap changes supporting the SCDA work and some devres refactoring that was pulled in to support other changes.
2 parents 41a5070 + 9ef52d5 commit a98a9c1

File tree

1,070 files changed

+24290
-10607
lines changed

Some content is hidden

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

1,070 files changed

+24290
-10607
lines changed

.mailmap

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ Antonio Quartulli <antonio@mandelbit.com> <antonio@open-mesh.com>
8888
Antonio Quartulli <antonio@mandelbit.com> <antonio.quartulli@open-mesh.com>
8989
Antonio Quartulli <antonio@mandelbit.com> <ordex@autistici.org>
9090
Antonio Quartulli <antonio@mandelbit.com> <ordex@ritirata.org>
91-
Antonio Quartulli <antonio@mandelbit.com> <antonio@openvpn.net>
9291
Antonio Quartulli <antonio@mandelbit.com> <a@unstable.cc>
9392
Anup Patel <anup@brainfault.org> <anup.patel@wdc.com>
9493
Archit Taneja <archit@ti.com>
@@ -282,6 +281,7 @@ Henrik Rydberg <rydberg@bitmath.org>
282281
Herbert Xu <herbert@gondor.apana.org.au>
283282
Huacai Chen <chenhuacai@kernel.org> <chenhc@lemote.com>
284283
Huacai Chen <chenhuacai@kernel.org> <chenhuacai@loongson.cn>
284+
Ike Panhc <ikepanhc@gmail.com> <ike.pan@canonical.com>
285285
J. Bruce Fields <bfields@fieldses.org> <bfields@redhat.com>
286286
J. Bruce Fields <bfields@fieldses.org> <bfields@citi.umich.edu>
287287
Jacob Shin <Jacob.Shin@amd.com>
@@ -692,6 +692,7 @@ Subbaraman Narayanamurthy <quic_subbaram@quicinc.com> <subbaram@codeaurora.org>
692692
Subhash Jadavani <subhashj@codeaurora.org>
693693
Sudarshan Rajagopalan <quic_sudaraja@quicinc.com> <sudaraja@codeaurora.org>
694694
Sudeep Holla <sudeep.holla@arm.com> Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
695+
Sumit Garg <sumit.garg@kernel.org> <sumit.garg@linaro.org>
695696
Sumit Semwal <sumit.semwal@ti.com>
696697
Surabhi Vishnoi <quic_svishnoi@quicinc.com> <svishnoi@codeaurora.org>
697698
Sven Eckelmann <sven@narfation.org> <seckelmann@datto.com>

Documentation/admin-guide/README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ Configuring the kernel
176176
values without prompting.
177177

178178
"make defconfig" Create a ./.config file by using the default
179-
symbol values from either arch/$ARCH/defconfig
179+
symbol values from either arch/$ARCH/configs/defconfig
180180
or arch/$ARCH/configs/${PLATFORM}_defconfig,
181181
depending on the architecture.
182182

Documentation/admin-guide/sysctl/kernel.rst

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -212,6 +212,17 @@ pid>/``).
212212
This value defaults to 0.
213213
214214

215+
core_sort_vma
216+
=============
217+
218+
The default coredump writes VMAs in address order. By setting
219+
``core_sort_vma`` to 1, VMAs will be written from smallest size
220+
to largest size. This is known to break at least elfutils, but
221+
can be handy when dealing with very large (and truncated)
222+
coredumps where the more useful debugging details are included
223+
in the smaller VMAs.
224+
225+
215226
core_uses_pid
216227
=============
217228

Documentation/devicetree/bindings/iio/adc/adi,ad7606.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ properties:
146146
maxItems: 2
147147

148148
pwm-names:
149+
minItems: 1
149150
items:
150151
- const: convst1
151152
- const: convst2

Documentation/devicetree/bindings/input/touchscreen/imagis,ist3038c.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ properties:
1919
- imagis,ist3038
2020
- imagis,ist3038b
2121
- imagis,ist3038c
22+
- imagis,ist3038h
2223

2324
reg:
2425
maxItems: 1

Documentation/devicetree/bindings/mfd/motorola-cpcap.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ node must be named "audio-codec".
3131
Required properties for the audio-codec subnode:
3232

3333
- #sound-dai-cells = <1>;
34+
- interrupts : should contain jack detection interrupts, with headset
35+
detect interrupt matching "hs" and microphone bias 2
36+
detect interrupt matching "mb2" in interrupt-names.
37+
- interrupt-names : Contains "hs", "mb2"
3438

3539
The audio-codec provides two DAIs. The first one is connected to the
3640
Stereo HiFi DAC and the second one is connected to the Voice DAC.
@@ -52,6 +56,8 @@ Example:
5256

5357
audio-codec {
5458
#sound-dai-cells = <1>;
59+
interrupts-extended = <&cpcap 9 0>, <&cpcap 10 0>;
60+
interrupt-names = "hs", "mb2";
5561

5662
/* HiFi */
5763
port@0 {

Documentation/devicetree/bindings/misc/atmel-ssc.txt

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

Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-codec.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,10 @@ properties:
102102
maxItems: 1
103103
description: GPIO to enable the external amplifier
104104

105+
hp-det-gpios:
106+
maxItems: 1
107+
description: GPIO for headphone/line-out detection
108+
105109
required:
106110
- "#sound-dai-cells"
107111
- compatible
@@ -251,8 +255,10 @@ allOf:
251255
allwinner,audio-routing:
252256
items:
253257
enum:
258+
- Headphone
254259
- LINEOUT
255260
- Line Out
261+
- Speaker
256262

257263
dmas:
258264
items:
Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/atmel,at91-ssc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Atmel Serial Synchronous Serial (SSC)
8+
9+
maintainers:
10+
- Andrei Simion <andrei.simion@microchip.com>
11+
12+
description:
13+
The Atmel Synchronous Serial Controller (SSC) provides a versatile
14+
synchronous communication link for audio and telecom applications,
15+
supporting protocols like I2S, Short Frame Sync, and Long Frame Sync.
16+
17+
properties:
18+
compatible:
19+
enum:
20+
- atmel,at91rm9200-ssc
21+
- atmel,at91sam9g45-ssc
22+
23+
reg:
24+
maxItems: 1
25+
26+
interrupts:
27+
maxItems: 1
28+
29+
clocks:
30+
maxItems: 1
31+
32+
clock-names:
33+
items:
34+
- const: pclk
35+
36+
dmas:
37+
items:
38+
- description: TX DMA Channel
39+
- description: RX DMA Channel
40+
41+
dma-names:
42+
items:
43+
- const: tx
44+
- const: rx
45+
46+
atmel,clk-from-rk-pin:
47+
description:
48+
Specify the clock source for the SSC (Synchronous Serial Controller)
49+
when operating in slave mode. By default, the clock is sourced from
50+
the TK pin.
51+
type: boolean
52+
53+
"#sound-dai-cells":
54+
const: 0
55+
56+
required:
57+
- compatible
58+
- reg
59+
- interrupts
60+
- clocks
61+
- clock-names
62+
63+
allOf:
64+
- $ref: dai-common.yaml#
65+
- if:
66+
properties:
67+
compatible:
68+
contains:
69+
enum:
70+
- atmel,at91sam9g45-ssc
71+
then:
72+
required:
73+
- dmas
74+
- dma-names
75+
76+
unevaluatedProperties: false
77+
78+
examples:
79+
- |
80+
#include <dt-bindings/clock/at91.h>
81+
#include <dt-bindings/dma/at91.h>
82+
#include <dt-bindings/interrupt-controller/irq.h>
83+
84+
ssc@100000 {
85+
compatible = "atmel,at91sam9g45-ssc";
86+
reg = <0x100000 0x4000>;
87+
interrupts = <28 IRQ_TYPE_LEVEL_HIGH 5>;
88+
dmas = <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
89+
AT91_XDMAC_DT_PERID(38))>,
90+
<&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) |
91+
AT91_XDMAC_DT_PERID(39))>;
92+
dma-names = "tx", "rx";
93+
clocks = <&pmc PMC_TYPE_PERIPHERAL 28>;
94+
clock-names = "pclk";
95+
#sound-dai-cells = <0>;
96+
};
97+
98+
ssc@c00000 {
99+
compatible = "atmel,at91rm9200-ssc";
100+
reg = <0xc00000 0x4000>;
101+
interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>;
102+
clocks = <&pmc PMC_TYPE_PERIPHERAL 14>;
103+
clock-names = "pclk";
104+
};
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/sound/atmel,at91sam9g20ek-wm8731.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Atmel at91sam9g20ek wm8731 audio complex
8+
9+
maintainers:
10+
- Balakrishnan Sambath <balakrishnan.s@microchip.com>
11+
12+
description:
13+
The audio complex configuration for Atmel at91sam9g20ek with WM8731 audio codec.
14+
15+
properties:
16+
compatible:
17+
const: atmel,at91sam9g20ek-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,audio-routing:
24+
$ref: /schemas/types.yaml#/definitions/non-unique-string-array
25+
description: A list of the connections between audio components.
26+
minItems: 2
27+
maxItems: 4
28+
items:
29+
enum:
30+
# Board Connectors
31+
- Ext Spk
32+
- Int Mic
33+
34+
# CODEC Pins
35+
- LOUT
36+
- ROUT
37+
- LHPOUT
38+
- RHPOUT
39+
- LLINEIN
40+
- RLINEIN
41+
- MICIN
42+
43+
atmel,ssc-controller:
44+
$ref: /schemas/types.yaml#/definitions/phandle
45+
description: The phandle of the SSC controller.
46+
47+
atmel,audio-codec:
48+
$ref: /schemas/types.yaml#/definitions/phandle
49+
description: The phandle of WM8731 audio codec.
50+
51+
required:
52+
- compatible
53+
- atmel,model
54+
- atmel,audio-routing
55+
- atmel,ssc-controller
56+
- atmel,audio-codec
57+
58+
additionalProperties: false
59+
60+
examples:
61+
- |
62+
sound {
63+
compatible = "atmel,at91sam9g20ek-wm8731-audio";
64+
pinctrl-names = "default";
65+
pinctrl-0 = <&pinctrl_pck0_as_mck>;
66+
atmel,model = "wm8731 @ AT91SAMG20EK";
67+
atmel,audio-routing =
68+
"Ext Spk", "LHPOUT",
69+
"Int Mic", "MICIN";
70+
atmel,ssc-controller = <&ssc0>;
71+
atmel,audio-codec = <&wm8731>;
72+
};

0 commit comments

Comments
 (0)