Skip to content

Commit 8304277

Browse files
authored
Merge branch 'rpi-6.6.y' into is6446
2 parents 9da3c21 + dfff383 commit 8304277

File tree

2,165 files changed

+39773
-17288
lines changed

Some content is hidden

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

2,165 files changed

+39773
-17288
lines changed

.github/ISSUE_TEMPLATE/bug_report.yml

+3
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,16 @@ body:
5252
- Raspberry Pi 4 Mod. B
5353
- Raspberry Pi 400
5454
- Raspberry Pi 5
55+
- Raspberry Pi 500
5556
- Raspberry Pi CM1
5657
- Raspberry Pi CM3
5758
- Raspberry Pi CM3 Lite
5859
- Raspberry Pi CM3+
5960
- Raspberry Pi CM3+ Lite
6061
- Raspberry Pi CM4
6162
- Raspberry Pi CM4 Lite
63+
- Raspberry Pi CM5
64+
- Raspberry Pi CM5 Lite
6265
- Other
6366
validations:
6467
required: true

.github/ISSUE_TEMPLATE/config.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
blank_issues_enabled: false
22
contact_links:
33
- name: "⛔ Question"
4-
url: https://www.raspberrypi.org/forums
4+
url: https://forums.raspberrypi.com
55
about: "Please do not use GitHub for asking questions. If you simply have a question, then the Raspberry Pi forums are the best place to ask it. Thanks in advance for helping us keep the issue tracker clean!"
6-
- name: "⛔ Problems with the Raspbian distribution packages"
6+
- name: "⛔ Problems with Raspberry Pi OS packages"
77
url: https://github.com/RPi-Distro/repo
8-
about: "If you have problems with the Raspbian distribution packages, please report them in the github.com/RPi-Distro/repo."
8+
about: "If you have problems with a Raspberry Pi OS package, please report them at https://github.com/RPi-Distro/repo."
99

Documentation/ABI/testing/sysfs-bus-pci

+11
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,17 @@ Description:
163163
will be present in sysfs. Writing 1 to this file
164164
will perform reset.
165165

166+
What: /sys/bus/pci/devices/.../reset_subordinate
167+
Date: October 2024
168+
169+
Description:
170+
This is visible only for bridge devices. If you want to reset
171+
all devices attached through the subordinate bus of a specific
172+
bridge device, writing 1 to this will try to do it. This will
173+
affect all devices attached to the system through this bridge
174+
similiar to writing 1 to their individual "reset" file, so use
175+
with caution.
176+
166177
What: /sys/bus/pci/devices/.../vpd
167178
Date: February 2008
168179
Contact: Ben Hutchings <[email protected]>

Documentation/ABI/testing/sysfs-fs-f2fs

+5-2
Original file line numberDiff line numberDiff line change
@@ -311,10 +311,13 @@ Description: Do background GC aggressively when set. Set to 0 by default.
311311
GC approach and turns SSR mode on.
312312
gc urgent low(2): lowers the bar of checking I/O idling in
313313
order to process outstanding discard commands and GC a
314-
little bit aggressively. uses cost benefit GC approach.
314+
little bit aggressively. always uses cost benefit GC approach,
315+
and will override age-threshold GC approach if ATGC is enabled
316+
at the same time.
315317
gc urgent mid(3): does GC forcibly in a period of given
316318
gc_urgent_sleep_time and executes a mid level of I/O idling check.
317-
uses cost benefit GC approach.
319+
always uses cost benefit GC approach, and will override
320+
age-threshold GC approach if ATGC is enabled at the same time.
318321

319322
What: /sys/fs/f2fs/<disk>/gc_urgent_sleep_time
320323
Date: August 2017

Documentation/ABI/testing/sysfs-fs-xfs

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /sys/fs/xfs/<disk>/log/log_head_lsn
22
Date: July 2014
33
KernelVersion: 3.17
4-
Contact: xfs@oss.sgi.com
4+
Contact: linux-xfs@vger.kernel.org
55
Description:
66
The log sequence number (LSN) of the current head of the
77
log. The LSN is exported in "cycle:basic block" format.
@@ -10,15 +10,15 @@ Users: xfstests
1010
What: /sys/fs/xfs/<disk>/log/log_tail_lsn
1111
Date: July 2014
1212
KernelVersion: 3.17
13-
Contact: xfs@oss.sgi.com
13+
Contact: linux-xfs@vger.kernel.org
1414
Description:
1515
The log sequence number (LSN) of the current tail of the
1616
log. The LSN is exported in "cycle:basic block" format.
1717

1818
What: /sys/fs/xfs/<disk>/log/reserve_grant_head
1919
Date: July 2014
2020
KernelVersion: 3.17
21-
Contact: xfs@oss.sgi.com
21+
Contact: linux-xfs@vger.kernel.org
2222
Description:
2323
The current state of the log reserve grant head. It
2424
represents the total log reservation of all currently
@@ -29,7 +29,7 @@ Users: xfstests
2929
What: /sys/fs/xfs/<disk>/log/write_grant_head
3030
Date: July 2014
3131
KernelVersion: 3.17
32-
Contact: xfs@oss.sgi.com
32+
Contact: linux-xfs@vger.kernel.org
3333
Description:
3434
The current state of the log write grant head. It
3535
represents the total log reservation of all currently

Documentation/RCU/stallwarn.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ ticks this GP)" indicates that this CPU has not taken any scheduling-clock
249249
interrupts during the current stalled grace period.
250250

251251
The "idle=" portion of the message prints the dyntick-idle state.
252-
The hex number before the first "/" is the low-order 12 bits of the
252+
The hex number before the first "/" is the low-order 16 bits of the
253253
dynticks counter, which will have an even-numbered value if the CPU
254254
is in dyntick-idle mode and an odd-numbered value otherwise. The hex
255255
number between the two "/"s is the value of the nesting, which will be

Documentation/admin-guide/blockdev/zram.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -328,7 +328,7 @@ as idle::
328328
From now on, any pages on zram are idle pages. The idle mark
329329
will be removed until someone requests access of the block.
330330
IOW, unless there is access request, those pages are still idle pages.
331-
Additionally, when CONFIG_ZRAM_MEMORY_TRACKING is enabled pages can be
331+
Additionally, when CONFIG_ZRAM_TRACK_ENTRY_ACTIME is enabled pages can be
332332
marked as idle based on how long (in seconds) it's been since they were
333333
last accessed::
334334

Documentation/admin-guide/media/building.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Please notice, however, that, if:
1515

1616
you should use the main media development tree ``master`` branch:
1717

18-
https://git.linuxtv.org/media_tree.git/
18+
https://git.linuxtv.org/media.git/
1919

2020
In this case, you may find some useful information at the
2121
`LinuxTv wiki pages <https://linuxtv.org/wiki>`_:

Documentation/admin-guide/media/saa7134.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Changes / Fixes
6767
Please mail to linux-media AT vger.kernel.org unified diffs against
6868
the linux media git tree:
6969

70-
https://git.linuxtv.org/media_tree.git/
70+
https://git.linuxtv.org/media.git/
7171

7272
This is done by committing a patch at a clone of the git tree and
7373
submitting the patch using ``git send-email``. Don't forget to

Documentation/arch/arm64/silicon-errata.rst

+3-2
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,9 @@ stable kernels.
244244
+----------------+-----------------+-----------------+-----------------------------+
245245
| Hisilicon | Hip08 SMMU PMCG | #162001800 | N/A |
246246
+----------------+-----------------+-----------------+-----------------------------+
247-
| Hisilicon | Hip08 SMMU PMCG | #162001900 | N/A |
248-
| | Hip09 SMMU PMCG | | |
247+
| Hisilicon | Hip{08,09,09A,10| #162001900 | N/A |
248+
| | ,10C,11} | | |
249+
| | SMMU PMCG | | |
249250
+----------------+-----------------+-----------------+-----------------------------+
250251
+----------------+-----------------+-----------------+-----------------------------+
251252
| Qualcomm Tech. | Kryo/Falkor v1 | E1003 | QCOM_FALKOR_ERRATUM_1003 |

Documentation/devicetree/bindings/clock/adi,axi-clkgen.yaml

+18-4
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,21 @@ properties:
2626
description:
2727
Specifies the reference clock(s) from which the output frequency is
2828
derived. This must either reference one clock if only the first clock
29-
input is connected or two if both clock inputs are connected.
30-
minItems: 1
31-
maxItems: 2
29+
input is connected or two if both clock inputs are connected. The last
30+
clock is the AXI bus clock that needs to be enabled so we can access the
31+
core registers.
32+
minItems: 2
33+
maxItems: 3
34+
35+
clock-names:
36+
oneOf:
37+
- items:
38+
- const: clkin1
39+
- const: s_axi_aclk
40+
- items:
41+
- const: clkin1
42+
- const: clkin2
43+
- const: s_axi_aclk
3244

3345
'#clock-cells':
3446
const: 0
@@ -40,6 +52,7 @@ required:
4052
- compatible
4153
- reg
4254
- clocks
55+
- clock-names
4356
- '#clock-cells'
4457

4558
additionalProperties: false
@@ -50,5 +63,6 @@ examples:
5063
compatible = "adi,axi-clkgen-2.00.a";
5164
#clock-cells = <0>;
5265
reg = <0xff000000 0x1000>;
53-
clocks = <&osc 1>;
66+
clocks = <&osc 1>, <&clkc 15>;
67+
clock-names = "clkin1", "s_axi_aclk";
5468
};

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ properties:
8787
adi,dsi-lanes:
8888
description: Number of DSI data lanes connected to the DSI host.
8989
$ref: /schemas/types.yaml#/definitions/uint32
90-
enum: [ 1, 2, 3, 4 ]
90+
enum: [ 2, 3, 4 ]
9191

9292
ports:
9393
description:

Documentation/devicetree/bindings/iio/dac/adi,ad3552r.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ properties:
2626
maxItems: 1
2727

2828
spi-max-frequency:
29-
maximum: 30000000
29+
maximum: 66000000
3030

3131
reset-gpios:
3232
maxItems: 1

Documentation/devicetree/bindings/media/i2c/sony,imx290.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ properties:
3030
- sony,imx290lqr # Colour
3131
- sony,imx290llr # Monochrome
3232
- sony,imx327lqr # Colour
33+
- sony,imx462lqr # Colour
34+
- sony,imx462llr # Monochrome
3335
- const: sony,imx290
3436
deprecated: true
3537

Documentation/devicetree/bindings/net/cdns,macb.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ properties:
5454
- cdns,np4-macb # NP4 SoC devices
5555
- microchip,sama7g5-emac # Microchip SAMA7G5 ethernet interface
5656
- microchip,sama7g5-gem # Microchip SAMA7G5 gigabit ethernet interface
57+
- raspberrypi,rp1-gem # Raspberry Pi RP1 gigabit ethernet interface
5758
- sifive,fu540-c000-gem # SiFive FU540-C000 SoC
5859
- cdns,emac # Generic
5960
- cdns,gem # Generic

Documentation/devicetree/bindings/net/fsl,fec.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,13 @@ properties:
182182
description:
183183
Register bits of stop mode control, the format is <&gpr req_gpr req_bit>.
184184

185+
fsl,pps-channel:
186+
$ref: /schemas/types.yaml#/definitions/uint32
187+
default: 0
188+
description:
189+
Specifies to which timer instance the PPS signal is routed.
190+
enum: [0, 1, 2, 3]
191+
185192
mdio:
186193
$ref: mdio.yaml#
187194
unevaluatedProperties: false

Documentation/devicetree/bindings/net/xlnx,axi-ethernet.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ properties:
6161
- gmii
6262
- rgmii
6363
- sgmii
64-
- 1000BaseX
64+
- 1000base-x
6565

6666
xlnx,phy-type:
6767
description:

Documentation/devicetree/bindings/serial/rs485.yaml

+9-10
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,15 @@ properties:
1818
description: prop-encoded-array <a b>
1919
$ref: /schemas/types.yaml#/definitions/uint32-array
2020
items:
21-
items:
22-
- description: Delay between rts signal and beginning of data sent in
23-
milliseconds. It corresponds to the delay before sending data.
24-
default: 0
25-
maximum: 100
26-
- description: Delay between end of data sent and rts signal in milliseconds.
27-
It corresponds to the delay after sending data and actual release
28-
of the line.
29-
default: 0
30-
maximum: 100
21+
- description: Delay between rts signal and beginning of data sent in
22+
milliseconds. It corresponds to the delay before sending data.
23+
default: 0
24+
maximum: 100
25+
- description: Delay between end of data sent and rts signal in milliseconds.
26+
It corresponds to the delay after sending data and actual release
27+
of the line.
28+
default: 0
29+
maximum: 100
3130

3231
rs485-rts-active-high:
3332
description: drive RTS high when sending (this is the default).

Documentation/devicetree/bindings/sound/davinci-mcasp-audio.yaml

+9-9
Original file line numberDiff line numberDiff line change
@@ -102,21 +102,21 @@ properties:
102102
default: 2
103103

104104
interrupts:
105-
anyOf:
106-
- minItems: 1
107-
items:
108-
- description: TX interrupt
109-
- description: RX interrupt
110-
- items:
111-
- description: common/combined interrupt
105+
minItems: 1
106+
maxItems: 2
112107

113108
interrupt-names:
114109
oneOf:
115-
- minItems: 1
110+
- description: TX interrupt
111+
const: tx
112+
- description: RX interrupt
113+
const: rx
114+
- description: TX and RX interrupts
116115
items:
117116
- const: tx
118117
- const: rx
119-
- const: common
118+
- description: Common/combined interrupt
119+
const: common
120120

121121
fck_parent:
122122
$ref: /schemas/types.yaml#/definitions/string

Documentation/devicetree/bindings/sound/mt6359.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ properties:
2323
Indicates how many data pins are used to transmit two channels of PDM
2424
signal. 0 means two wires, 1 means one wire. Default value is 0.
2525
enum:
26-
- 0 # one wire
27-
- 1 # two wires
26+
- 0 # two wires
27+
- 1 # one wire
2828

2929
mediatek,mic-type-0:
3030
$ref: /schemas/types.yaml#/definitions/uint32
@@ -53,9 +53,9 @@ additionalProperties: false
5353

5454
examples:
5555
- |
56-
mt6359codec: mt6359codec {
57-
mediatek,dmic-mode = <0>;
58-
mediatek,mic-type-0 = <2>;
56+
mt6359codec: audio-codec {
57+
mediatek,dmic-mode = <0>;
58+
mediatek,mic-type-0 = <2>;
5959
};
6060
6161
...

Documentation/devicetree/bindings/usb/snps,dwc3.yaml

+10
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,16 @@ properties:
231231
description: When set, disable u2mac linestate check during HS transmit
232232
type: boolean
233233

234+
snps,enhanced-nak-fs-quirk:
235+
description:
236+
When set, the controller schedules many more handshakes to Async FS
237+
endpoints, improving throughput when they frequently respond with NAKs.
238+
239+
snps,enhanced-nak-hs-quirk:
240+
description:
241+
When set, the controller schedules many more handshakes to Async HS
242+
endpoints, improving throughput when they frequently respond with NAKs.
243+
234244
snps,parkmode-disable-ss-quirk:
235245
description:
236246
When set, disable park mode for all Superspeed bus instances.

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -929,6 +929,8 @@ patternProperties:
929929
description: National Semiconductor
930930
"^nec,.*":
931931
description: NEC LCD Technologies, Ltd.
932+
"^neofidelity,.*":
933+
description: Neofidelity Inc.
932934
"^neonode,.*":
933935
description: Neonode Inc.
934936
"^netgear,.*":

Documentation/driver-api/gpio/drivers-on-gpio.rst

+6-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,12 @@ hardware descriptions such as device tree or ACPI:
2727
to the lines for a more permanent solution of this type.
2828

2929
- gpio-beeper: drivers/input/misc/gpio-beeper.c is used to provide a beep from
30-
an external speaker connected to a GPIO line.
30+
an external speaker connected to a GPIO line. (If the beep is controlled by
31+
off/on, for an actual PWM waveform, see pwm-gpio below.)
32+
33+
- pwm-gpio: drivers/pwm/pwm-gpio.c is used to toggle a GPIO with a high
34+
resolution timer producing a PWM waveform on the GPIO line, as well as
35+
Linux high resolution timers can do.
3136

3237
- extcon-gpio: drivers/extcon/extcon-gpio.c is used when you need to read an
3338
external connector status, such as a headset line for an audio driver or an

Documentation/filesystems/mount_api.rst

+2-1
Original file line numberDiff line numberDiff line change
@@ -766,7 +766,8 @@ process the parameters it is given.
766766

767767
* ::
768768

769-
bool fs_validate_description(const struct fs_parameter_description *desc);
769+
bool fs_validate_description(const char *name,
770+
const struct fs_parameter_description *desc);
770771

771772
This performs some validation checks on a parameter description. It
772773
returns true if the description is good and false if it is not. It will

Documentation/i2c/busses/i2c-i801.rst

+2
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ Supported adapters:
4848
* Intel Raptor Lake (PCH)
4949
* Intel Meteor Lake (SOC and PCH)
5050
* Intel Birch Stream (SOC)
51+
* Intel Arrow Lake (SOC)
52+
* Intel Panther Lake (SOC)
5153

5254
Datasheets: Publicly available at the Intel website
5355

Documentation/locking/seqlock.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Use seqcount_latch_t when the write side sections cannot be protected
153153
from interruption by readers. This is typically the case when the read
154154
side can be invoked from NMI handlers.
155155

156-
Check `raw_write_seqcount_latch()` for more information.
156+
Check `write_seqcount_latch()` for more information.
157157

158158

159159
.. _seqlock_t:

0 commit comments

Comments
 (0)