Skip to content

Commit d99b91a

Browse files
torvaldstorvalds
committed
Merge tag 'char-misc-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc updates from Greg KH: "Here is the big set of char/misc and other small driver subsystem changes for 6.7-rc1. Included in here are: - IIO subsystem driver updates and additions (largest part of this pull request) - FPGA subsystem driver updates - Counter subsystem driver updates - ICC subsystem driver updates - extcon subsystem driver updates - mei driver updates and additions - nvmem subsystem driver updates and additions - comedi subsystem dependency fixes - parport driver fixups - cdx subsystem driver and core updates - splice support for /dev/zero and /dev/full - other smaller driver cleanups All of these have been in linux-next for a while with no reported issues" * tag 'char-misc-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (326 commits) cdx: add sysfs for subsystem, class and revision cdx: add sysfs for bus reset cdx: add support for bus enable and disable cdx: Register cdx bus as a device on cdx subsystem cdx: Create symbol namespaces for cdx subsystem cdx: Introduce lock to protect controller ops cdx: Remove cdx controller list from cdx bus system dts: ti: k3-am625-beagleplay: Add beaglecc1352 greybus: Add BeaglePlay Linux Driver dt-bindings: net: Add ti,cc1352p7 dt-bindings: eeprom: at24: allow NVMEM cells based on old syntax dt-bindings: nvmem: SID: allow NVMEM cells based on old syntax Revert "nvmem: add new config option" MAINTAINERS: coresight: Add missing Coresight files misc: pci_endpoint_test: Add deviceID for J721S2 PCIe EP device support firmware: xilinx: Move EXPORT_SYMBOL_GPL next to zynqmp_pm_feature definition uacce: make uacce_class constant ocxl: make ocxl_class constant cxl: make cxl_class constant misc: phantom: make phantom_class constant ...
2 parents e392ea4 + fa10f41 commit d99b91a

363 files changed

Lines changed: 13492 additions & 3648 deletions

File tree

Some content is hidden

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

‎Documentation/ABI/testing/sysfs-bus-cdx‎

Lines changed: 62 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,57 @@ Description:
2828
of a device manufacturer.
2929
Combination of Vendor ID and Device ID identifies a device.
3030

31+
What: /sys/bus/cdx/devices/.../subsystem_vendor
32+
Date: July 2023
33+
Contact: puneet.gupta@amd.com
34+
Description:
35+
Subsystem Vendor ID for this CDX device, in hexadecimal.
36+
Subsystem Vendor ID is 16 bit identifier specific to the
37+
card manufacturer.
38+
39+
What: /sys/bus/cdx/devices/.../subsystem_device
40+
Date: July 2023
41+
Contact: puneet.gupta@amd.com
42+
Description:
43+
Subsystem Device ID for this CDX device, in hexadecimal
44+
Subsystem Device ID is 16 bit identifier specific to the
45+
card manufacturer.
46+
47+
What: /sys/bus/cdx/devices/.../class
48+
Date: July 2023
49+
Contact: puneet.gupta@amd.com
50+
Description:
51+
This file contains the class of the CDX device, in hexadecimal.
52+
Class is 24 bit identifier specifies the functionality of the device.
53+
54+
What: /sys/bus/cdx/devices/.../revision
55+
Date: July 2023
56+
Contact: puneet.gupta@amd.com
57+
Description:
58+
This file contains the revision field of the CDX device, in hexadecimal.
59+
Revision is 8 bit revision identifier of the device.
60+
61+
What: /sys/bus/cdx/devices/.../enable
62+
Date: October 2023
63+
Contact: abhijit.gangurde@amd.com
64+
Description:
65+
CDX bus should be disabled before updating the devices in FPGA.
66+
Writing n/0/off will attempt to disable the CDX bus and.
67+
writing y/1/on will attempt to enable the CDX bus. Reading this file
68+
gives the current state of the bus, 1 for enabled and 0 for disabled.
69+
70+
For example::
71+
72+
# echo 1 > /sys/bus/cdx/.../enable
73+
3174
What: /sys/bus/cdx/devices/.../reset
3275
Date: March 2023
3376
Contact: nipun.gupta@amd.com
3477
Description:
35-
Writing y/1/on to this file resets the CDX device.
36-
On resetting the device, the corresponding driver is notified
37-
twice, once before the device is being reset, and again after
38-
the reset has been complete.
78+
Writing y/1/on to this file resets the CDX device or all devices
79+
on the bus. On resetting the device, the corresponding driver is
80+
notified twice, once before the device is being reset, and again
81+
after the reset has been complete.
3982

4083
For example::
4184

@@ -54,3 +97,18 @@ Description:
5497
For example::
5598

5699
# echo 1 > /sys/bus/cdx/devices/.../remove
100+
101+
What: /sys/bus/cdx/devices/.../modalias
102+
Date: July 2023
103+
Contact: nipun.gupta@amd.com
104+
Description:
105+
This attribute indicates the CDX ID of the device.
106+
That is in the format:
107+
cdx:vXXXXdXXXXsvXXXXsdXXXXcXXXXXX,
108+
where:
109+
110+
- vXXXX contains the vendor ID;
111+
- dXXXX contains the device ID;
112+
- svXXXX contains the subsystem vendor ID;
113+
- sdXXXX contains the subsystem device ID;
114+
- cXXXXXX contains the device class.

‎Documentation/ABI/testing/sysfs-bus-iio‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,35 @@ Description:
279279
but should match other such assignments on device).
280280
Units after application of scale and offset are m/s^2.
281281

282+
What: /sys/bus/iio/devices/iio:deviceX/in_deltaangl_x_raw
283+
What: /sys/bus/iio/devices/iio:deviceX/in_deltaangl_y_raw
284+
What: /sys/bus/iio/devices/iio:deviceX/in_deltaangl_z_raw
285+
KernelVersion: 6.5
286+
Contact: linux-iio@vger.kernel.org
287+
Description:
288+
Angular displacement between two consecutive samples on x, y or
289+
z (may be arbitrarily assigned but should match other such
290+
assignments on device).
291+
In order to compute the total angular displacement during a
292+
desired period of time, the application should sum-up the delta
293+
angle samples acquired during that time.
294+
Units after application of scale and offset are radians.
295+
296+
What: /sys/bus/iio/devices/iio:deviceX/in_deltavelocity_x_raw
297+
What: /sys/bus/iio/devices/iio:deviceX/in_deltavelocity_y_raw
298+
What: /sys/bus/iio/devices/iio:deviceX/in_deltavelocity_z_raw
299+
KernelVersion: 6.5
300+
Contact: linux-iio@vger.kernel.org
301+
Description:
302+
The linear velocity change between two consecutive samples on x,
303+
y or z (may be arbitrarily assigned but should match other such
304+
assignments on device).
305+
In order to compute the total linear velocity change during a
306+
desired period of time, the application should sum-up the delta
307+
velocity samples acquired during that time.
308+
Units after application of scale and offset are meters per
309+
second.
310+
282311
What: /sys/bus/iio/devices/iio:deviceX/in_angl_raw
283312
What: /sys/bus/iio/devices/iio:deviceX/in_anglY_raw
284313
KernelVersion: 4.17
@@ -461,6 +490,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_humidityrelative_scale
461490
What: /sys/bus/iio/devices/iio:deviceX/in_velocity_sqrt(x^2+y^2+z^2)_scale
462491
What: /sys/bus/iio/devices/iio:deviceX/in_illuminance_scale
463492
What: /sys/bus/iio/devices/iio:deviceX/in_countY_scale
493+
What: /sys/bus/iio/devices/iio:deviceX/in_deltaangl_scale
494+
What: /sys/bus/iio/devices/iio:deviceX/in_deltavelocity_scale
464495
What: /sys/bus/iio/devices/iio:deviceX/in_angl_scale
465496
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_x_scale
466497
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_y_scale
@@ -1332,6 +1363,12 @@ Description:
13321363
What: /sys/.../iio:deviceX/bufferY/in_accel_x_en
13331364
What: /sys/.../iio:deviceX/bufferY/in_accel_y_en
13341365
What: /sys/.../iio:deviceX/bufferY/in_accel_z_en
1366+
What: /sys/.../iio:deviceX/bufferY/in_deltaangl_x_en
1367+
What: /sys/.../iio:deviceX/bufferY/in_deltaangl_y_en
1368+
What: /sys/.../iio:deviceX/bufferY/in_deltaangl_z_en
1369+
What: /sys/.../iio:deviceX/bufferY/in_deltavelocity_x_en
1370+
What: /sys/.../iio:deviceX/bufferY/in_deltavelocity_y_en
1371+
What: /sys/.../iio:deviceX/bufferY/in_deltavelocity_z_en
13351372
What: /sys/.../iio:deviceX/bufferY/in_anglvel_x_en
13361373
What: /sys/.../iio:deviceX/bufferY/in_anglvel_y_en
13371374
What: /sys/.../iio:deviceX/bufferY/in_anglvel_z_en
@@ -1362,6 +1399,8 @@ Description:
13621399
Scan element control for triggered data capture.
13631400

13641401
What: /sys/.../iio:deviceX/bufferY/in_accel_type
1402+
What: /sys/.../iio:deviceX/bufferY/in_deltaangl_type
1403+
What: /sys/.../iio:deviceX/bufferY/in_deltavelocity_type
13651404
What: /sys/.../iio:deviceX/bufferY/in_anglvel_type
13661405
What: /sys/.../iio:deviceX/bufferY/in_magn_type
13671406
What: /sys/.../iio:deviceX/bufferY/in_incli_type
@@ -1416,6 +1455,12 @@ What: /sys/.../iio:deviceX/bufferY/in_voltage_q_index
14161455
What: /sys/.../iio:deviceX/bufferY/in_accel_x_index
14171456
What: /sys/.../iio:deviceX/bufferY/in_accel_y_index
14181457
What: /sys/.../iio:deviceX/bufferY/in_accel_z_index
1458+
What: /sys/.../iio:deviceX/bufferY/in_deltaangl_x_index
1459+
What: /sys/.../iio:deviceX/bufferY/in_deltaangl_y_index
1460+
What: /sys/.../iio:deviceX/bufferY/in_deltaangl_z_index
1461+
What: /sys/.../iio:deviceX/bufferY/in_deltavelocity_x_index
1462+
What: /sys/.../iio:deviceX/bufferY/in_deltavelocity_y_index
1463+
What: /sys/.../iio:deviceX/bufferY/in_deltavelocity_z_index
14191464
What: /sys/.../iio:deviceX/bufferY/in_anglvel_x_index
14201465
What: /sys/.../iio:deviceX/bufferY/in_anglvel_y_index
14211466
What: /sys/.../iio:deviceX/bufferY/in_anglvel_z_index
@@ -2179,3 +2224,33 @@ Contact: linux-iio@vger.kernel.org
21792224
Description:
21802225
Number of conditions that must occur, during a running
21812226
period, before an event is generated.
2227+
2228+
What: /sys/bus/iio/devices/iio:deviceX/in_colortemp_raw
2229+
KernelVersion: 6.7
2230+
Contact: linux-iio@vger.kernel.org
2231+
Description:
2232+
Represents light color temperature, which measures light color
2233+
temperature in Kelvin.
2234+
2235+
What: /sys/bus/iio/devices/iio:deviceX/in_chromaticity_x_raw
2236+
What: /sys/bus/iio/devices/iio:deviceX/in_chromaticity_y_raw
2237+
KernelVersion: 6.7
2238+
Contact: linux-iio@vger.kernel.org
2239+
Description:
2240+
The x and y light color coordinate on the CIE 1931 chromaticity
2241+
diagram.
2242+
2243+
What: /sys/bus/iio/devices/iio:deviceX/events/in_altvoltageY_mag_either_label
2244+
What: /sys/bus/iio/devices/iio:deviceX/events/in_altvoltageY_mag_rising_label
2245+
What: /sys/bus/iio/devices/iio:deviceX/events/in_altvoltageY_thresh_falling_label
2246+
What: /sys/bus/iio/devices/iio:deviceX/events/in_altvoltageY_thresh_rising_label
2247+
What: /sys/bus/iio/devices/iio:deviceX/events/in_anglvelY_mag_rising_label
2248+
What: /sys/bus/iio/devices/iio:deviceX/events/in_anglY_thresh_rising_label
2249+
What: /sys/bus/iio/devices/iio:deviceX/events/in_phaseY_mag_rising_label
2250+
KernelVersion: 6.7
2251+
Contact: linux-iio@vger.kernel.org
2252+
Description:
2253+
Optional symbolic label to a device channel event.
2254+
If a label is defined for this event add that to the event
2255+
specific attributes. This is useful for userspace to be able to
2256+
better identify an individual event.

‎Documentation/ABI/testing/sysfs-bus-iio-adc-mcp3564‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/boost_current_gain
2+
KernelVersion: 6.4
3+
Contact: linux-iio@vger.kernel.org
4+
Description:
5+
This attribute is used to set the gain of the biasing current
6+
circuit of the Delta-Sigma modulator. The different BOOST
7+
settings are applied to the entire modulator circuit, including
8+
the voltage reference buffers.
9+
10+
What: /sys/bus/iio/devices/iio:deviceX/boost_current_gain_available
11+
KernelVersion: 6.4
12+
Contact: linux-iio@vger.kernel.org
13+
Description:
14+
Reading returns a list with the possible gain values for
15+
the current biasing circuit of the Delta-Sigma modulator.
16+
17+
What: /sys/bus/iio/devices/iio:deviceX/auto_zeroing_mux_enable
18+
KernelVersion: 6.4
19+
Contact: linux-iio@vger.kernel.org
20+
Description:
21+
This attribute is used to enable the analog input multiplexer
22+
auto-zeroing algorithm (the input multiplexer and the ADC
23+
include an offset cancellation algorithm that cancels the offset
24+
contribution of the ADC). When the offset cancellation algorithm
25+
is enabled, ADC takes two conversions, one with the differential
26+
input as VIN+/VIN-, one with VIN+/VIN- inverted. In this case the
27+
conversion time is multiplied by two compared to the default
28+
case where the algorithm is disabled. This technique allows the
29+
cancellation of the ADC offset error and the achievement of
30+
ultra-low offset without any digital calibration. The resulting
31+
offset is the residue of the difference between the two
32+
conversions, which is on the order of magnitude of the noise
33+
floor. This offset is effectively canceled at every conversion,
34+
so the residual offset error temperature drift is extremely low.
35+
Write '1' to enable it, write '0' to disable it.
36+
37+
What: /sys/bus/iio/devices/iio:deviceX/auto_zeroing_ref_enable
38+
KernelVersion: 6.4
39+
Contact: linux-iio@vger.kernel.org
40+
Description:
41+
This attribute is used to enable the chopping algorithm for the
42+
internal voltage reference buffer. This setting has no effect
43+
when external voltage reference is selected.
44+
Internal voltage reference buffer injects a certain quantity of
45+
1/f noise into the system that can be modulated with the
46+
incoming input signals and can limit the SNR performance at
47+
higher Oversampling Ratio values (over 256). To overcome this
48+
limitation, the buffer includes an auto-zeroing algorithm that
49+
greatly reduces (cancels out) the 1/f noise and cancels the
50+
offset value of the reference buffer. As a result, the SNR of
51+
the system is not affected by this 1/f noise component of the
52+
reference buffer, even at maximum oversampling ratio values.
53+
Write '1' to enable it, write '0' to disable it.

‎Documentation/ABI/testing/sysfs-bus-iio-resolver-ad2s1210‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/events/in_altvoltage0_mag_rising_reset_max
2+
KernelVersion: 6.7
3+
Contact: linux-iio@vger.kernel.org
4+
Description:
5+
Reading returns the current Degradation of Signal Reset Maximum
6+
Threshold value in millivolts. Writing sets the value.
7+
8+
What: /sys/bus/iio/devices/iio:deviceX/events/in_altvoltage0_mag_rising_reset_max_available
9+
KernelVersion: 6.7
10+
Contact: linux-iio@vger.kernel.org
11+
Description:
12+
Reading returns the allowable voltage range for
13+
in_altvoltage0_mag_rising_reset_max.
14+
15+
What: /sys/bus/iio/devices/iio:deviceX/events/in_altvoltage0_mag_rising_reset_min
16+
KernelVersion: 6.7
17+
Contact: linux-iio@vger.kernel.org
18+
Description:
19+
Reading returns the current Degradation of Signal Reset Minimum
20+
Threshold value in millivolts. Writing sets the value.
21+
22+
What: /sys/bus/iio/devices/iio:deviceX/events/in_altvoltage0_mag_rising_reset_min_available
23+
KernelVersion: 6.7
24+
Contact: linux-iio@vger.kernel.org
25+
Description:
26+
Reading returns the allowable voltage range for
27+
in_altvoltage0_mag_rising_reset_min.

‎Documentation/devicetree/bindings/eeprom/at24.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ maintainers:
1212

1313
allOf:
1414
- $ref: /schemas/nvmem/nvmem.yaml
15+
- $ref: /schemas/nvmem/nvmem-deprecated-cells.yaml
1516

1617
select:
1718
properties:

‎Documentation/devicetree/bindings/iio/accel/kionix,kx022a.yaml‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,23 @@
44
$id: http://devicetree.org/schemas/iio/accel/kionix,kx022a.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: ROHM/Kionix KX022A Accelerometer
7+
title: ROHM/Kionix KX022A, KX132-1211 and KX132ACR-LBZ Accelerometers
88

99
maintainers:
1010
- Matti Vaittinen <mazziesaccount@gmail.com>
1111

1212
description: |
13-
KX022A is a 3-axis accelerometer supporting +/- 2G, 4G, 8G and 16G ranges,
14-
output data-rates from 0.78Hz to 1600Hz and a hardware-fifo buffering.
15-
KX022A can be accessed either via I2C or SPI.
13+
KX022A, KX132ACR-LBZ and KX132-1211 are 3-axis accelerometers supporting
14+
+/- 2G, 4G, 8G and 16G ranges, variable output data-rates and a
15+
hardware-fifo buffering. These accelerometers can be accessed either
16+
via I2C or SPI.
1617
1718
properties:
1819
compatible:
19-
const: kionix,kx022a
20+
enum:
21+
- kionix,kx022a
22+
- kionix,kx132-1211
23+
- rohm,kx132acr-lbz
2024

2125
reg:
2226
maxItems: 1

‎Documentation/devicetree/bindings/iio/adc/lltc,ltc2497.yaml‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,31 @@
44
$id: http://devicetree.org/schemas/iio/adc/lltc,ltc2497.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Linear Technology / Analog Devices LTC2497 ADC
7+
title: Linear Technology / Analog Devices LTC2497 and LTC2309 ADC
88

99
maintainers:
1010
- Michael Hennerich <michael.hennerich@analog.com>
11+
- Liam Beguin <liambeguin@gmail.com>
1112

1213
description: |
13-
16bit ADC supporting up to 16 single ended or 8 differential inputs.
14-
I2C interface.
14+
LTC2309:
15+
low noise, low power, 8-channel, 12-bit successive approximation ADC with an
16+
I2C compatible serial interface.
1517
16-
https://www.analog.com/media/en/technical-documentation/data-sheets/2497fb.pdf
17-
https://www.analog.com/media/en/technical-documentation/data-sheets/2499fe.pdf
18+
https://www.analog.com/media/en/technical-documentation/data-sheets/2309fd.pdf
19+
20+
LTC2497:
21+
LTC2499:
22+
16bit ADC supporting up to 16 single ended or 8 differential inputs.
23+
I2C interface.
24+
25+
https://www.analog.com/media/en/technical-documentation/data-sheets/2497fb.pdf
26+
https://www.analog.com/media/en/technical-documentation/data-sheets/2499fe.pdf
1827
1928
properties:
2029
compatible:
2130
enum:
31+
- lltc,ltc2309
2232
- lltc,ltc2497
2333
- lltc,ltc2499
2434

0 commit comments

Comments
 (0)