Skip to content

Commit 25601e8

Browse files
torvaldstorvalds
committed
Merge tag 'char-misc-6.15-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 subsystems for 6.15-rc1. Lots of stuff in here, including: - loads of IIO changes and driver updates - counter driver updates - w1 driver updates - faux conversions for some drivers that were abusing the platform bus interface - coresight driver updates - rust miscdevice binding updates based on real-world-use - other minor driver updates All of these have been in linux-next with no reported issues for quite a while" * tag 'char-misc-6.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (292 commits) samples: rust_misc_device: fix markup in top-level docs Coresight: Fix a NULL vs IS_ERR() bug in probe misc: lis3lv02d: convert to use faux_device tlclk: convert to use faux_device regulator: dummy: convert to use the faux device interface bus: mhi: host: Fix race between unprepare and queue_buf coresight: configfs: Constify struct config_item_type doc: iio: ad7380: describe offload support iio: ad7380: add support for SPI offload iio: light: Add check for array bounds in veml6075_read_int_time_ms iio: adc: ti-ads7924 Drop unnecessary function parameters staging: iio: ad9834: Use devm_regulator_get_enable() staging: iio: ad9832: Use devm_regulator_get_enable() iio: gyro: bmg160_spi: add of_match_table dt-bindings: iio: adc: Add i.MX94 and i.MX95 support iio: adc: ad7768-1: remove unnecessary locking Documentation: ABI: add wideband filter type to sysfs-bus-iio iio: adc: ad7768-1: set MOSI idle state to prevent accidental reset iio: adc: ad7768-1: Fix conversion result sign iio: adc: ad7124: Benefit of dev = indio_dev->dev.parent in ad7124_parse_channel_config() ...
2 parents 2cd5769 + 5d1a5c4 commit 25601e8

File tree

265 files changed

+19335
-4179
lines changed

Some content is hidden

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

265 files changed

+19335
-4179
lines changed

Diff for: ‎Documentation/ABI/testing/sysfs-bus-coresight-devices-tpdm

+15
Original file line numberDiff line numberDiff line change
@@ -257,3 +257,18 @@ Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <quic_t
257257
Description:
258258
(RW) Set/Get the MSR(mux select register) for the CMB subunit
259259
TPDM.
260+
261+
What: /sys/bus/coresight/devices/<tpdm-name>/mcmb_trig_lane
262+
Date: Feb 2025
263+
KernelVersion 6.15
264+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
265+
Description:
266+
(RW) Set/Get which lane participates in the output pattern
267+
match cross trigger mechanism for the MCMB subunit TPDM.
268+
269+
What: /sys/bus/coresight/devices/<tpdm-name>/mcmb_lanes_select
270+
Date: Feb 2025
271+
KernelVersion 6.15
272+
Contact: Jinlong Mao (QUIC) <[email protected]>, Tao Zhang (QUIC) <[email protected]>
273+
Description:
274+
(RW) Set/Get the enablement of the individual lane.

Diff for: ‎Documentation/ABI/testing/sysfs-bus-counter

+9
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@ Contact: [email protected]
3434
Description:
3535
Count data of Count Y represented as a string.
3636

37+
What: /sys/bus/counter/devices/counterX/countY/compare
38+
KernelVersion: 6.15
39+
Contact: [email protected]
40+
Description:
41+
If the counter device supports compare registers -- registers
42+
used to compare counter channels against a particular count --
43+
the compare count for channel Y is provided by this attribute.
44+
3745
What: /sys/bus/counter/devices/counterX/countY/capture
3846
KernelVersion: 6.1
3947
Contact: [email protected]
@@ -301,6 +309,7 @@ Description:
301309

302310
What: /sys/bus/counter/devices/counterX/cascade_counts_enable_component_id
303311
What: /sys/bus/counter/devices/counterX/external_input_phase_clock_select_component_id
312+
What: /sys/bus/counter/devices/counterX/countY/compare_component_id
304313
What: /sys/bus/counter/devices/counterX/countY/capture_component_id
305314
What: /sys/bus/counter/devices/counterX/countY/ceiling_component_id
306315
What: /sys/bus/counter/devices/counterX/countY/floor_component_id

Diff for: ‎Documentation/ABI/testing/sysfs-bus-iio

+11-1
Original file line numberDiff line numberDiff line change
@@ -2268,7 +2268,7 @@ Description:
22682268
representing the sensor unique ID number.
22692269

22702270
What: /sys/bus/iio/devices/iio:deviceX/filter_type_available
2271-
What: /sys/bus/iio/devices/iio:deviceX/in_voltage-voltage_filter_mode_available
2271+
What: /sys/bus/iio/devices/iio:deviceX/in_voltage-voltage_filter_type_available
22722272
KernelVersion: 6.1
22732273
Contact: [email protected]
22742274
Description:
@@ -2290,6 +2290,16 @@ Description:
22902290
* "sinc3+pf2" - Sinc3 + device specific Post Filter 2.
22912291
* "sinc3+pf3" - Sinc3 + device specific Post Filter 3.
22922292
* "sinc3+pf4" - Sinc3 + device specific Post Filter 4.
2293+
* "wideband" - filter with wideband low ripple passband
2294+
and sharp transition band.
2295+
2296+
What: /sys/bus/iio/devices/iio:deviceX/filter_type
2297+
What: /sys/bus/iio/devices/iio:deviceX/in_voltageY-voltageZ_filter_type
2298+
KernelVersion: 6.1
2299+
Contact: [email protected]
2300+
Description:
2301+
Specifies which filter type apply to the channel. The possible
2302+
values are given by the filter_type_available attribute.
22932303

22942304
What: /sys/.../events/in_proximity_thresh_either_runningperiod
22952305
KernelVersion: 6.6

Diff for: ‎Documentation/ABI/testing/sysfs-bus-iio-adc-ad4130

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/in_voltage-voltage_filter_mode_available
2+
KernelVersion: 6.2
3+
Contact: [email protected]
4+
Description:
5+
Reading returns a list with the possible filter modes.
6+
7+
This ABI is only kept for backwards compatibility and the values
8+
returned are identical to filter_type_available attribute
9+
documented in Documentation/ABI/testing/sysfs-bus-iio. Please,
10+
use filter_type_available like ABI to provide filter options for
11+
new drivers.
12+
13+
What: /sys/bus/iio/devices/iio:deviceX/in_voltageY-voltageZ_filter_mode
14+
KernelVersion: 6.2
15+
Contact: [email protected]
16+
Description:
17+
This ABI is only kept for backwards compatibility and the values
18+
returned are identical to in_voltageY-voltageZ_filter_type
19+
attribute documented in Documentation/ABI/testing/sysfs-bus-iio.
20+
Please, use in_voltageY-voltageZ_filter_type for new drivers.

Diff for: ‎Documentation/ABI/testing/sysfs-driver-intel-m10-bmc

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Description: Read only. Returns the firmware version of Intel MAX10
1717
What: /sys/bus/.../drivers/intel-m10-bmc/.../mac_address
1818
Date: January 2021
1919
KernelVersion: 5.12
20-
Contact: Peter Colberg <peter.colberg@intel.com>
20+
Contact: Peter Colberg <peter.colberg@altera.com>
2121
Description: Read only. Returns the first MAC address in a block
2222
of sequential MAC addresses assigned to the board
2323
that is managed by the Intel MAX10 BMC. It is stored in
@@ -28,7 +28,7 @@ Description: Read only. Returns the first MAC address in a block
2828
What: /sys/bus/.../drivers/intel-m10-bmc/.../mac_count
2929
Date: January 2021
3030
KernelVersion: 5.12
31-
Contact: Peter Colberg <peter.colberg@intel.com>
31+
Contact: Peter Colberg <peter.colberg@altera.com>
3232
Description: Read only. Returns the number of sequential MAC
3333
addresses assigned to the board managed by the Intel
3434
MAX10 BMC. This value is stored in FLASH and is mirrored

Diff for: ‎Documentation/ABI/testing/sysfs-driver-intel-m10-bmc-sec-update

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
What: /sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/sr_root_entry_hash
22
Date: Sep 2022
33
KernelVersion: 5.20
4-
Contact: Peter Colberg <peter.colberg@intel.com>
4+
Contact: Peter Colberg <peter.colberg@altera.com>
55
Description: Read only. Returns the root entry hash for the static
66
region if one is programmed, else it returns the
77
string: "hash not programmed". This file is only
@@ -11,7 +11,7 @@ Description: Read only. Returns the root entry hash for the static
1111
What: /sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/pr_root_entry_hash
1212
Date: Sep 2022
1313
KernelVersion: 5.20
14-
Contact: Peter Colberg <peter.colberg@intel.com>
14+
Contact: Peter Colberg <peter.colberg@altera.com>
1515
Description: Read only. Returns the root entry hash for the partial
1616
reconfiguration region if one is programmed, else it
1717
returns the string: "hash not programmed". This file
@@ -21,7 +21,7 @@ Description: Read only. Returns the root entry hash for the partial
2121
What: /sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/bmc_root_entry_hash
2222
Date: Sep 2022
2323
KernelVersion: 5.20
24-
Contact: Peter Colberg <peter.colberg@intel.com>
24+
Contact: Peter Colberg <peter.colberg@altera.com>
2525
Description: Read only. Returns the root entry hash for the BMC image
2626
if one is programmed, else it returns the string:
2727
"hash not programmed". This file is only visible if the
@@ -31,31 +31,31 @@ Description: Read only. Returns the root entry hash for the BMC image
3131
What: /sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/sr_canceled_csks
3232
Date: Sep 2022
3333
KernelVersion: 5.20
34-
Contact: Peter Colberg <peter.colberg@intel.com>
34+
Contact: Peter Colberg <peter.colberg@altera.com>
3535
Description: Read only. Returns a list of indices for canceled code
3636
signing keys for the static region. The standard bitmap
3737
list format is used (e.g. "1,2-6,9").
3838

3939
What: /sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/pr_canceled_csks
4040
Date: Sep 2022
4141
KernelVersion: 5.20
42-
Contact: Peter Colberg <peter.colberg@intel.com>
42+
Contact: Peter Colberg <peter.colberg@altera.com>
4343
Description: Read only. Returns a list of indices for canceled code
4444
signing keys for the partial reconfiguration region. The
4545
standard bitmap list format is used (e.g. "1,2-6,9").
4646

4747
What: /sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/bmc_canceled_csks
4848
Date: Sep 2022
4949
KernelVersion: 5.20
50-
Contact: Peter Colberg <peter.colberg@intel.com>
50+
Contact: Peter Colberg <peter.colberg@altera.com>
5151
Description: Read only. Returns a list of indices for canceled code
5252
signing keys for the BMC. The standard bitmap list format
5353
is used (e.g. "1,2-6,9").
5454

5555
What: /sys/bus/platform/drivers/intel-m10bmc-sec-update/.../security/flash_count
5656
Date: Sep 2022
5757
KernelVersion: 5.20
58-
Contact: Peter Colberg <peter.colberg@intel.com>
58+
Contact: Peter Colberg <peter.colberg@altera.com>
5959
Description: Read only. Returns number of times the secure update
6060
staging area has been flashed.
6161
Format: "%u".

Diff for: ‎Documentation/ABI/testing/sysfs-pps-gen-tio

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
What: /sys/class/pps-gen/pps-genx/enable
2+
Date: April 2025
3+
KernelVersion: 6.15
4+
Contact: Subramanian Mohan<[email protected]>
5+
Description:
6+
Enable or disable PPS TIO generator output.

Diff for: ‎Documentation/devicetree/bindings/arm/arm,coresight-tmc.yaml

+26
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,29 @@ properties:
101101
and ETF configurations.
102102
$ref: /schemas/graph.yaml#/properties/port
103103

104+
memory-region:
105+
items:
106+
- description: Reserved trace buffer memory for ETR and ETF sinks.
107+
For ETR, this reserved memory region is used for trace data capture.
108+
Same region is used for trace data retention as well after a panic
109+
or watchdog reset.
110+
This reserved memory region is used as trace buffer or used for trace
111+
data retention only if specifically selected by the user in sysfs
112+
interface.
113+
The default memory usage models for ETR in sysfs/perf modes are
114+
otherwise unaltered.
115+
116+
For ETF, this reserved memory region is used by default for
117+
retention of trace data synced from internal SRAM after a panic
118+
or watchdog reset.
119+
- description: Reserved meta data memory. Used for ETR and ETF sinks
120+
for storing metadata.
121+
122+
memory-region-names:
123+
items:
124+
- const: tracedata
125+
- const: metadata
126+
104127
required:
105128
- compatible
106129
- reg
@@ -115,6 +138,9 @@ examples:
115138
etr@20070000 {
116139
compatible = "arm,coresight-tmc", "arm,primecell";
117140
reg = <0x20070000 0x1000>;
141+
memory-region = <&etr_trace_mem_reserved>,
142+
<&etr_mdata_mem_reserved>;
143+
memory-region-names = "tracedata", "metadata";
118144
119145
clocks = <&oscclk6a>;
120146
clock-names = "apb_pclk";

Diff for: ‎Documentation/devicetree/bindings/arm/qcom,coresight-ctcu.yaml

+84
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/arm/qcom,coresight-ctcu.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: CoreSight TMC Control Unit
8+
9+
maintainers:
10+
- Yuanfang Zhang <[email protected]>
11+
- Mao Jinlong <[email protected]>
12+
- Jie Gan <[email protected]>
13+
14+
description: |
15+
The Trace Memory Controller(TMC) is used for Embedded Trace Buffer(ETB),
16+
Embedded Trace FIFO(ETF) and Embedded Trace Router(ETR) configurations.
17+
The configuration mode (ETB, ETF, ETR) is discovered at boot time when
18+
the device is probed.
19+
20+
The Coresight TMC Control unit controls various Coresight behaviors.
21+
It works as a helper device when connected to TMC ETR device.
22+
It is responsible for controlling the data filter function based on
23+
the source device's Trace ID for TMC ETR device. The trace data with
24+
that Trace id can get into ETR's buffer while other trace data gets
25+
ignored.
26+
27+
properties:
28+
compatible:
29+
enum:
30+
- qcom,sa8775p-ctcu
31+
32+
reg:
33+
maxItems: 1
34+
35+
clocks:
36+
maxItems: 1
37+
38+
clock-names:
39+
items:
40+
- const: apb
41+
42+
in-ports:
43+
$ref: /schemas/graph.yaml#/properties/ports
44+
45+
patternProperties:
46+
'^port(@[0-1])?$':
47+
description: Input connections from CoreSight Trace bus
48+
$ref: /schemas/graph.yaml#/properties/port
49+
50+
required:
51+
- compatible
52+
- reg
53+
- in-ports
54+
55+
additionalProperties: false
56+
57+
examples:
58+
- |
59+
ctcu@1001000 {
60+
compatible = "qcom,sa8775p-ctcu";
61+
reg = <0x1001000 0x1000>;
62+
63+
clocks = <&aoss_qmp>;
64+
clock-names = "apb";
65+
66+
in-ports {
67+
#address-cells = <1>;
68+
#size-cells = <0>;
69+
70+
port@0 {
71+
reg = <0>;
72+
ctcu_in_port0: endpoint {
73+
remote-endpoint = <&etr0_out_port>;
74+
};
75+
};
76+
77+
port@1 {
78+
reg = <1>;
79+
ctcu_in_port1: endpoint {
80+
remote-endpoint = <&etr1_out_port>;
81+
};
82+
};
83+
};
84+
};

Diff for: ‎Documentation/devicetree/bindings/arm/qcom,coresight-tpda.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,7 @@ properties:
5555
- const: arm,primecell
5656

5757
reg:
58-
minItems: 1
59-
maxItems: 2
58+
maxItems: 1
6059

6160
clocks:
6261
maxItems: 1

Diff for: ‎Documentation/devicetree/bindings/arm/qcom,coresight-tpdm.yaml

+1-2
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ properties:
4141
- const: arm,primecell
4242

4343
reg:
44-
minItems: 1
45-
maxItems: 2
44+
maxItems: 1
4645

4746
qcom,dsb-element-bits:
4847
description:

0 commit comments

Comments
 (0)