Skip to content

Commit 13845bd

Browse files
committed
Merge tag 'char-misc-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull Char/Misc/IIO driver updates from Greg KH: "Here is the "big" set of char/misc/iio and other smaller driver subsystem updates for 6.14-rc1. Loads of different things in here this development cycle, highlights are: - ntsync "driver" to handle Windows locking types enabling Wine to work much better on many workloads (i.e. games). The driver framework was in 6.13, but now it's enabled and fully working properly. Should make many SteamOS users happy. Even comes with tests! - Large IIO driver updates and bugfixes - FPGA driver updates - Coresight driver updates - MHI driver updates - PPS driver updatesa - const bin_attribute reworking for many drivers - binder driver updates - smaller driver updates and fixes All of these have been in linux-next for a while with no reported issues" * tag 'char-misc-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (311 commits) ntsync: Fix reference leaks in the remaining create ioctls. spmi: hisi-spmi-controller: Drop duplicated OF node assignment in spmi_controller_probe() spmi: Set fwnode for spmi devices ntsync: fix a file reference leak in drivers/misc/ntsync.c scripts/tags.sh: Don't tag usages of DECLARE_BITMAP dt-bindings: interconnect: qcom,msm8998-bwmon: Add SM8750 CPU BWMONs dt-bindings: interconnect: OSM L3: Document sm8650 OSM L3 compatible dt-bindings: interconnect: qcom-bwmon: Document QCS615 bwmon compatibles interconnect: sm8750: Add missing const to static qcom_icc_desc memstick: core: fix kernel-doc notation intel_th: core: fix kernel-doc warnings binder: log transaction code on failure iio: dac: ad3552r-hs: clear reset status flag iio: dac: ad3552r-common: fix ad3541/2r ranges iio: chemical: bme680: Fix uninitialized variable in __bme680_read_raw() misc: fastrpc: Fix copy buffer page size misc: fastrpc: Fix registered buffer page address misc: fastrpc: Deregister device nodes properly in error scenarios nvmem: core: improve range check for nvmem_cell_write() nvmem: qcom-spmi-sdam: Set size in struct nvmem_config ...
2 parents 125ca74 + 970b975 commit 13845bd

File tree

300 files changed

+12432
-4540
lines changed

Some content is hidden

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

300 files changed

+12432
-4540
lines changed
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
What: /sys/bus/coresight/devices/dummy_source<N>/enable_source
2+
Date: Dec 2024
3+
KernelVersion: 6.14
4+
Contact: Mao Jinlong <quic_jinlmao@quicinc.com>
5+
Description: (RW) Enable/disable tracing of dummy source. A sink should be activated
6+
before enabling the source. The path of coresight components linking
7+
the source to the sink is configured and managed automatically by the
8+
coresight framework.
9+
10+
What: /sys/bus/coresight/devices/dummy_source<N>/traceid
11+
Date: Dec 2024
12+
KernelVersion: 6.14
13+
Contact: Mao Jinlong <quic_jinlmao@quicinc.com>
14+
Description: (R) Show the trace ID that will appear in the trace stream
15+
coming from this trace entity.

Documentation/ABI/testing/sysfs-bus-iio

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -168,18 +168,6 @@ Description:
168168
is required is a consistent labeling. Units after application
169169
of scale and offset are millivolts.
170170

171-
What: /sys/bus/iio/devices/iio:deviceX/in_currentY_raw
172-
What: /sys/bus/iio/devices/iio:deviceX/in_currentY_supply_raw
173-
KernelVersion: 3.17
174-
Contact: linux-iio@vger.kernel.org
175-
Description:
176-
Raw (unscaled no bias removal etc.) current measurement from
177-
channel Y. In special cases where the channel does not
178-
correspond to externally available input one of the named
179-
versions may be used. The number must always be specified and
180-
unique to allow association with event codes. Units after
181-
application of scale and offset are milliamps.
182-
183171
What: /sys/bus/iio/devices/iio:deviceX/in_powerY_raw
184172
KernelVersion: 4.5
185173
Contact: linux-iio@vger.kernel.org
@@ -227,7 +215,7 @@ Description:
227215
same scaling as _raw.
228216

229217
What: /sys/bus/iio/devices/iio:deviceX/in_temp_raw
230-
What: /sys/bus/iio/devices/iio:deviceX/in_tempX_raw
218+
What: /sys/bus/iio/devices/iio:deviceX/in_tempY_raw
231219
What: /sys/bus/iio/devices/iio:deviceX/in_temp_x_raw
232220
What: /sys/bus/iio/devices/iio:deviceX/in_temp_y_raw
233221
What: /sys/bus/iio/devices/iio:deviceX/in_temp_ambient_raw
@@ -416,11 +404,11 @@ Contact: linux-iio@vger.kernel.org
416404
Description:
417405
Scaled humidity measurement in milli percent.
418406

419-
What: /sys/bus/iio/devices/iio:deviceX/in_X_mean_raw
407+
What: /sys/bus/iio/devices/iio:deviceX/in_Y_mean_raw
420408
KernelVersion: 3.5
421409
Contact: linux-iio@vger.kernel.org
422410
Description:
423-
Averaged raw measurement from channel X. The number of values
411+
Averaged raw measurement from channel Y. The number of values
424412
used for averaging is device specific. The converting rules for
425413
normal raw values also applies to the averaged raw values.
426414

@@ -448,7 +436,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_humidityrelative_offset
448436
What: /sys/bus/iio/devices/iio:deviceX/in_magn_offset
449437
What: /sys/bus/iio/devices/iio:deviceX/in_rot_offset
450438
What: /sys/bus/iio/devices/iio:deviceX/in_angl_offset
451-
What: /sys/bus/iio/devices/iio:deviceX/in_capacitanceX_offset
439+
What: /sys/bus/iio/devices/iio:deviceX/in_capacitanceY_offset
452440
KernelVersion: 2.6.35
453441
Contact: linux-iio@vger.kernel.org
454442
Description:
@@ -508,6 +496,9 @@ What: /sys/bus/iio/devices/iio:deviceX/in_angl_scale
508496
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_x_scale
509497
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_y_scale
510498
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_z_scale
499+
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_red_scale
500+
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_green_scale
501+
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_blue_scale
511502
What: /sys/bus/iio/devices/iio:deviceX/in_concentration_co2_scale
512503
KernelVersion: 2.6.35
513504
Contact: linux-iio@vger.kernel.org
@@ -660,10 +651,10 @@ What: /sys/.../iio:deviceX/in_magn_scale_available
660651
What: /sys/.../iio:deviceX/in_illuminance_scale_available
661652
What: /sys/.../iio:deviceX/in_intensity_scale_available
662653
What: /sys/.../iio:deviceX/in_proximity_scale_available
663-
What: /sys/.../iio:deviceX/in_voltageX_scale_available
654+
What: /sys/.../iio:deviceX/in_voltageY_scale_available
664655
What: /sys/.../iio:deviceX/in_voltage-voltage_scale_available
665-
What: /sys/.../iio:deviceX/out_voltageX_scale_available
666-
What: /sys/.../iio:deviceX/out_altvoltageX_scale_available
656+
What: /sys/.../iio:deviceX/out_voltageY_scale_available
657+
What: /sys/.../iio:deviceX/out_altvoltageY_scale_available
667658
What: /sys/.../iio:deviceX/in_capacitance_scale_available
668659
What: /sys/.../iio:deviceX/in_pressure_scale_available
669660
What: /sys/.../iio:deviceX/in_pressureY_scale_available
@@ -681,6 +672,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_intensity_red_hardwaregain
681672
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_green_hardwaregain
682673
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_blue_hardwaregain
683674
What: /sys/bus/iio/devices/iio:deviceX/in_intensity_clear_hardwaregain
675+
What: /sys/bus/iio/devices/iio:deviceX/in_illuminance_hardwaregain
684676
KernelVersion: 2.6.35
685677
Contact: linux-iio@vger.kernel.org
686678
Description:
@@ -1562,7 +1554,7 @@ Description:
15621554
This attribute is used to read the amount of quadrature error
15631555
present in the device at a given time.
15641556

1565-
What: /sys/.../iio:deviceX/in_accelX_power_mode
1557+
What: /sys/.../iio:deviceX/in_accelY_power_mode
15661558
KernelVersion: 3.11
15671559
Contact: linux-iio@vger.kernel.org
15681560
Description:
@@ -1633,6 +1625,10 @@ What: /sys/.../iio:deviceX/in_intensityY_uv_raw
16331625
What: /sys/.../iio:deviceX/in_intensityY_uva_raw
16341626
What: /sys/.../iio:deviceX/in_intensityY_uvb_raw
16351627
What: /sys/.../iio:deviceX/in_intensityY_duv_raw
1628+
What: /sys/.../iio:deviceX/in_intensity_red_raw
1629+
What: /sys/.../iio:deviceX/in_intensity_green_raw
1630+
What: /sys/.../iio:deviceX/in_intensity_blue_raw
1631+
What: /sys/.../iio:deviceX/in_intensity_clear_raw
16361632
KernelVersion: 3.4
16371633
Contact: linux-iio@vger.kernel.org
16381634
Description:
@@ -1691,16 +1687,19 @@ Description:
16911687
Raw value of rotation from true/magnetic north measured with
16921688
or without compensation from tilt sensors.
16931689

1694-
What: /sys/bus/iio/devices/iio:deviceX/in_currentX_raw
1695-
What: /sys/bus/iio/devices/iio:deviceX/in_currentX_i_raw
1696-
What: /sys/bus/iio/devices/iio:deviceX/in_currentX_q_raw
1697-
KernelVersion: 3.18
1690+
What: /sys/bus/iio/devices/iio:deviceX/in_currentY_raw
1691+
What: /sys/bus/iio/devices/iio:deviceX/in_currentY_supply_raw
1692+
What: /sys/bus/iio/devices/iio:deviceX/in_currentY_i_raw
1693+
What: /sys/bus/iio/devices/iio:deviceX/in_currentY_q_raw
1694+
KernelVersion: 3.17
16981695
Contact: linux-iio@vger.kernel.org
16991696
Description:
1700-
Raw current measurement from channel X. Units are in milliamps
1697+
Raw current measurement from channel Y. Units are in milliamps
17011698
after application of scale and offset. If no offset or scale is
17021699
present, output should be considered as processed with the
1703-
unit in milliamps.
1700+
unit in milliamps. In special cases where the channel does not
1701+
correspond to externally available input one of the named
1702+
versions may be used.
17041703

17051704
Channels with 'i' and 'q' modifiers always exist in pairs and both
17061705
channels refer to the same signal. The 'i' channel contains the in-phase
@@ -1864,9 +1863,9 @@ Description:
18641863
hardware fifo watermark level.
18651864

18661865
What: /sys/bus/iio/devices/iio:deviceX/in_temp_calibemissivity
1867-
What: /sys/bus/iio/devices/iio:deviceX/in_tempX_calibemissivity
1866+
What: /sys/bus/iio/devices/iio:deviceX/in_tempY_calibemissivity
18681867
What: /sys/bus/iio/devices/iio:deviceX/in_temp_object_calibemissivity
1869-
What: /sys/bus/iio/devices/iio:deviceX/in_tempX_object_calibemissivity
1868+
What: /sys/bus/iio/devices/iio:deviceX/in_tempY_object_calibemissivity
18701869
KernelVersion: 4.1
18711870
Contact: linux-iio@vger.kernel.org
18721871
Description:
@@ -1887,27 +1886,27 @@ Description:
18871886
is considered as one sample for <type>[_name]_sampling_frequency.
18881887

18891888
What: /sys/bus/iio/devices/iio:deviceX/in_concentration_raw
1890-
What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_raw
1889+
What: /sys/bus/iio/devices/iio:deviceX/in_concentrationY_raw
18911890
What: /sys/bus/iio/devices/iio:deviceX/in_concentration_co2_raw
1892-
What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_co2_raw
1891+
What: /sys/bus/iio/devices/iio:deviceX/in_concentrationY_co2_raw
18931892
What: /sys/bus/iio/devices/iio:deviceX/in_concentration_ethanol_raw
1894-
What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_ethanol_raw
1893+
What: /sys/bus/iio/devices/iio:deviceX/in_concentrationY_ethanol_raw
18951894
What: /sys/bus/iio/devices/iio:deviceX/in_concentration_h2_raw
1896-
What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_h2_raw
1895+
What: /sys/bus/iio/devices/iio:deviceX/in_concentrationY_h2_raw
18971896
What: /sys/bus/iio/devices/iio:deviceX/in_concentration_o2_raw
1898-
What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_o2_raw
1897+
What: /sys/bus/iio/devices/iio:deviceX/in_concentrationY_o2_raw
18991898
What: /sys/bus/iio/devices/iio:deviceX/in_concentration_voc_raw
1900-
What: /sys/bus/iio/devices/iio:deviceX/in_concentrationX_voc_raw
1899+
What: /sys/bus/iio/devices/iio:deviceX/in_concentrationY_voc_raw
19011900
KernelVersion: 4.3
19021901
Contact: linux-iio@vger.kernel.org
19031902
Description:
19041903
Raw (unscaled no offset etc.) reading of a substance. Units
19051904
after application of scale and offset are percents.
19061905

19071906
What: /sys/bus/iio/devices/iio:deviceX/in_resistance_raw
1908-
What: /sys/bus/iio/devices/iio:deviceX/in_resistanceX_raw
1907+
What: /sys/bus/iio/devices/iio:deviceX/in_resistanceY_raw
19091908
What: /sys/bus/iio/devices/iio:deviceX/out_resistance_raw
1910-
What: /sys/bus/iio/devices/iio:deviceX/out_resistanceX_raw
1909+
What: /sys/bus/iio/devices/iio:deviceX/out_resistanceY_raw
19111910
KernelVersion: 4.3
19121911
Contact: linux-iio@vger.kernel.org
19131912
Description:
@@ -2096,7 +2095,7 @@ Description:
20962095
One of the following thermocouple types: B, E, J, K, N, R, S, T.
20972096

20982097
What: /sys/bus/iio/devices/iio:deviceX/in_temp_object_calibambient
2099-
What: /sys/bus/iio/devices/iio:deviceX/in_tempX_object_calibambient
2098+
What: /sys/bus/iio/devices/iio:deviceX/in_tempY_object_calibambient
21002099
KernelVersion: 5.10
21012100
Contact: linux-iio@vger.kernel.org
21022101
Description:
@@ -2172,9 +2171,9 @@ Description:
21722171

21732172
- a range specified as "[min step max]"
21742173

2175-
What: /sys/bus/iio/devices/iio:deviceX/in_voltageX_sampling_frequency
2174+
What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_sampling_frequency
21762175
What: /sys/bus/iio/devices/iio:deviceX/in_powerY_sampling_frequency
2177-
What: /sys/bus/iio/devices/iio:deviceX/in_currentZ_sampling_frequency
2176+
What: /sys/bus/iio/devices/iio:deviceX/in_currentY_sampling_frequency
21782177
KernelVersion: 5.20
21792178
Contact: linux-iio@vger.kernel.org
21802179
Description:
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_sys_calibration
2+
KernelVersion: 5.5
3+
Contact: linux-iio@vger.kernel.org
4+
Description:
5+
This attribute, if available, initiates the system calibration procedure. This is done on a
6+
single channel at a time. Write '1' to start the calibration.
7+
8+
What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_sys_calibration_mode_available
9+
KernelVersion: 5.5
10+
Contact: linux-iio@vger.kernel.org
11+
Description:
12+
This attribute, if available, returns a list with the possible calibration modes.
13+
There are two available options:
14+
"zero_scale" - calibrate to zero scale
15+
"full_scale" - calibrate to full scale
16+
17+
What: /sys/bus/iio/devices/iio:deviceX/in_voltageY_sys_calibration_mode
18+
KernelVersion: 5.5
19+
Contact: linux-iio@vger.kernel.org
20+
Description:
21+
This attribute, if available, sets up the calibration mode used in the system calibration
22+
procedure. Reading returns the current calibration mode.
23+
Writing sets the system calibration mode.

Documentation/ABI/testing/sysfs-bus-iio-adc-ad7192

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -19,33 +19,9 @@ Description:
1919
the bridge can be disconnected (when it is not being used
2020
using the bridge_switch_en attribute.
2121

22-
What: /sys/bus/iio/devices/iio:deviceX/in_voltagex_sys_calibration
23-
KernelVersion:
24-
Contact: linux-iio@vger.kernel.org
25-
Description:
26-
Initiates the system calibration procedure. This is done on a
27-
single channel at a time. Write '1' to start the calibration.
28-
2922
What: /sys/bus/iio/devices/iio:deviceX/in_voltage2-voltage2_shorted_raw
3023
KernelVersion:
3124
Contact: linux-iio@vger.kernel.org
3225
Description:
3326
Measure voltage from AIN2 pin connected to AIN(+)
3427
and AIN(-) shorted.
35-
36-
What: /sys/bus/iio/devices/iio:deviceX/in_voltagex_sys_calibration_mode_available
37-
KernelVersion:
38-
Contact: linux-iio@vger.kernel.org
39-
Description:
40-
Reading returns a list with the possible calibration modes.
41-
There are two available options:
42-
"zero_scale" - calibrate to zero scale
43-
"full_scale" - calibrate to full scale
44-
45-
What: /sys/bus/iio/devices/iio:deviceX/in_voltagex_sys_calibration_mode
46-
KernelVersion:
47-
Contact: linux-iio@vger.kernel.org
48-
Description:
49-
Sets up the calibration mode used in the system calibration
50-
procedure. Reading returns the current calibration mode.
51-
Writing sets the system calibration mode.
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
What: /sys/class/pps-gen/
2+
Date: February 2025
3+
KernelVersion: 6.13
4+
Contact: Rodolfo Giometti <giometti@enneenne.com>
5+
Description:
6+
The /sys/class/pps-gen/ directory contains files and
7+
directories that provide a unified interface to the PPS
8+
generators.
9+
10+
What: /sys/class/pps-gen/pps-genX/
11+
Date: February 2025
12+
KernelVersion: 6.13
13+
Contact: Rodolfo Giometti <giometti@enneenne.com>
14+
Description:
15+
The /sys/class/pps-gen/pps-genX/ directory is related to X-th
16+
PPS generator in the system. Each directory contain files to
17+
manage and control its PPS generator.
18+
19+
What: /sys/class/pps-gen/pps-genX/enable
20+
Date: February 2025
21+
KernelVersion: 6.13
22+
Contact: Rodolfo Giometti <giometti@enneenne.com>
23+
Description:
24+
This write-only file enables or disables generation of the
25+
PPS signal.
26+
27+
What: /sys/class/pps-gen/pps-genX/system
28+
Date: February 2025
29+
KernelVersion: 6.13
30+
Contact: Rodolfo Giometti <giometti@enneenne.com>
31+
Description:
32+
This read-only file returns "1" if the generator takes the
33+
timing from the system clock, while it returns "0" if not
34+
(i.e. from a peripheral device clock).
35+
36+
What: /sys/class/pps-gen/pps-genX/time
37+
Date: February 2025
38+
KernelVersion: 6.13
39+
Contact: Rodolfo Giometti <giometti@enneenne.com>
40+
Description:
41+
This read-only file contains the current time stored into the
42+
generator clock as two integers representing the current time
43+
seconds and nanoseconds.

Documentation/devicetree/bindings/arm/arm,coresight-dummy-source.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ properties:
3838
enum:
3939
- arm,coresight-dummy-source
4040

41+
arm,static-trace-id:
42+
description: If dummy source needs static id support, use this to set trace id.
43+
$ref: /schemas/types.yaml#/definitions/uint32
44+
minimum: 1
45+
maximum: 111
46+
4147
out-ports:
4248
$ref: /schemas/graph.yaml#/properties/ports
4349

Documentation/devicetree/bindings/arm/arm,coresight-static-replicator.yaml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,22 @@ properties:
4545
patternProperties:
4646
'^port@[01]$':
4747
description: Output connections to CoreSight Trace bus
48-
$ref: /schemas/graph.yaml#/properties/port
48+
$ref: /schemas/graph.yaml#/$defs/port-base
49+
unevaluatedProperties: false
50+
51+
properties:
52+
endpoint:
53+
$ref: /schemas/graph.yaml#/$defs/endpoint-base
54+
unevaluatedProperties: false
55+
56+
properties:
57+
filter-source:
58+
$ref: /schemas/types.yaml#/definitions/phandle
59+
description:
60+
phandle to the coresight trace source device matching the
61+
hard coded filtering for this port
62+
63+
remote-endpoint: true
4964

5065
required:
5166
- compatible
@@ -72,13 +87,15 @@ examples:
7287
reg = <0>;
7388
replicator_out_port0: endpoint {
7489
remote-endpoint = <&etb_in_port>;
90+
filter-source = <&tpdm_video>;
7591
};
7692
};
7793
7894
port@1 {
7995
reg = <1>;
8096
replicator_out_port1: endpoint {
8197
remote-endpoint = <&tpiu_in_port>;
98+
filter-source = <&tpdm_mdss>;
8299
};
83100
};
84101
};

0 commit comments

Comments
 (0)