Skip to content

Commit a30a7a2

Browse files
tiwaitiwai
committed
Merge tag 'asoc-fix-v6.9-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.9 This is much larger than is ideal, partly due to your holiday but also due to several vendors having come in with relatively large fixes at similar times. It's all driver specific stuff. The meson fixes from Jerome fix some rare timing issues with blocking operations happening in triggers, plus the continuous clock support which fixes clocking for some platforms. The SOF series from Peter builds to the fix to avoid spurious resets of ChainDMA which triggered errors in cleanup paths with both PulseAudio and PipeWire, and there's also some simple new debugfs files from Pierre which make support a lot eaiser.
2 parents 39815cd + c5782bb commit a30a7a2

File tree

788 files changed

+10154
-4634
lines changed

Some content is hidden

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

788 files changed

+10154
-4634
lines changed

‎.mailmap

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Adam Oldham <[email protected]>
2020
Adam Radford <[email protected]>
2121
Adriana Reus <[email protected]> <[email protected]>
2222
Adrian Bunk <[email protected]>
23+
Ajay Kaher <[email protected]> <[email protected]>
2324
Akhil P Oommen <[email protected]> <[email protected]>
2425
Alan Cox <[email protected]>
2526
Alan Cox <[email protected]>
@@ -36,6 +37,7 @@ Alexei Avshalom Lazar <[email protected]> <[email protected]>
3637
Alexei Starovoitov <[email protected]> <[email protected]>
3738
Alexei Starovoitov <[email protected]> <[email protected]>
3839
Alexei Starovoitov <[email protected]> <[email protected]>
40+
Alexey Makhalov <[email protected]> <[email protected]>
3941
Alex Hung <[email protected]> <[email protected]>
4042
Alex Shi <[email protected]> <[email protected]>
4143
Alex Shi <[email protected]> <[email protected]>
@@ -110,6 +112,7 @@ Brendan Higgins <[email protected]> <[email protected]>
110112
Brian Avery <[email protected]>
111113
Brian King <[email protected]>
112114
Brian Silverman <[email protected]> <[email protected]>
115+
Bryan Tan <[email protected]> <[email protected]>
113116
Cai Huoqing <[email protected]> <[email protected]>
114117
Can Guo <[email protected]> <[email protected]>
115118
Carl Huang <[email protected]> <[email protected]>
@@ -340,7 +343,8 @@ Lee Jones <[email protected]> <[email protected]>
340343
Lee Jones <[email protected]> <[email protected]>
341344
Lee Jones <[email protected]> <[email protected]>
342345
Lee Jones <[email protected]> <[email protected]>
343-
Leonard Crestez <[email protected]> Leonard Crestez <[email protected]>
346+
Leonard Crestez <[email protected]> <[email protected]>
347+
Leonard Crestez <[email protected]> <[email protected]>
344348
Leonardo Bras <[email protected]> <[email protected]>
345349
Leonard Göhrs <[email protected]>
346350
Leonid I Ananiev <[email protected]>
@@ -497,7 +501,8 @@ Prasad Sodagudi <[email protected]> <[email protected]>
497501
Punit Agrawal <[email protected]> <[email protected]>
498502
Qais Yousef <[email protected]> <[email protected]>
499503
Qais Yousef <[email protected]> <[email protected]>
500-
Quentin Monnet <[email protected]> <[email protected]>
504+
Quentin Monnet <[email protected]> <[email protected]>
505+
Quentin Monnet <[email protected]> <[email protected]>
501506
Quentin Perret <[email protected]> <[email protected]>
502507
Rafael J. Wysocki <[email protected]> <[email protected]>
503508
Rajeev Nandan <[email protected]> <[email protected]>
@@ -527,6 +532,7 @@ Rocky Liao <[email protected]> <[email protected]>
527532
Roman Gushchin <[email protected]> <[email protected]>
528533
Roman Gushchin <[email protected]> <[email protected]>
529534
Roman Gushchin <[email protected]> <[email protected]>
535+
Ronak Doshi <[email protected]> <[email protected]>
530536
Muchun Song <[email protected]> <[email protected]>
531537
Muchun Song <[email protected]> <[email protected]>
532538
Ross Zwisler <[email protected]> <[email protected]>
@@ -649,6 +655,7 @@ Viresh Kumar <[email protected]> <[email protected]>
649655
Viresh Kumar <[email protected]> <[email protected]>
650656
Viresh Kumar <[email protected]> <[email protected]>
651657
Viresh Kumar <[email protected]> <[email protected]>
658+
Vishnu Dasa <[email protected]> <[email protected]>
652659
Vivek Aknurwar <[email protected]> <[email protected]>
653660
Vivien Didelot <[email protected]> <[email protected]>
654661
Vlad Dogaru <[email protected]> <[email protected]>

‎Documentation/admin-guide/kernel-parameters.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6599,7 +6599,7 @@
65996599
To turn off having tracepoints sent to printk,
66006600
echo 0 > /proc/sys/kernel/tracepoint_printk
66016601
Note, echoing 1 into this file without the
6602-
tracepoint_printk kernel cmdline option has no effect.
6602+
tp_printk kernel cmdline option has no effect.
66036603

66046604
The tp_printk_stop_on_boot (see below) can also be used
66056605
to stop the printing of events to console at

‎Documentation/admin-guide/mm/zswap.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ Setting this parameter to 100 will disable the hysteresis.
155155

156156
Some users cannot tolerate the swapping that comes with zswap store failures
157157
and zswap writebacks. Swapping can be disabled entirely (without disabling
158-
zswap itself) on a cgroup-basis as follows:
158+
zswap itself) on a cgroup-basis as follows::
159159

160160
echo 0 > /sys/fs/cgroup/<cgroup-name>/memory.zswap.writeback
161161

@@ -166,7 +166,7 @@ writeback (because the same pages might be rejected again and again).
166166
When there is a sizable amount of cold memory residing in the zswap pool, it
167167
can be advantageous to proactively write these cold pages to swap and reclaim
168168
the memory for other use cases. By default, the zswap shrinker is disabled.
169-
User can enable it as follows:
169+
User can enable it as follows::
170170

171171
echo Y > /sys/module/zswap/parameters/shrinker_enabled
172172

‎Documentation/arch/x86/resctrl.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ Memory b/w domain is L3 cache.
574574
MB:<cache_id0>=bandwidth0;<cache_id1>=bandwidth1;...
575575

576576
Memory bandwidth Allocation specified in MiBps
577-
---------------------------------------------
577+
----------------------------------------------
578578

579579
Memory bandwidth domain is L3 cache.
580580
::

‎Documentation/dev-tools/testing-overview.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,8 @@ Some of these tools are listed below:
104104
KASAN and can be used in production. See Documentation/dev-tools/kfence.rst
105105
* lockdep is a locking correctness validator. See
106106
Documentation/locking/lockdep-design.rst
107+
* Runtime Verification (RV) supports checking specific behaviours for a given
108+
subsystem. See Documentation/trace/rv/runtime-verification.rst
107109
* There are several other pieces of debug instrumentation in the kernel, many
108110
of which can be found in lib/Kconfig.debug
109111

‎Documentation/devicetree/bindings/clock/keystone-gate.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
Status: Unstable - ABI compatibility may be broken in the future
2-
31
Binding for Keystone gate control driver which uses PSC controller IP.
42

53
This binding uses the common clock binding[1].

‎Documentation/devicetree/bindings/clock/keystone-pll.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
Status: Unstable - ABI compatibility may be broken in the future
2-
31
Binding for keystone PLLs. The main PLL IP typically has a multiplier,
42
a divider and a post divider. The additional PLL IPs like ARMPLL, DDRPLL
53
and PAPLL are controlled by the memory mapped register where as the Main

‎Documentation/devicetree/bindings/clock/ti/adpll.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
Binding for Texas Instruments ADPLL clock.
22

3-
Binding status: Unstable - ABI compatibility may be broken in the future
4-
53
This binding uses the common clock binding[1]. It assumes a
64
register-mapped ADPLL with two to three selectable input clocks
75
and three to four children.

‎Documentation/devicetree/bindings/clock/ti/apll.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
Binding for Texas Instruments APLL clock.
22

3-
Binding status: Unstable - ABI compatibility may be broken in the future
4-
53
This binding uses the common clock binding[1]. It assumes a
64
register-mapped APLL with usually two selectable input clocks
75
(reference clock and bypass clock), with analog phase locked

‎Documentation/devicetree/bindings/clock/ti/autoidle.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
Binding for Texas Instruments autoidle clock.
22

3-
Binding status: Unstable - ABI compatibility may be broken in the future
4-
53
This binding uses the common clock binding[1]. It assumes a register mapped
64
clock which can be put to idle automatically by hardware based on the usage
75
and a configuration bit setting. Autoidle clock is never an individual

‎Documentation/devicetree/bindings/clock/ti/clockdomain.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
Binding for Texas Instruments clockdomain.
22

3-
Binding status: Unstable - ABI compatibility may be broken in the future
4-
53
This binding uses the common clock binding[1] in consumer role.
64
Every clock on TI SoC belongs to one clockdomain, but software
75
only needs this information for specific clocks which require

‎Documentation/devicetree/bindings/clock/ti/composite.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
Binding for TI composite clock.
22

3-
Binding status: Unstable - ABI compatibility may be broken in the future
4-
53
This binding uses the common clock binding[1]. It assumes a
64
register-mapped composite clock with multiple different sub-types;
75

‎Documentation/devicetree/bindings/clock/ti/divider.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
Binding for TI divider clock
22

3-
Binding status: Unstable - ABI compatibility may be broken in the future
4-
53
This binding uses the common clock binding[1]. It assumes a
64
register-mapped adjustable clock rate divider that does not gate and has
75
only one input clock or parent. By default the value programmed into

‎Documentation/devicetree/bindings/clock/ti/dpll.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
Binding for Texas Instruments DPLL clock.
22

3-
Binding status: Unstable - ABI compatibility may be broken in the future
4-
53
This binding uses the common clock binding[1]. It assumes a
64
register-mapped DPLL with usually two selectable input clocks
75
(reference clock and bypass clock), with digital phase locked

‎Documentation/devicetree/bindings/clock/ti/fapll.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
Binding for Texas Instruments FAPLL clock.
22

3-
Binding status: Unstable - ABI compatibility may be broken in the future
4-
53
This binding uses the common clock binding[1]. It assumes a
64
register-mapped FAPLL with usually two selectable input clocks
75
(reference clock and bypass clock), and one or more child

‎Documentation/devicetree/bindings/clock/ti/fixed-factor-clock.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
Binding for TI fixed factor rate clock sources.
22

3-
Binding status: Unstable - ABI compatibility may be broken in the future
4-
53
This binding uses the common clock binding[1], and also uses the autoidle
64
support from TI autoidle clock [2].
75

‎Documentation/devicetree/bindings/clock/ti/gate.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
Binding for Texas Instruments gate clock.
22

3-
Binding status: Unstable - ABI compatibility may be broken in the future
4-
53
This binding uses the common clock binding[1]. This clock is
64
quite much similar to the basic gate-clock [2], however,
75
it supports a number of additional features. If no register

‎Documentation/devicetree/bindings/clock/ti/interface.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
Binding for Texas Instruments interface clock.
22

3-
Binding status: Unstable - ABI compatibility may be broken in the future
4-
53
This binding uses the common clock binding[1]. This clock is
64
quite much similar to the basic gate-clock [2], however,
75
it supports a number of additional features, including

‎Documentation/devicetree/bindings/clock/ti/mux.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
Binding for TI mux clock.
22

3-
Binding status: Unstable - ABI compatibility may be broken in the future
4-
53
This binding uses the common clock binding[1]. It assumes a
64
register-mapped multiplexer with multiple input clock signals or
75
parents, one of which can be selected as output. This clock does not

‎Documentation/devicetree/bindings/dts-coding-style.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,8 @@ Example::
144144
#dma-cells = <1>;
145145
clocks = <&clock_controller 0>, <&clock_controller 1>;
146146
clock-names = "bus", "host";
147+
#address-cells = <1>;
148+
#size-cells = <1>;
147149
vendor,custom-property = <2>;
148150
status = "disabled";
149151

‎Documentation/devicetree/bindings/net/bluetooth/qualcomm-bluetooth.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,10 @@ properties:
9494

9595
local-bd-address: true
9696

97+
qcom,local-bd-address-broken:
98+
type: boolean
99+
description:
100+
boot firmware is incorrectly passing the address in big-endian order
97101

98102
required:
99103
- compatible

‎Documentation/devicetree/bindings/remoteproc/ti,davinci-rproc.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
TI Davinci DSP devices
22
=======================
33

4-
Binding status: Unstable - Subject to changes for DT representation of clocks
5-
and resets
6-
74
The TI Davinci family of SoCs usually contains a TI DSP Core sub-system that
85
is used to offload some of the processor-intensive tasks or algorithms, for
96
achieving various system level goals.

‎Documentation/devicetree/bindings/soc/fsl/fsl,layerscape-dcfg.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ properties:
5151
ranges: true
5252

5353
patternProperties:
54-
"^clock-controller@[0-9a-z]+$":
54+
"^clock-controller@[0-9a-f]+$":
5555
$ref: /schemas/clock/fsl,flexspi-clock.yaml#
5656

5757
required:

‎Documentation/devicetree/bindings/soc/fsl/fsl,layerscape-scfg.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ properties:
4141
ranges: true
4242

4343
patternProperties:
44-
"^interrupt-controller@[a-z0-9]+$":
44+
"^interrupt-controller@[a-f0-9]+$":
4545
$ref: /schemas/interrupt-controller/fsl,ls-extirq.yaml#
4646

4747
required:

‎Documentation/devicetree/bindings/sound/rt5645.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,11 @@ Optional properties:
2020
a GPIO spec for the external headphone detect pin. If jd-mode = 0,
2121
we will get the JD status by getting the value of hp-detect-gpios.
2222

23+
- cbj-sleeve-gpios:
24+
a GPIO spec to control the external combo jack circuit to tie the sleeve/ring2
25+
contacts to the ground or floating. It could avoid some electric noise from the
26+
active speaker jacks.
27+
2328
- realtek,in2-differential
2429
Boolean. Indicate MIC2 input are differential, rather than single-ended.
2530

@@ -68,6 +73,7 @@ codec: rt5650@1a {
6873
compatible = "realtek,rt5650";
6974
reg = <0x1a>;
7075
hp-detect-gpios = <&gpio 19 0>;
76+
cbj-sleeve-gpios = <&gpio 20 0>;
7177
interrupt-parent = <&gpio>;
7278
interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
7379
realtek,dmic-en = "true";

‎Documentation/devicetree/bindings/timer/arm,arch_timer_mmio.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ properties:
6060
be implemented in an always-on power domain."
6161

6262
patternProperties:
63-
'^frame@[0-9a-z]*$':
63+
'^frame@[0-9a-f]+$':
6464
type: object
6565
additionalProperties: false
6666
description: A timer node has up to 8 frame sub-nodes, each with the following properties.

‎Documentation/devicetree/bindings/ufs/qcom,ufs.yaml

Lines changed: 34 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,13 @@ properties:
2727
- qcom,msm8996-ufshc
2828
- qcom,msm8998-ufshc
2929
- qcom,sa8775p-ufshc
30+
- qcom,sc7180-ufshc
3031
- qcom,sc7280-ufshc
32+
- qcom,sc8180x-ufshc
3133
- qcom,sc8280xp-ufshc
3234
- qcom,sdm845-ufshc
3335
- qcom,sm6115-ufshc
36+
- qcom,sm6125-ufshc
3437
- qcom,sm6350-ufshc
3538
- qcom,sm8150-ufshc
3639
- qcom,sm8250-ufshc
@@ -42,11 +45,11 @@ properties:
4245
- const: jedec,ufs-2.0
4346

4447
clocks:
45-
minItems: 8
48+
minItems: 7
4649
maxItems: 11
4750

4851
clock-names:
49-
minItems: 8
52+
minItems: 7
5053
maxItems: 11
5154

5255
dma-coherent: true
@@ -112,6 +115,31 @@ required:
112115
allOf:
113116
- $ref: ufs-common.yaml
114117

118+
- if:
119+
properties:
120+
compatible:
121+
contains:
122+
enum:
123+
- qcom,sc7180-ufshc
124+
then:
125+
properties:
126+
clocks:
127+
minItems: 7
128+
maxItems: 7
129+
clock-names:
130+
items:
131+
- const: core_clk
132+
- const: bus_aggr_clk
133+
- const: iface_clk
134+
- const: core_clk_unipro
135+
- const: ref_clk
136+
- const: tx_lane0_sync_clk
137+
- const: rx_lane0_sync_clk
138+
reg:
139+
maxItems: 1
140+
reg-names:
141+
maxItems: 1
142+
115143
- if:
116144
properties:
117145
compatible:
@@ -120,6 +148,7 @@ allOf:
120148
- qcom,msm8998-ufshc
121149
- qcom,sa8775p-ufshc
122150
- qcom,sc7280-ufshc
151+
- qcom,sc8180x-ufshc
123152
- qcom,sc8280xp-ufshc
124153
- qcom,sm8250-ufshc
125154
- qcom,sm8350-ufshc
@@ -215,6 +244,7 @@ allOf:
215244
contains:
216245
enum:
217246
- qcom,sm6115-ufshc
247+
- qcom,sm6125-ufshc
218248
then:
219249
properties:
220250
clocks:
@@ -248,15 +278,15 @@ allOf:
248278
reg:
249279
maxItems: 1
250280
clocks:
251-
minItems: 8
281+
minItems: 7
252282
maxItems: 8
253283
else:
254284
properties:
255285
reg:
256286
minItems: 1
257287
maxItems: 2
258288
clocks:
259-
minItems: 8
289+
minItems: 7
260290
maxItems: 11
261291

262292
unevaluatedProperties: false

‎Documentation/kbuild/llvm.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ yet. Bug reports are always welcome at the issue tracker below!
178178
- ``LLVM=1``
179179
* - s390
180180
- Maintained
181-
- ``CC=clang``
181+
- ``LLVM=1`` (LLVM >= 18.1.0), ``CC=clang`` (LLVM < 18.1.0)
182182
* - um (User Mode)
183183
- Maintained
184184
- ``LLVM=1``

0 commit comments

Comments
 (0)