Skip to content

Commit 5640fd0

Browse files
committed
spi: Merge up v6.13-rc6
This fixes the i.MX6 and newer Meson platforms in my CI.
2 parents a38509f + 9d89551 commit 5640fd0

File tree

838 files changed

+13609
-8179
lines changed

Some content is hidden

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

838 files changed

+13609
-8179
lines changed

.mailmap

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ Martin Kepplinger <martink@posteo.de> <martin.kepplinger@ginzinger.com>
435435
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@puri.sm>
436436
Martin Kepplinger <martink@posteo.de> <martin.kepplinger@theobroma-systems.com>
437437
Martyna Szapar-Mudlaw <martyna.szapar-mudlaw@linux.intel.com> <martyna.szapar-mudlaw@intel.com>
438-
Mathieu Othacehe <m.othacehe@gmail.com> <othacehe@gnu.org>
438+
Mathieu Othacehe <othacehe@gnu.org> <m.othacehe@gmail.com>
439439
Mat Martineau <martineau@kernel.org> <mathew.j.martineau@linux.intel.com>
440440
Mat Martineau <martineau@kernel.org> <mathewm@codeaurora.org>
441441
Matthew Wilcox <willy@infradead.org> <matthew.r.wilcox@intel.com>
@@ -735,6 +735,7 @@ Wolfram Sang <wsa@kernel.org> <w.sang@pengutronix.de>
735735
Wolfram Sang <wsa@kernel.org> <wsa@the-dreams.de>
736736
Yakir Yang <kuankuan.y@gmail.com> <ykk@rock-chips.com>
737737
Yanteng Si <si.yanteng@linux.dev> <siyanteng@loongson.cn>
738+
Ying Huang <huang.ying.caritas@gmail.com> <ying.huang@intel.com>
738739
Yusuke Goda <goda.yusuke@renesas.com>
739740
Zack Rusin <zack.rusin@broadcom.com> <zackr@vmware.com>
740741
Zhu Yanjun <zyjzyj2000@gmail.com> <yanjunz@nvidia.com>

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4822,6 +4822,11 @@
48224822
can be preempted anytime. Tasks will also yield
48234823
contended spinlocks (if the critical section isn't
48244824
explicitly preempt disabled beyond the lock itself).
4825+
lazy - Scheduler controlled. Similar to full but instead
4826+
of preempting the task immediately, the task gets
4827+
one HZ tick time to yield itself before the
4828+
preemption will be forced. One preemption is when the
4829+
task returns to user space.
48254830

48264831
print-fatal-signals=
48274832
[KNL] debug: print fatal signals

Documentation/admin-guide/laptops/thinkpad-acpi.rst

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -445,8 +445,10 @@ event code Key Notes
445445
0x1008 0x07 FN+F8 IBM: toggle screen expand
446446
Lenovo: configure UltraNav,
447447
or toggle screen expand.
448-
On newer platforms (2024+)
449-
replaced by 0x131f (see below)
448+
On 2024 platforms replaced by
449+
0x131f (see below) and on newer
450+
platforms (2025 +) keycode is
451+
replaced by 0x1401 (see below).
450452

451453
0x1009 0x08 FN+F9 -
452454

@@ -506,9 +508,11 @@ event code Key Notes
506508

507509
0x1019 0x18 unknown
508510

509-
0x131f ... FN+F8 Platform Mode change.
511+
0x131f ... FN+F8 Platform Mode change (2024 systems).
510512
Implemented in driver.
511513

514+
0x1401 ... FN+F8 Platform Mode change (2025 + systems).
515+
Implemented in driver.
512516
... ... ...
513517

514518
0x1020 0x1F unknown

Documentation/admin-guide/mm/transhuge.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -436,7 +436,7 @@ AnonHugePmdMapped).
436436
The number of file transparent huge pages mapped to userspace is available
437437
by reading ShmemPmdMapped and ShmemHugePages fields in ``/proc/meminfo``.
438438
To identify what applications are mapping file transparent huge pages, it
439-
is necessary to read ``/proc/PID/smaps`` and count the FileHugeMapped fields
439+
is necessary to read ``/proc/PID/smaps`` and count the FilePmdMapped fields
440440
for each mapping.
441441

442442
Note that reading the smaps file is expensive and reading it

Documentation/admin-guide/pm/amd-pstate.rst

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,9 +251,7 @@ performance supported in `AMD CPPC Performance Capability <perf_cap_>`_).
251251
In some ASICs, the highest CPPC performance is not the one in the ``_CPC``
252252
table, so we need to expose it to sysfs. If boost is not active, but
253253
still supported, this maximum frequency will be larger than the one in
254-
``cpuinfo``. On systems that support preferred core, the driver will have
255-
different values for some cores than others and this will reflect the values
256-
advertised by the platform at bootup.
254+
``cpuinfo``.
257255
This attribute is read-only.
258256

259257
``amd_pstate_lowest_nonlinear_freq``

Documentation/devicetree/bindings/crypto/fsl,sec-v4.0.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,9 @@ patternProperties:
114114
table that specifies the PPID to LIODN mapping. Needed if the PAMU is
115115
used. Value is a 12 bit value where value is a LIODN ID for this JR.
116116
This property is normally set by boot firmware.
117-
$ref: /schemas/types.yaml#/definitions/uint32
118-
maximum: 0xfff
117+
$ref: /schemas/types.yaml#/definitions/uint32-array
118+
items:
119+
- maximum: 0xfff
119120

120121
'^rtic@[0-9a-f]+$':
121122
type: object
@@ -186,8 +187,9 @@ patternProperties:
186187
Needed if the PAMU is used. Value is a 12 bit value where value
187188
is a LIODN ID for this JR. This property is normally set by boot
188189
firmware.
189-
$ref: /schemas/types.yaml#/definitions/uint32
190-
maximum: 0xfff
190+
$ref: /schemas/types.yaml#/definitions/uint32-array
191+
items:
192+
- maximum: 0xfff
191193

192194
fsl,rtic-region:
193195
description:

Documentation/devicetree/bindings/display/bridge/adi,adv7533.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ properties:
9090
adi,dsi-lanes:
9191
description: Number of DSI data lanes connected to the DSI host.
9292
$ref: /schemas/types.yaml#/definitions/uint32
93-
enum: [ 1, 2, 3, 4 ]
93+
enum: [ 2, 3, 4 ]
9494

9595
"#sound-dai-cells":
9696
const: 0

Documentation/devicetree/bindings/mtd/partitions/fixed-partitions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ examples:
8282
8383
uimage@100000 {
8484
reg = <0x0100000 0x200000>;
85-
compress = "lzma";
85+
compression = "lzma";
8686
};
8787
};
8888

Documentation/devicetree/bindings/phy/fsl,imx8mq-usb-phy.yaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,8 @@ allOf:
113113
maxItems: 1
114114

115115
- if:
116-
properties:
117-
compatible:
118-
contains:
119-
enum:
120-
- fsl,imx95-usb-phy
116+
required:
117+
- orientation-switch
121118
then:
122119
$ref: /schemas/usb/usb-switch.yaml#
123120

Documentation/devicetree/bindings/regulator/qcom,qca6390-pmu.yaml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
compatible:
1919
enum:
2020
- qcom,qca6390-pmu
21+
- qcom,wcn6750-pmu
2122
- qcom,wcn6855-pmu
2223
- qcom,wcn7850-pmu
2324

@@ -27,6 +28,9 @@ properties:
2728
vddaon-supply:
2829
description: VDD_AON supply regulator handle
2930

31+
vddasd-supply:
32+
description: VDD_ASD supply regulator handle
33+
3034
vdddig-supply:
3135
description: VDD_DIG supply regulator handle
3236

@@ -42,6 +46,9 @@ properties:
4246
vddio1p2-supply:
4347
description: VDD_IO_1P2 supply regulator handle
4448

49+
vddrfa0p8-supply:
50+
description: VDD_RFA_0P8 supply regulator handle
51+
4552
vddrfa0p95-supply:
4653
description: VDD_RFA_0P95 supply regulator handle
4754

@@ -51,12 +58,18 @@ properties:
5158
vddrfa1p3-supply:
5259
description: VDD_RFA_1P3 supply regulator handle
5360

61+
vddrfa1p7-supply:
62+
description: VDD_RFA_1P7 supply regulator handle
63+
5464
vddrfa1p8-supply:
5565
description: VDD_RFA_1P8 supply regulator handle
5666

5767
vddrfa1p9-supply:
5868
description: VDD_RFA_1P9 supply regulator handle
5969

70+
vddrfa2p2-supply:
71+
description: VDD_RFA_2P2 supply regulator handle
72+
6073
vddpcie1p3-supply:
6174
description: VDD_PCIE_1P3 supply regulator handle
6275

@@ -119,6 +132,20 @@ allOf:
119132
- vddpcie1p3-supply
120133
- vddpcie1p9-supply
121134
- vddio-supply
135+
- if:
136+
properties:
137+
compatible:
138+
contains:
139+
const: qcom,wcn6750-pmu
140+
then:
141+
required:
142+
- vddaon-supply
143+
- vddasd-supply
144+
- vddpmu-supply
145+
- vddrfa0p8-supply
146+
- vddrfa1p2-supply
147+
- vddrfa1p7-supply
148+
- vddrfa2p2-supply
122149
- if:
123150
properties:
124151
compatible:

0 commit comments

Comments
 (0)