Skip to content

Commit acc5965

Browse files
committed
Merge tag 'char-misc-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char / misc and other driver updates from Greg KH: "Here is the "big" set of char/misc and other driver subsystem changes for 6.11-rc1. Nothing major in here, just loads of new drivers and updates. Included in here are: - IIO api updates and new drivers added - wait_interruptable_timeout() api cleanups for some drivers - MODULE_DESCRIPTION() additions for loads of drivers - parport out-of-bounds fix - interconnect driver updates and additions - mhi driver updates and additions - w1 driver fixes - binder speedups and fixes - eeprom driver updates - coresight driver updates - counter driver update - new misc driver additions - other minor api updates All of these, EXCEPT for the final Kconfig build fix for 32bit systems, have been in linux-next for a while with no reported issues. The Kconfig fixup went in 29 hours ago, so might have missed the latest linux-next, but was acked by everyone involved" * tag 'char-misc-6.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (330 commits) misc: Kconfig: exclude mrvl-cn10k-dpi compilation for 32-bit systems misc: delete Makefile.rej binder: fix hang of unregistered readers misc: Kconfig: add a new dependency for MARVELL_CN10K_DPI virtio: add missing MODULE_DESCRIPTION() macro agp: uninorth: add missing MODULE_DESCRIPTION() macro spmi: add missing MODULE_DESCRIPTION() macros dev/parport: fix the array out-of-bounds risk samples: configfs: add missing MODULE_DESCRIPTION() macro misc: mrvl-cn10k-dpi: add Octeon CN10K DPI administrative driver misc: keba: Fix missing AUXILIARY_BUS dependency slimbus: Fix struct and documentation alignment in stream.c MAINTAINERS: CC dri-devel list on Qualcomm FastRPC patches misc: fastrpc: use coherent pool for untranslated Compute Banks misc: fastrpc: support complete DMA pool access to the DSP misc: fastrpc: add missing MODULE_DESCRIPTION() macro misc: fastrpc: Add missing dev_err newlines misc: fastrpc: Use memdup_user() nvmem: core: Implement force_ro sysfs attribute nvmem: Use sysfs_emit() for type attribute ...
2 parents 09ea808 + 5418e6d commit acc5965

File tree

420 files changed

+15654
-3115
lines changed

Some content is hidden

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

420 files changed

+15654
-3115
lines changed

Documentation/ABI/stable/sysfs-bus-nvmem

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
1+
What: /sys/bus/nvmem/devices/.../force_ro
2+
Date: June 2024
3+
KernelVersion: 6.11
4+
Contact: Marek Vasut <[email protected]>
5+
Description:
6+
This read/write attribute allows users to set read-write
7+
devices as read-only and back to read-write from userspace.
8+
This can be used to unlock and relock write-protection of
9+
devices which are generally locked, except during sporadic
10+
programming operation.
11+
Read returns '0' or '1' for read-write or read-only modes
12+
respectively.
13+
Write parses one of 'YyTt1NnFf0', or [oO][NnFf] for "on"
14+
and "off", i.e. what kstrbool() supports.
15+
Note: This file is only present if CONFIG_NVMEM_SYSFS
16+
is enabled.
17+
118
What: /sys/bus/nvmem/devices/.../nvmem
219
Date: July 2015
3-
KernelVersion: 4.2
20+
KernelVersion: 4.2
421
Contact: Srinivas Kandagatla <[email protected]>
522
Description:
623
This file allows user to read/write the raw NVMEM contents.
@@ -20,3 +37,14 @@ Description:
2037
...
2138
*
2239
0001000
40+
41+
What: /sys/bus/nvmem/devices/.../type
42+
Date: November 2018
43+
KernelVersion: 5.0
44+
Contact: Alexandre Belloni <[email protected]>
45+
Description:
46+
This read-only attribute allows user to read the NVMEM
47+
device type. Supported types are "Unknown", "EEPROM",
48+
"OTP", "Battery backed", "FRAM".
49+
Note: This file is only present if CONFIG_NVMEM_SYSFS
50+
is enabled.
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/0000:XX:XX.X/version
2+
Date: June 2024
3+
KernelVersion: 6.11
4+
Contact: Gerhard Engleder <[email protected]>
5+
Description: Version of the FPGA configuration bitstream as printable string.
6+
This file is read only.
7+
Users: KEBA
8+
9+
What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/0000:XX:XX.X/keep_cfg
10+
Date: June 2024
11+
KernelVersion: 6.11
12+
Contact: Gerhard Engleder <[email protected]>
13+
Description: Flag which signals if FPGA shall keep or reload configuration
14+
bitstream on reset. Normal FPGA behavior and default is to keep
15+
configuration bitstream and to only reset the configured logic.
16+
17+
Reloading configuration on reset enables an update of the
18+
configuration bitstream with a simple reboot. Otherwise it is
19+
necessary to power cycle the device to reload the new
20+
configuration bitstream.
21+
22+
This file is read/write. The values are as follows:
23+
1 = keep configuration bitstream on reset, default
24+
0 = reload configuration bitstream on reset
25+
Users: KEBA
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/in_accel_power_mode
2+
KernelVersion: 6.11
3+
4+
Description:
5+
Accelerometer power mode. Setting this attribute will set the
6+
requested power mode to use if the ODR support it. If ODR
7+
support only 1 mode, power mode will be enforced.
8+
Reading this attribute will return the current accelerometer
9+
power mode if the sensor is on, or the requested value if the
10+
sensor is off. The value between real and requested value can
11+
be different for ODR supporting only 1 mode.
12+
13+
What: /sys/bus/iio/devices/iio:deviceX/in_accel_power_mode_available
14+
KernelVersion: 6.11
15+
16+
Description:
17+
List of available accelerometer power modes that can be set in
18+
in_accel_power_mode attribute.

Documentation/devicetree/bindings/counter/ti-eqep.yaml

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ maintainers:
1111

1212
properties:
1313
compatible:
14-
const: ti,am3352-eqep
14+
enum:
15+
- ti,am3352-eqep
16+
- ti,am62-eqep
1517

1618
reg:
1719
maxItems: 1
@@ -21,19 +23,35 @@ properties:
2123
maxItems: 1
2224

2325
clocks:
24-
description: The clock that determines the SYSCLKOUT rate for the eQEP
25-
peripheral.
26+
description: The functional and interface clock that determines the clock
27+
rate for the eQEP peripheral.
2628
maxItems: 1
2729

2830
clock-names:
2931
const: sysclkout
3032

33+
power-domains:
34+
maxItems: 1
35+
36+
allOf:
37+
- if:
38+
properties:
39+
compatible:
40+
contains:
41+
enum:
42+
- ti,am62-eqep
43+
then:
44+
properties:
45+
clock-names: false
46+
47+
required:
48+
- power-domains
49+
3150
required:
3251
- compatible
3352
- reg
3453
- interrupts
3554
- clocks
36-
- clock-names
3755

3856
additionalProperties: false
3957

@@ -43,7 +61,6 @@ examples:
4361
compatible = "ti,am3352-eqep";
4462
reg = <0x180 0x80>;
4563
clocks = <&l4ls_gclk>;
46-
clock-names = "sysclkout";
4764
interrupts = <79>;
4865
};
4966

Documentation/devicetree/bindings/iio/adc/adc.yaml

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,25 @@ properties:
3838
The first value specifies the positive input pin, the second
3939
specifies the negative input pin.
4040

41+
single-channel:
42+
$ref: /schemas/types.yaml#/definitions/uint32
43+
description:
44+
When devices combine single-ended and differential channels, allow the
45+
channel for a single element to be specified, independent of reg (as for
46+
differential channels). If this and diff-channels are not present reg
47+
shall be used instead.
48+
49+
common-mode-channel:
50+
$ref: /schemas/types.yaml#/definitions/uint32
51+
description:
52+
Some ADCs have differential input pins that can be used to measure
53+
single-ended or pseudo-differential inputs. This property can be used
54+
in addition to single-channel to signal software that this channel is
55+
not differential but still specify two inputs.
56+
57+
The input pair is specified by setting single-channel to the positive
58+
input pin and common-mode-channel to the negative pin.
59+
4160
settling-time-us:
4261
description:
4362
Time between enabling the channel and first stable readings.
@@ -50,4 +69,15 @@ properties:
5069
device design and can interact with other characteristics such as
5170
settling time.
5271

72+
anyOf:
73+
- oneOf:
74+
- required:
75+
- reg
76+
- diff-channels
77+
- required:
78+
- reg
79+
- single-channel
80+
- required:
81+
- reg
82+
5383
additionalProperties: true

0 commit comments

Comments
 (0)