Skip to content

Commit e03ad65

Browse files
author
Wolfram Sang
committed
Merge tag 'i2c-host-fixes-6.11-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux into i2c/for-current
The Aspeed driver tracks the controller's state (stop, pending, start, etc.). Previously, when the stop command was sent, the state was not updated. The fix in this pull request ensures the driver's state is aligned with the device status. The Intel SCH driver receives a new look, and among the cleanups, there is a fix where, due to an oversight, an if/else statement was missing the else, causing it to move forward instead of exiting the function in case of an error. The Qualcomm GENI I2C driver adds the IRQF_NO_AUTOEN flag to the IRQ setup to prevent unwanted interrupts during probe. The Xilinx XPS controller fixes TX FIFO handling to avoid missed NAKs. Another fix ensures the controller is reinitialized when the bus appears busy.
2 parents 5be63fc + e2c85d8 commit e03ad65

File tree

602 files changed

+6118
-3345
lines changed

Some content is hidden

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

602 files changed

+6118
-3345
lines changed

.mailmap

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ Amit Nischal <[email protected]> <[email protected]>
6060
6161
6262
Andreas Herrmann <[email protected]>
63+
6364
Andrej Shadura <[email protected]>
6465
6566
Andrew Morton <[email protected]>
@@ -269,6 +270,7 @@ James Ketrenos <jketreno@io.(none)>
269270
270271
271272
273+
272274
273275
274276
@@ -354,6 +356,8 @@ Kenneth Westfield <[email protected]> <[email protected]>
354356
355357
356358
Kishon Vijay Abraham I <[email protected]> <[email protected]>
359+
360+
357361
Konstantin Khlebnikov <[email protected]> <[email protected]>
358362
Konstantin Khlebnikov <[email protected]> <[email protected]>
359363
@@ -614,6 +618,7 @@ Simon Kelley <[email protected]>
614618
Sricharan Ramabadhran <[email protected]> <[email protected]>
615619
616620
621+
617622
Stanislav Fomichev <[email protected]> <[email protected]>
618623
619624
Stéphane Witzmann <[email protected]>

Documentation/ABI/testing/sysfs-timecard

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -258,24 +258,29 @@ Description: (RW) When retrieving the PHC with the PTP SYS_OFFSET_EXTENDED
258258
the estimated point where the FPGA latches the PHC time. This
259259
value may be changed by writing an unsigned integer.
260260

261-
What: /sys/class/timecard/ocpN/ttyGNSS
262-
What: /sys/class/timecard/ocpN/ttyGNSS2
263-
Date: September 2021
261+
What: /sys/class/timecard/ocpN/tty
262+
Date: August 2024
263+
Contact: Vadim Fedorenko <[email protected]>
264+
Description: (RO) Directory containing the sysfs nodes for TTY attributes
265+
266+
What: /sys/class/timecard/ocpN/tty/ttyGNSS
267+
What: /sys/class/timecard/ocpN/tty/ttyGNSS2
268+
Date: August 2024
264269
Contact: Jonathan Lemon <[email protected]>
265-
Description: These optional attributes link to the TTY serial ports
266-
associated with the GNSS devices.
270+
Description: (RO) These optional attributes contain names of the TTY serial
271+
ports associated with the GNSS devices.
267272

268-
What: /sys/class/timecard/ocpN/ttyMAC
269-
Date: September 2021
273+
What: /sys/class/timecard/ocpN/tty/ttyMAC
274+
Date: August 2024
270275
Contact: Jonathan Lemon <[email protected]>
271-
Description: This optional attribute links to the TTY serial port
272-
associated with the Miniature Atomic Clock.
276+
Description: (RO) This optional attribute contains name of the TTY serial
277+
port associated with the Miniature Atomic Clock.
273278

274-
What: /sys/class/timecard/ocpN/ttyNMEA
275-
Date: September 2021
279+
What: /sys/class/timecard/ocpN/tty/ttyNMEA
280+
Date: August 2024
276281
Contact: Jonathan Lemon <[email protected]>
277-
Description: This optional attribute links to the TTY serial port
278-
which outputs the PHC time in NMEA ZDA format.
282+
Description: (RO) This optional attribute contains name of the TTY serial
283+
port which outputs the PHC time in NMEA ZDA format.
279284

280285
What: /sys/class/timecard/ocpN/utc_tai_offset
281286
Date: September 2021

Documentation/admin-guide/cgroup-v2.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1717,9 +1717,10 @@ The following nested keys are defined.
17171717
entries fault back in or are written out to disk.
17181718

17191719
memory.zswap.writeback
1720-
A read-write single value file. The default value is "1". The
1721-
initial value of the root cgroup is 1, and when a new cgroup is
1722-
created, it inherits the current value of its parent.
1720+
A read-write single value file. The default value is "1".
1721+
Note that this setting is hierarchical, i.e. the writeback would be
1722+
implicitly disabled for child cgroups if the upper hierarchy
1723+
does so.
17231724

17241725
When this is set to 0, all swapping attempts to swapping devices
17251726
are disabled. This included both zswap writebacks, and swapping due

Documentation/arch/riscv/vm-layout.rst

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -134,19 +134,3 @@ RISC-V Linux Kernel SV57
134134
ffffffff00000000 | -4 GB | ffffffff7fffffff | 2 GB | modules, BPF
135135
ffffffff80000000 | -2 GB | ffffffffffffffff | 2 GB | kernel
136136
__________________|____________|__________________|_________|____________________________________________________________
137-
138-
139-
Userspace VAs
140-
--------------------
141-
To maintain compatibility with software that relies on the VA space with a
142-
maximum of 48 bits the kernel will, by default, return virtual addresses to
143-
userspace from a 48-bit range (sv48). This default behavior is achieved by
144-
passing 0 into the hint address parameter of mmap. On CPUs with an address space
145-
smaller than sv48, the CPU maximum supported address space will be the default.
146-
147-
Software can "opt-in" to receiving VAs from another VA space by providing
148-
a hint address to mmap. When a hint address is passed to mmap, the returned
149-
address will never use more bits than the hint address. For example, if a hint
150-
address of `1 << 40` is passed to mmap, a valid returned address will never use
151-
bits 41 through 63. If no mappable addresses are available in that range, mmap
152-
will return `MAP_FAILED`.

Documentation/devicetree/bindings/display/panel/wl-355608-a8.yaml renamed to Documentation/devicetree/bindings/display/panel/anbernic,rg35xx-plus-panel.yaml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: http://devicetree.org/schemas/display/panel/wl-355608-a8.yaml#
4+
$id: http://devicetree.org/schemas/display/panel/anbernic,rg35xx-plus-panel.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: WL-355608-A8 3.5" (640x480 pixels) 24-bit IPS LCD panel
7+
title: Anbernic RG35XX series (WL-355608-A8) 3.5" 640x480 24-bit IPS LCD panel
88

99
maintainers:
1010
- Ryan Walklin <[email protected]>
@@ -15,7 +15,14 @@ allOf:
1515

1616
properties:
1717
compatible:
18-
const: wl-355608-a8
18+
oneOf:
19+
- const: anbernic,rg35xx-plus-panel
20+
- items:
21+
- enum:
22+
- anbernic,rg35xx-2024-panel
23+
- anbernic,rg35xx-h-panel
24+
- anbernic,rg35xx-sp-panel
25+
- const: anbernic,rg35xx-plus-panel
1926

2027
reg:
2128
maxItems: 1
@@ -40,7 +47,7 @@ examples:
4047
#size-cells = <0>;
4148
4249
panel@0 {
43-
compatible = "wl-355608-a8";
50+
compatible = "anbernic,rg35xx-plus-panel";
4451
reg = <0>;
4552
4653
spi-3wire;

Documentation/devicetree/bindings/nvmem/xlnx,zynqmp-nvmem.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ unevaluatedProperties: false
2828

2929
examples:
3030
- |
31-
nvmem {
31+
soc-nvmem {
3232
compatible = "xlnx,zynqmp-nvmem-fw";
3333
nvmem-layout {
3434
compatible = "fixed-layout";

Documentation/devicetree/bindings/usb/microchip,usb2514.yaml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ maintainers:
1010
- Fabio Estevam <[email protected]>
1111

1212
allOf:
13-
- $ref: usb-hcd.yaml#
13+
- $ref: usb-device.yaml#
1414

1515
properties:
1616
compatible:
@@ -36,6 +36,13 @@ required:
3636
- compatible
3737
- reg
3838

39+
patternProperties:
40+
"^.*@[0-9a-f]{1,2}$":
41+
description: The hard wired USB devices
42+
type: object
43+
$ref: /schemas/usb/usb-device.yaml
44+
additionalProperties: true
45+
3946
unevaluatedProperties: false
4047

4148
examples:

Documentation/process/coding-style.rst

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -629,18 +629,6 @@ The preferred style for long (multi-line) comments is:
629629
* with beginning and ending almost-blank lines.
630630
*/
631631
632-
For files in net/ and drivers/net/ the preferred style for long (multi-line)
633-
comments is a little different.
634-
635-
.. code-block:: c
636-
637-
/* The preferred comment style for files in net/ and drivers/net
638-
* looks like this.
639-
*
640-
* It is nearly the same as the generally preferred comment style,
641-
* but there is no initial almost-blank line.
642-
*/
643-
644632
It's also important to comment data, whether they are basic types or derived
645633
types. To this end, use just one data declaration per line (no commas for
646634
multiple data declarations). This leaves you room for a small comment on each

Documentation/process/maintainer-netdev.rst

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -355,23 +355,6 @@ just do it. As a result, a sequence of smaller series gets merged quicker and
355355
with better review coverage. Re-posting large series also increases the mailing
356356
list traffic.
357357

358-
Multi-line comments
359-
~~~~~~~~~~~~~~~~~~~
360-
361-
Comment style convention is slightly different for networking and most of
362-
the tree. Instead of this::
363-
364-
/*
365-
* foobar blah blah blah
366-
* another line of text
367-
*/
368-
369-
it is requested that you make it look like this::
370-
371-
/* foobar blah blah blah
372-
* another line of text
373-
*/
374-
375358
Local variable ordering ("reverse xmas tree", "RCS")
376359
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
377360

@@ -392,6 +375,22 @@ When working in existing code which uses nonstandard formatting make
392375
your code follow the most recent guidelines, so that eventually all code
393376
in the domain of netdev is in the preferred format.
394377

378+
Using device-managed and cleanup.h constructs
379+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
380+
381+
Netdev remains skeptical about promises of all "auto-cleanup" APIs,
382+
including even ``devm_`` helpers, historically. They are not the preferred
383+
style of implementation, merely an acceptable one.
384+
385+
Use of ``guard()`` is discouraged within any function longer than 20 lines,
386+
``scoped_guard()`` is considered more readable. Using normal lock/unlock is
387+
still (weakly) preferred.
388+
389+
Low level cleanup constructs (such as ``__free()``) can be used when building
390+
APIs and helpers, especially scoped iterators. However, direct use of
391+
``__free()`` within networking core and drivers is discouraged.
392+
Similar guidance applies to declaring variables mid-function.
393+
395394
Resending after review
396395
~~~~~~~~~~~~~~~~~~~~~~
397396

Documentation/rust/coding-guidelines.rst

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -145,32 +145,32 @@ This is how a well-documented Rust function may look like:
145145
This example showcases a few ``rustdoc`` features and some conventions followed
146146
in the kernel:
147147

148-
- The first paragraph must be a single sentence briefly describing what
149-
the documented item does. Further explanations must go in extra paragraphs.
148+
- The first paragraph must be a single sentence briefly describing what
149+
the documented item does. Further explanations must go in extra paragraphs.
150150

151-
- Unsafe functions must document their safety preconditions under
152-
a ``# Safety`` section.
151+
- Unsafe functions must document their safety preconditions under
152+
a ``# Safety`` section.
153153

154-
- While not shown here, if a function may panic, the conditions under which
155-
that happens must be described under a ``# Panics`` section.
154+
- While not shown here, if a function may panic, the conditions under which
155+
that happens must be described under a ``# Panics`` section.
156156

157-
Please note that panicking should be very rare and used only with a good
158-
reason. In almost all cases, a fallible approach should be used, typically
159-
returning a ``Result``.
157+
Please note that panicking should be very rare and used only with a good
158+
reason. In almost all cases, a fallible approach should be used, typically
159+
returning a ``Result``.
160160

161-
- If providing examples of usage would help readers, they must be written in
162-
a section called ``# Examples``.
161+
- If providing examples of usage would help readers, they must be written in
162+
a section called ``# Examples``.
163163

164-
- Rust items (functions, types, constants...) must be linked appropriately
165-
(``rustdoc`` will create a link automatically).
164+
- Rust items (functions, types, constants...) must be linked appropriately
165+
(``rustdoc`` will create a link automatically).
166166

167-
- Any ``unsafe`` block must be preceded by a ``// SAFETY:`` comment
168-
describing why the code inside is sound.
167+
- Any ``unsafe`` block must be preceded by a ``// SAFETY:`` comment
168+
describing why the code inside is sound.
169169

170-
While sometimes the reason might look trivial and therefore unneeded,
171-
writing these comments is not just a good way of documenting what has been
172-
taken into account, but most importantly, it provides a way to know that
173-
there are no *extra* implicit constraints.
170+
While sometimes the reason might look trivial and therefore unneeded,
171+
writing these comments is not just a good way of documenting what has been
172+
taken into account, but most importantly, it provides a way to know that
173+
there are no *extra* implicit constraints.
174174

175175
To learn more about how to write documentation for Rust and extra features,
176176
please take a look at the ``rustdoc`` book at:

0 commit comments

Comments
 (0)