Skip to content

Commit

Permalink
Automatic merge of 'master' into merge-test (2023-09-03 08:43)
Browse files Browse the repository at this point in the history
  • Loading branch information
mpe committed Sep 2, 2023
2 parents 0ad6bbf + b89b029 commit b44a91e
Show file tree
Hide file tree
Showing 1,670 changed files with 72,651 additions and 28,955 deletions.
3 changes: 3 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,9 @@ Daniel Borkmann <[email protected]> <[email protected]>
Daniel Borkmann <[email protected]> <[email protected]>
David Brownell <[email protected]>
David Collins <[email protected]> <[email protected]>
David Rheinsberg <[email protected]> <[email protected]>
David Rheinsberg <[email protected]> <[email protected]>
David Rheinsberg <[email protected]> <[email protected]>
David Woodhouse <[email protected]>
Dedy Lansky <[email protected]> <[email protected]>
Deepak Kumar Singh <[email protected]> <[email protected]>
Expand Down
11 changes: 0 additions & 11 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -666,11 +666,6 @@ S: Tamsui town, Taipei county,
S: Taiwan 251
S: Republic of China

N: Reinette Chatre
E: [email protected]
D: WiMedia Link Protocol implementation
D: UWB stack bits and pieces

N: Michael Elizabeth Chastain
E: [email protected]
D: Configure, Menuconfig, xconfig
Expand Down Expand Up @@ -3023,12 +3018,6 @@ S: Demonstratsii 8-382
S: Tula 300000
S: Russia

N: Inaky Perez-Gonzalez
E: [email protected]
D: UWB stack, HWA-RC driver and HWA-HC drivers
D: Wireless USB additions to the USB stack
D: WiMedia Link Protocol bits and pieces

N: Gordon Peters
E: [email protected]
D: Isochronous receive for IEEE 1394 driver (OHCI module).
Expand Down
4 changes: 2 additions & 2 deletions Documentation/ABI/stable/sysfs-bus-mhi
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
What: /sys/bus/mhi/devices/.../serialnumber
Date: Sept 2020
KernelVersion: 5.10
Contact: Bhaumik Bhatt <[email protected]>
Contact: [email protected]
Description: The file holds the serial number of the client device obtained
using a BHI (Boot Host Interface) register read after at least
one attempt to power up the device has been done. If read
Expand All @@ -12,7 +12,7 @@ Users: Any userspace application or clients interested in device info.
What: /sys/bus/mhi/devices/.../oem_pk_hash
Date: Sept 2020
KernelVersion: 5.10
Contact: Bhaumik Bhatt <[email protected]>
Contact: [email protected]
Description: The file holds the OEM PK Hash value of the endpoint device
obtained using a BHI (Boot Host Interface) register read after
at least one attempt to power up the device has been done. If
Expand Down
53 changes: 53 additions & 0 deletions Documentation/ABI/stable/sysfs-driver-mlxreg-io
Original file line number Diff line number Diff line change
Expand Up @@ -662,3 +662,56 @@ Description: This file shows the system reset cause due to AC power failure.
Value 1 in file means this is reset cause, 0 - otherwise.

The file is read only.

What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld5_pn
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld5_version
What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld5_version_min
Date: August 2023
KernelVersion: 6.6
Contact: Vadim Pasternak <[email protected]>
Description: These files show with which CPLD part numbers, version and minor
versions have been burned the 5-th CPLD device equipped on a
system.

The files are read only.

What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/jtag_cap
Date: August 2023
KernelVersion: 6.6
Contact: Vadim Pasternak <[email protected]>
Description: This file indicates the available method of CPLD/FPGA devices
field update through the JTAG chain:

b00 - field update through LPC bus register memory space.
b01 - Reserved.
b10 - Reserved.
b11 - field update through CPU GPIOs bit-banging.

The file is read only.

What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/lid_open
Date: August 2023
KernelVersion: 6.6
Contact: Vadim Pasternak <[email protected]>
Description: 1 - indicates that system lid is opened, otherwise 0.

The file is read only.

What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_long_pwr_pb
Date: August 2023
KernelVersion: 6.6
Contact: Vadim Pasternak <[email protected]>
Description: This file if set 1 indicates that system has been reset by
long press of power button.

The file is read only.

What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_swb_dc_dc_pwr_fail
Date: August 2023
KernelVersion: 6.6
Contact: Vadim Pasternak <[email protected]>
Description: This file shows 1 in case the system reset happened due to the
failure of any DC-DC power converter devices equipped on the
switch board.

The file is read only.
54 changes: 54 additions & 0 deletions Documentation/ABI/testing/configfs-usb-gadget-midi2
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
What: /config/usb-gadget/gadget/functions/midi2.name
Date: Jul 2023
KernelVersion: 6.6
Description:
The attributes:

============ ===============================================
process_ump Flag to process UMP Stream messages (0 or 1)
static_block Flag for static blocks (0 or 1)
iface_name MIDI interface name string
============ ===============================================

What: /config/usb-gadget/gadget/functions/midi2.name/ep.number
Date: Jul 2023
KernelVersion: 6.6
Description:
This group contains a UMP Endpoint configuration.
A new Endpoint starts from 0, and can be up to 3.

The attributes:

============= ===============================================
protocol_caps MIDI protocol capabilities (1, 2 or 3 for both)
protocol Default MIDI protocol (1 or 2)
ep_name UMP Endpoint name string
product_id Product ID string
manufacturer Manufacture ID (24 bit)
family Device family ID (16 bit)
model Device model ID (16 bit)
sw_revision Software Revision (32 bit)
============= ===============================================

What: /config/usb-gadget/gadget/functions/midi2.name/ep.number/block.number
Date: Jul 2023
KernelVersion: 6.6
Description:
This group contains a UMP Function Block configuration.
A new block starts from 0, and can be up to 31.

The attributes:

================= ==============================================
name Function Block name string
direction 1: input, 2: output, 3: bidirectional
first_group The first UMP Group number (0-15)
num_groups The number of groups in this FB (1-16)
midi1_first_group The first UMP Group number for MIDI 1.0 (0-15)
midi1_num_groups The number of groups for MIDI 1.0 (0-16)
ui_hint 0: unknown, 1: receiver, 2: sender, 3: both
midi_ci_verison Supported MIDI-CI version number (8 bit)
is_midi1 Legacy MIDI 1.0 device (0, 1 or 2)
sysex8_streams Max number of SysEx8 streams (8 bit)
active Active FB flag (0 or 1)
================= ==============================================
31 changes: 31 additions & 0 deletions Documentation/ABI/testing/debugfs-tpmi
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
What: /sys/kernel/debug/tpmi-<n>/pfs_dump
Date: November 2023
KernelVersion: 6.6
Contact: [email protected]
Description:
The PFS (PM Feature Structure) table, shows details of each power
management feature. This includes:
tpmi_id, number of entries, entry size, offset, vsec offset, lock status
and disabled status.
Users: Debugging, any user space test suite

What: /sys/kernel/debug/tpmi-<n>/tpmi-id-<n>/mem_dump
Date: November 2023
KernelVersion: 6.6
Contact: [email protected]
Description:
Shows the memory dump of the MMIO region for a TPMI ID.
Users: Debugging, any user space test suite

What: /sys/kernel/debug/tpmi-<n>/tpmi-id-<n>/mem_write
Date: November 2023
KernelVersion: 6.6
Contact: [email protected]
Description:
Allows to write at any offset. It doesn't check for Read/Write access
as hardware will not allow to write at read-only memory. This write is
at offset multiples of 4. The format is instance,offset,contents.
Example:
echo 0,0x20,0xff > mem_write
echo 1,64,64 > mem_write
Users: Debugging, any user space test suite
8 changes: 4 additions & 4 deletions Documentation/ABI/testing/sysfs-bus-counter
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ Description:
phase clock.

What: /sys/bus/counter/devices/counterX/external_input_phase_clock_select_available
KernelVersion: 6.4
Contact: [email protected]
KernelVersion: 6.4
Contact: [email protected]
Description:
Discrete set of available values for the respective device
configuration are listed in this file.
Discrete set of available values for the respective device
configuration are listed in this file.

What: /sys/bus/counter/devices/counterX/countY/count
KernelVersion: 5.2
Expand Down
2 changes: 1 addition & 1 deletion Documentation/ABI/testing/sysfs-bus-fsi-devices-sbefifo
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ Description:
by the driver. A value of 1 indicates that a timeout has
occurred and no transfers have completed since the timeout. A
value of 0 indicates that no timeout has occurred, or if one
has, more recent transfers have completed successful.
has, more recent transfers have completed successfully.
16 changes: 16 additions & 0 deletions Documentation/ABI/testing/sysfs-bus-iio
Original file line number Diff line number Diff line change
Expand Up @@ -2163,3 +2163,19 @@ Contact: [email protected]
Description:
An example format is 16-bytes, 2-digits-per-byte, HEX-string
representing the sensor unique ID number.

What: /sys/.../events/in_proximity_thresh_either_runningperiod
KernelVersion: 6.6
Contact: [email protected]
Description:
A running period of time (in seconds) for which
in_proximity_thresh_either_runningcount amount of conditions
must occur before an event is generated. If direction is not
specified then this period applies to both directions.

What: /sys/.../events/in_proximity_thresh_either_runningcount
KernelVersion: 6.6
Contact: [email protected]
Description:
Number of conditions that must occur, during a running
period, before an event is generated.
2 changes: 2 additions & 0 deletions Documentation/ABI/testing/sysfs-bus-iio-filter-admv8818
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ Description:

- auto -> Adjust bandpass filter to track changes in input clock rate.
- manual -> disable/unregister the clock rate notifier / input clock tracking.
- bypass -> bypass low pass filter, high pass filter and disable/unregister
the clock rate notifier

What: /sys/bus/iio/devices/iio:deviceX/filter_mode
KernelVersion:
Expand Down
Loading

0 comments on commit b44a91e

Please sign in to comment.