Skip to content

Commit 2733634

Browse files
tiwaitiwai
committed
Merge tag 'asoc-fix-v6.19-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.19 A couple of device IDs and a couple of small fixes, nothing hugely remarkable.
2 parents 630fbc6 + 018b211 commit 2733634

309 files changed

Lines changed: 3474 additions & 2001 deletions

File tree

Some content is hidden

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

‎.mailmap‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,7 @@ Daniel Borkmann <daniel@iogearbox.net> <daniel.borkmann@tik.ee.ethz.ch>
207207
Daniel Borkmann <daniel@iogearbox.net> <dborkmann@redhat.com>
208208
Daniel Borkmann <daniel@iogearbox.net> <dborkman@redhat.com>
209209
Daniel Borkmann <daniel@iogearbox.net> <dxchgb@gmail.com>
210+
Daniel Thompson <danielt@kernel.org> <daniel.thompson@linaro.org>
210211
Danilo Krummrich <dakr@kernel.org> <dakr@redhat.com>
211212
David Brownell <david-b@pacbell.net>
212213
David Collins <quic_collinsd@quicinc.com> <collinsd@codeaurora.org>
@@ -794,6 +795,7 @@ Sven Eckelmann <sven@narfation.org> <sven.eckelmann@open-mesh.com>
794795
Sven Eckelmann <sven@narfation.org> <sven.eckelmann@openmesh.com>
795796
Sven Eckelmann <sven@narfation.org> <sven@open-mesh.com>
796797
Sven Peter <sven@kernel.org> <sven@svenpeter.dev>
798+
Szymon Wilczek <swilczek.lx@gmail.com> <szymonwilczek@gmx.com>
797799
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
798800
Tamizh Chelvam Raja <quic_tamizhr@quicinc.com> <tamizhr@codeaurora.org>
799801
Taniya Das <quic_tdas@quicinc.com> <tdas@codeaurora.org>

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

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2917,6 +2917,41 @@ Kernel parameters
29172917
for Movable pages. "nn[KMGTPE]", "nn%", and "mirror"
29182918
are exclusive, so you cannot specify multiple forms.
29192919

2920+
kfence.burst= [MM,KFENCE] The number of additional successive
2921+
allocations to be attempted through KFENCE for each
2922+
sample interval.
2923+
Format: <unsigned integer>
2924+
Default: 0
2925+
2926+
kfence.check_on_panic=
2927+
[MM,KFENCE] Whether to check all KFENCE-managed objects'
2928+
canaries on panic.
2929+
Format: <bool>
2930+
Default: false
2931+
2932+
kfence.deferrable=
2933+
[MM,KFENCE] Whether to use a deferrable timer to trigger
2934+
allocations. This avoids forcing CPU wake-ups if the
2935+
system is idle, at the risk of a less predictable
2936+
sample interval.
2937+
Format: <bool>
2938+
Default: CONFIG_KFENCE_DEFERRABLE
2939+
2940+
kfence.sample_interval=
2941+
[MM,KFENCE] KFENCE's sample interval in milliseconds.
2942+
Format: <unsigned integer>
2943+
0 - Disable KFENCE.
2944+
>0 - Enabled KFENCE with given sample interval.
2945+
Default: CONFIG_KFENCE_SAMPLE_INTERVAL
2946+
2947+
kfence.skip_covered_thresh=
2948+
[MM,KFENCE] If pool utilization reaches this threshold
2949+
(pool usage%), KFENCE limits currently covered
2950+
allocations of the same source from further filling
2951+
up the pool.
2952+
Format: <unsigned integer>
2953+
Default: 75
2954+
29202955
kgdbdbgp= [KGDB,HW,EARLY] kgdb over EHCI usb debug port.
29212956
Format: <Controller#>[,poll interval]
29222957
The controller # is the number of the ehci usb debug

‎Documentation/admin-guide/sysctl/net.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,14 @@ netdev_max_backlog
303303
Maximum number of packets, queued on the INPUT side, when the interface
304304
receives packets faster than kernel can process them.
305305

306+
qdisc_max_burst
307+
------------------
308+
309+
Maximum number of packets that can be temporarily stored before
310+
reaching qdisc.
311+
312+
Default: 1000
313+
306314
netdev_rss_key
307315
--------------
308316

‎Documentation/devicetree/bindings/i2c/brcm,iproc-i2c.yaml‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ properties:
1616
- brcm,iproc-nic-i2c
1717

1818
reg:
19-
maxItems: 1
19+
minItems: 1
20+
maxItems: 2
2021

2122
clock-frequency:
2223
enum: [ 100000, 400000 ]
@@ -41,8 +42,15 @@ allOf:
4142
contains:
4243
const: brcm,iproc-nic-i2c
4344
then:
45+
properties:
46+
reg:
47+
minItems: 2
4448
required:
4549
- brcm,ape-hsls-addr-mask
50+
else:
51+
properties:
52+
reg:
53+
maxItems: 1
4654

4755
unevaluatedProperties: false
4856

‎Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ properties:
5656

5757
clocks:
5858
minItems: 5
59-
maxItems: 7
59+
maxItems: 6
6060

6161
clock-names:
6262
minItems: 5
@@ -67,7 +67,6 @@ properties:
6767
- enum: [rchng, refgen]
6868
- const: pipe
6969
- const: pipediv2
70-
- const: phy_aux
7170

7271
power-domains:
7372
maxItems: 1
@@ -180,6 +179,7 @@ allOf:
180179
contains:
181180
enum:
182181
- qcom,glymur-qmp-gen5x4-pcie-phy
182+
- qcom,qcs8300-qmp-gen4x2-pcie-phy
183183
- qcom,sa8775p-qmp-gen4x2-pcie-phy
184184
- qcom,sa8775p-qmp-gen4x4-pcie-phy
185185
- qcom,sc8280xp-qmp-gen3x1-pcie-phy
@@ -197,19 +197,6 @@ allOf:
197197
clock-names:
198198
minItems: 6
199199

200-
- if:
201-
properties:
202-
compatible:
203-
contains:
204-
enum:
205-
- qcom,qcs8300-qmp-gen4x2-pcie-phy
206-
then:
207-
properties:
208-
clocks:
209-
minItems: 7
210-
clock-names:
211-
minItems: 7
212-
213200
- if:
214201
properties:
215202
compatible:

‎Documentation/devicetree/bindings/sound/fsl,sai.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ properties:
4444
- items:
4545
- enum:
4646
- fsl,imx94-sai
47+
- fsl,imx952-sai
4748
- const: fsl,imx95-sai
4849

4950
reg:

‎Documentation/devicetree/bindings/ufs/ufs-common.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ properties:
4848
enum: [1, 2]
4949
default: 2
5050
description:
51-
Number of lanes available per direction. Note that it is assume same
52-
number of lanes is used both directions at once.
51+
Number of lanes available per direction. Note that it is assumed that
52+
the same number of lanes are used in both directions at once.
5353

5454
vdd-hba-supply:
5555
description:

‎Documentation/devicetree/bindings/usb/qcom,dwc3.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,6 @@ allOf:
406406
compatible:
407407
contains:
408408
enum:
409-
- qcom,ipq5018-dwc3
410409
- qcom,ipq6018-dwc3
411410
- qcom,ipq8074-dwc3
412411
- qcom,msm8953-dwc3
@@ -428,6 +427,7 @@ allOf:
428427
compatible:
429428
contains:
430429
enum:
430+
- qcom,msm8994-dwc3
431431
- qcom,msm8996-dwc3
432432
- qcom,qcs404-dwc3
433433
- qcom,sdm660-dwc3
@@ -451,6 +451,7 @@ allOf:
451451
compatible:
452452
contains:
453453
enum:
454+
- qcom,ipq5018-dwc3
454455
- qcom,ipq5332-dwc3
455456
then:
456457
properties:
@@ -488,7 +489,6 @@ allOf:
488489
enum:
489490
- qcom,ipq4019-dwc3
490491
- qcom,ipq8064-dwc3
491-
- qcom,msm8994-dwc3
492492
- qcom,qcs615-dwc3
493493
- qcom,qcs8300-dwc3
494494
- qcom,qdu1000-dwc3

‎Documentation/devicetree/bindings/usb/qcom,snps-dwc3.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,6 @@ allOf:
420420
compatible:
421421
contains:
422422
enum:
423-
- qcom,ipq5018-dwc3
424423
- qcom,ipq6018-dwc3
425424
- qcom,ipq8074-dwc3
426425
- qcom,msm8953-dwc3
@@ -443,6 +442,7 @@ allOf:
443442
compatible:
444443
contains:
445444
enum:
445+
- qcom,msm8994-dwc3
446446
- qcom,msm8996-dwc3
447447
- qcom,qcs404-dwc3
448448
- qcom,sdm660-dwc3
@@ -467,6 +467,7 @@ allOf:
467467
compatible:
468468
contains:
469469
enum:
470+
- qcom,ipq5018-dwc3
470471
- qcom,ipq5332-dwc3
471472
then:
472473
properties:
@@ -509,7 +510,6 @@ allOf:
509510
- qcom,ipq4019-dwc3
510511
- qcom,ipq8064-dwc3
511512
- qcom,kaanapali-dwc3
512-
- qcom,msm8994-dwc3
513513
- qcom,qcs615-dwc3
514514
- qcom,qcs8300-dwc3
515515
- qcom,qdu1000-dwc3

0 commit comments

Comments
 (0)