Skip to content

Commit

Permalink
Merge tag 'char-misc-6.11-rc1' of git://git.kernel.org/pub/scm/linux/…
Browse files Browse the repository at this point in the history
…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
  ...
  • Loading branch information
torvalds committed Jul 19, 2024
2 parents 09ea808 + 5418e6d commit acc5965
Show file tree
Hide file tree
Showing 420 changed files with 15,654 additions and 3,115 deletions.
30 changes: 29 additions & 1 deletion Documentation/ABI/stable/sysfs-bus-nvmem
Original file line number Diff line number Diff line change
@@ -1,6 +1,23 @@
What: /sys/bus/nvmem/devices/.../force_ro
Date: June 2024
KernelVersion: 6.11
Contact: Marek Vasut <[email protected]>
Description:
This read/write attribute allows users to set read-write
devices as read-only and back to read-write from userspace.
This can be used to unlock and relock write-protection of
devices which are generally locked, except during sporadic
programming operation.
Read returns '0' or '1' for read-write or read-only modes
respectively.
Write parses one of 'YyTt1NnFf0', or [oO][NnFf] for "on"
and "off", i.e. what kstrbool() supports.
Note: This file is only present if CONFIG_NVMEM_SYSFS
is enabled.

What: /sys/bus/nvmem/devices/.../nvmem
Date: July 2015
KernelVersion: 4.2
KernelVersion: 4.2
Contact: Srinivas Kandagatla <[email protected]>
Description:
This file allows user to read/write the raw NVMEM contents.
Expand All @@ -20,3 +37,14 @@ Description:
...
*
0001000

What: /sys/bus/nvmem/devices/.../type
Date: November 2018
KernelVersion: 5.0
Contact: Alexandre Belloni <[email protected]>
Description:
This read-only attribute allows user to read the NVMEM
device type. Supported types are "Unknown", "EEPROM",
"OTP", "Battery backed", "FRAM".
Note: This file is only present if CONFIG_NVMEM_SYSFS
is enabled.
25 changes: 25 additions & 0 deletions Documentation/ABI/stable/sysfs-driver-misc-cp500
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/0000:XX:XX.X/version
Date: June 2024
KernelVersion: 6.11
Contact: Gerhard Engleder <[email protected]>
Description: Version of the FPGA configuration bitstream as printable string.
This file is read only.
Users: KEBA

What: /sys/devices/pciXXXX:XX/0000:XX:XX.X/0000:XX:XX.X/keep_cfg
Date: June 2024
KernelVersion: 6.11
Contact: Gerhard Engleder <[email protected]>
Description: Flag which signals if FPGA shall keep or reload configuration
bitstream on reset. Normal FPGA behavior and default is to keep
configuration bitstream and to only reset the configured logic.

Reloading configuration on reset enables an update of the
configuration bitstream with a simple reboot. Otherwise it is
necessary to power cycle the device to reload the new
configuration bitstream.

This file is read/write. The values are as follows:
1 = keep configuration bitstream on reset, default
0 = reload configuration bitstream on reset
Users: KEBA
18 changes: 18 additions & 0 deletions Documentation/ABI/testing/sysfs-bus-iio-inv_icm42600
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
What: /sys/bus/iio/devices/iio:deviceX/in_accel_power_mode
KernelVersion: 6.11
Contact: [email protected]
Description:
Accelerometer power mode. Setting this attribute will set the
requested power mode to use if the ODR support it. If ODR
support only 1 mode, power mode will be enforced.
Reading this attribute will return the current accelerometer
power mode if the sensor is on, or the requested value if the
sensor is off. The value between real and requested value can
be different for ODR supporting only 1 mode.

What: /sys/bus/iio/devices/iio:deviceX/in_accel_power_mode_available
KernelVersion: 6.11
Contact: [email protected]
Description:
List of available accelerometer power modes that can be set in
in_accel_power_mode attribute.
27 changes: 22 additions & 5 deletions Documentation/devicetree/bindings/counter/ti-eqep.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,9 @@ maintainers:

properties:
compatible:
const: ti,am3352-eqep
enum:
- ti,am3352-eqep
- ti,am62-eqep

reg:
maxItems: 1
Expand All @@ -21,19 +23,35 @@ properties:
maxItems: 1

clocks:
description: The clock that determines the SYSCLKOUT rate for the eQEP
peripheral.
description: The functional and interface clock that determines the clock
rate for the eQEP peripheral.
maxItems: 1

clock-names:
const: sysclkout

power-domains:
maxItems: 1

allOf:
- if:
properties:
compatible:
contains:
enum:
- ti,am62-eqep
then:
properties:
clock-names: false

required:
- power-domains

required:
- compatible
- reg
- interrupts
- clocks
- clock-names

additionalProperties: false

Expand All @@ -43,7 +61,6 @@ examples:
compatible = "ti,am3352-eqep";
reg = <0x180 0x80>;
clocks = <&l4ls_gclk>;
clock-names = "sysclkout";
interrupts = <79>;
};
Expand Down
30 changes: 30 additions & 0 deletions Documentation/devicetree/bindings/iio/adc/adc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,25 @@ properties:
The first value specifies the positive input pin, the second
specifies the negative input pin.

single-channel:
$ref: /schemas/types.yaml#/definitions/uint32
description:
When devices combine single-ended and differential channels, allow the
channel for a single element to be specified, independent of reg (as for
differential channels). If this and diff-channels are not present reg
shall be used instead.

common-mode-channel:
$ref: /schemas/types.yaml#/definitions/uint32
description:
Some ADCs have differential input pins that can be used to measure
single-ended or pseudo-differential inputs. This property can be used
in addition to single-channel to signal software that this channel is
not differential but still specify two inputs.

The input pair is specified by setting single-channel to the positive
input pin and common-mode-channel to the negative pin.

settling-time-us:
description:
Time between enabling the channel and first stable readings.
Expand All @@ -50,4 +69,15 @@ properties:
device design and can interact with other characteristics such as
settling time.

anyOf:
- oneOf:
- required:
- reg
- diff-channels
- required:
- reg
- single-channel
- required:
- reg

additionalProperties: true
Loading

0 comments on commit acc5965

Please sign in to comment.