Skip to content

Commit cb4eb67

Browse files
torvaldstorvalds
committed
Merge tag 'char-misc-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char / misc / IIO / and others driver updates from Greg KH: "Here is the char/misc/iio and other smaller driver subsystem updates for 7.1-rc1. Lots of stuff in here, all tiny, but relevant for the different drivers they touch. Major points in here is: - the usual large set of new IIO drivers and updates for that subsystem (the large majority of this diffstat) - lots of comedi driver updates and bugfixes - coresight driver updates - interconnect driver updates and additions - mei driver updates - binder (both rust and C versions) updates and fixes - lots of other smaller driver subsystem updates and additions All of these have been in linux-next for a while with no reported issues" * tag 'char-misc-7.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (405 commits) coresight: tpdm: fix invalid MMIO access issue mei: me: add nova lake point H DID mei: lb: add late binding version 2 mei: bus: add mei_cldev_uuid w1: ds2490: drop redundant device reference bus: mhi: host: pci_generic: Add Telit FE912C04 modem support mei: csc: wake device while reading firmware status mei: csc: support controller with separate PCI device mei: convert PCI error to common errno mei: trace: print return value of pci_cfg_read mei: me: move trace into firmware status read mei: fix idle print specifiers mei: me: use PCI_DEVICE_DATA macro sonypi: Convert ACPI driver to a platform one misc: apds990x: fix all kernel-doc warnings most: usb: Use kzalloc_objs for endpoint address array hpet: Convert ACPI driver to a platform one misc: vmw_vmci: Fix spelling mistakes in comments parport: Remove completed item from to-do list char: remove unnecessary module_init/exit functions ...
2 parents b2680ba + 1c0220a commit cb4eb67

356 files changed

Lines changed: 12801 additions & 4299 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.

‎.mailmap‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -587,6 +587,7 @@ Michel Lespinasse <michel@lespinasse.org> <walken@google.com>
587587
Michel Lespinasse <michel@lespinasse.org> <walken@zoy.org>
588588
Mickaël Salaün <mic@digikod.net> <mic@linux.microsoft.com>
589589
Miguel Ojeda <ojeda@kernel.org> <miguel.ojeda.sandonis@gmail.com>
590+
Mike Leach <mike.leach@arm.com> <mike.leach@linaro.org>
590591
Mike Rapoport <rppt@kernel.org> <mike@compulab.co.il>
591592
Mike Rapoport <rppt@kernel.org> <mike.rapoport@gmail.com>
592593
Mike Rapoport <rppt@kernel.org> <rppt@linux.ibm.com>

‎Documentation/ABI/stable/sysfs-driver-speakup‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ What: /sys/accessibility/speakup/bleeps
1616
KernelVersion: 2.6
1717
Contact: speakup@linux-speakup.org
1818
Description: This controls whether one hears beeps through the PC speaker
19-
when using speakup's review commands.
20-
TODO: what values does it accept?
19+
when using speakup's review commands. Range: 0-3. 0 = off, 1 = beeps
20+
only, 2 = announcements only, 3 = beeps and announcements (default).
2121

2222
What: /sys/accessibility/speakup/bleep_time
2323
KernelVersion: 2.6

‎Documentation/ABI/testing/sysfs-bus-coresight-devices-tpdm‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -278,3 +278,13 @@ Date: Aug 2025
278278
KernelVersion 6.18
279279
Contact: Mao Jinlong <quic_jinlmao@quicinc.com>
280280
Description: (Read) Show hardware context information of device.
281+
282+
What: /sys/bus/coresight/devices/<tpdm-name>/traceid
283+
Date: March 2026
284+
KernelVersion: 7.1
285+
Contact: Jie Gan <jie.gan@oss.qualcomm.com>
286+
Description:
287+
(R) Show the trace ID that will appear in the trace stream
288+
coming from this TPDM. The trace ID is inherited from the
289+
connected TPDA device and is fixed for the lifetime of the
290+
device. Returns -EINVAL if the device has not been enabled yet.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1428,7 +1428,7 @@ KernelVersion: 2.6.35
14281428
Contact: linux-iio@vger.kernel.org
14291429
Description:
14301430
The name of the trigger source being used, as per string given
1431-
in /sys/class/iio/triggerY/name.
1431+
in /sys/bus/iio/devices/triggerY/name.
14321432

14331433
What: /sys/bus/iio/devices/iio:deviceX/bufferY/length
14341434
KernelVersion: 5.11

‎Documentation/devicetree/bindings/extcon/extcon-ptn5150.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,9 @@ properties:
4242
description:
4343
A port node to link the usb controller for the dual role switch.
4444

45+
connector:
46+
$ref: /schemas/connector/usb-connector.yaml#
47+
4548
required:
4649
- compatible
4750
- interrupts

‎Documentation/devicetree/bindings/iio/accel/adi,adxl372.yaml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,23 @@
44
$id: http://devicetree.org/schemas/iio/accel/adi,adxl372.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Analog Devices ADXL372 3-Axis, +/-(200g) Digital Accelerometer
7+
title: Analog Devices ADXL371/ADXL372 3-Axis, +/-(200g) Digital Accelerometer
88

99
maintainers:
1010
- Marcelo Schmitt <marcelo.schmitt@analog.com>
1111
- Nuno Sá <nuno.sa@analog.com>
12+
- Antoniu Miclaus <antoniu.miclaus@analog.com>
1213

1314
description: |
14-
Analog Devices ADXL372 3-Axis, +/-(200g) Digital Accelerometer that supports
15-
both I2C & SPI interfaces
15+
Analog Devices ADXL371/ADXL372 3-Axis, +/-(200g) Digital Accelerometer that
16+
supports both I2C & SPI interfaces
17+
https://www.analog.com/en/products/adxl371.html
1618
https://www.analog.com/en/products/adxl372.html
1719
1820
properties:
1921
compatible:
2022
enum:
23+
- adi,adxl371
2124
- adi,adxl372
2225

2326
reg:

‎Documentation/devicetree/bindings/iio/accel/bosch,bma255.yaml‎

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,27 @@ description:
1616

1717
properties:
1818
compatible:
19-
enum:
20-
# bmc150-accel driver in Linux
21-
- bosch,bma222
22-
- bosch,bma222e
23-
- bosch,bma250e
24-
- bosch,bma253
25-
- bosch,bma254
26-
- bosch,bma255
27-
- bosch,bma280
28-
- bosch,bmc150_accel
29-
- bosch,bmc156_accel
30-
- bosch,bmi055_accel
31-
32-
# bma180 driver in Linux
33-
- bosch,bma023
34-
- bosch,bma150
35-
- bosch,bma180
36-
- bosch,bma250
37-
- bosch,smb380
19+
oneOf:
20+
- enum:
21+
- bosch,bma222
22+
- bosch,bma222e
23+
- bosch,bma250e
24+
- bosch,bma253
25+
- bosch,bma254
26+
- bosch,bma255
27+
- bosch,bma280
28+
- bosch,bmc150_accel
29+
- bosch,bmc156_accel
30+
- bosch,bmi055_accel
31+
32+
- bosch,bma023
33+
- bosch,bma150
34+
- bosch,bma180
35+
- bosch,bma250
36+
- bosch,smb380
37+
- items:
38+
- const: bosch,bmx055-accel
39+
- const: bosch,bmc150_accel
3840

3941
reg:
4042
maxItems: 1

‎Documentation/devicetree/bindings/iio/adc/adi,ad4030.yaml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ description: |
1919
* https://www.analog.com/media/en/technical-documentation/data-sheets/ad4030-24-4032-24.pdf
2020
* https://www.analog.com/media/en/technical-documentation/data-sheets/ad4630-24_ad4632-24.pdf
2121
* https://www.analog.com/media/en/technical-documentation/data-sheets/ad4630-16-4632-16.pdf
22+
* https://www.analog.com/media/en/technical-documentation/data-sheets/adaq4216.pdf
23+
* https://www.analog.com/media/en/technical-documentation/data-sheets/adaq4224.pdf
24+
25+
$ref: /schemas/spi/spi-peripheral-props.yaml#
2226

2327
properties:
2428
compatible:
@@ -29,6 +33,8 @@ properties:
2933
- adi,ad4630-24
3034
- adi,ad4632-16
3135
- adi,ad4632-24
36+
- adi,adaq4216
37+
- adi,adaq4224
3238

3339
reg:
3440
maxItems: 1
@@ -60,6 +66,14 @@ properties:
6066
description:
6167
Internal buffered Reference. Used when ref-supply is not connected.
6268

69+
vddh-supply:
70+
description:
71+
PGIA Positive Power Supply.
72+
73+
vdd-fda-supply:
74+
description:
75+
FDA Positive Power Supply.
76+
6377
cnv-gpios:
6478
description:
6579
The Convert Input (CNV). It initiates the sampling conversions.
@@ -70,6 +84,17 @@ properties:
7084
The Reset Input (/RST). Used for asynchronous device reset.
7185
maxItems: 1
7286

87+
pga-gpios:
88+
description:
89+
A0 and A1 pins for gain selection. For devices that have PGA configuration
90+
input pins, pga-gpios should be defined.
91+
minItems: 2
92+
maxItems: 2
93+
94+
pwms:
95+
description: PWM signal connected to the CNV pin.
96+
maxItems: 1
97+
7398
interrupts:
7499
description:
75100
The BUSY pin is used to signal that the conversions results are available
@@ -107,6 +132,22 @@ allOf:
107132
properties:
108133
spi-rx-bus-width:
109134
maxItems: 1
135+
# ADAQ devices require a gain property to indicate how hardware PGA is set
136+
- if:
137+
properties:
138+
compatible:
139+
contains:
140+
pattern: ^adi,adaq
141+
then:
142+
required:
143+
- vddh-supply
144+
- vdd-fda-supply
145+
- pga-gpios
146+
properties:
147+
ref-supply: false
148+
else:
149+
properties:
150+
pga-gpios: false
110151

111152
examples:
112153
- |
@@ -148,3 +189,26 @@ examples:
148189
reset-gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
149190
};
150191
};
192+
- |
193+
#include <dt-bindings/gpio/gpio.h>
194+
195+
spi {
196+
#address-cells = <1>;
197+
#size-cells = <0>;
198+
199+
adc@0 {
200+
compatible = "adi,adaq4216";
201+
reg = <0>;
202+
spi-max-frequency = <80000000>;
203+
vdd-5v-supply = <&supply_5V>;
204+
vdd-1v8-supply = <&supply_1_8V>;
205+
vio-supply = <&supply_1_8V>;
206+
refin-supply = <&refin_sup>;
207+
vddh-supply = <&vddh>;
208+
vdd-fda-supply = <&vdd_fda>;
209+
cnv-gpios = <&gpio0 0 GPIO_ACTIVE_HIGH>;
210+
reset-gpios = <&gpio0 1 GPIO_ACTIVE_LOW>;
211+
pga-gpios = <&gpio0 2 GPIO_ACTIVE_HIGH>,
212+
<&gpio0 3 GPIO_ACTIVE_HIGH>;
213+
};
214+
};

‎Documentation/devicetree/bindings/iio/adc/adi,ad4080.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,13 @@ properties:
2727
enum:
2828
- adi,ad4080
2929
- adi,ad4081
30+
- adi,ad4082
3031
- adi,ad4083
3132
- adi,ad4084
33+
- adi,ad4085
3234
- adi,ad4086
3335
- adi,ad4087
36+
- adi,ad4088
3437

3538
reg:
3639
maxItems: 1

‎Documentation/devicetree/bindings/iio/adc/adi,ad7380.yaml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,11 @@ properties:
6262
spi-cpol: true
6363
spi-cpha: true
6464

65+
spi-rx-bus-width:
66+
maxItems: 4
67+
items:
68+
maximum: 1
69+
6570
vcc-supply:
6671
description: A 3V to 3.6V supply that powers the chip.
6772

@@ -160,6 +165,23 @@ patternProperties:
160165
unevaluatedProperties: false
161166

162167
allOf:
168+
# 2-channel chips only have two SDO lines
169+
- if:
170+
properties:
171+
compatible:
172+
enum:
173+
- adi,ad7380
174+
- adi,ad7381
175+
- adi,ad7383
176+
- adi,ad7384
177+
- adi,ad7386
178+
- adi,ad7387
179+
- adi,ad7388
180+
then:
181+
properties:
182+
spi-rx-bus-width:
183+
maxItems: 2
184+
163185
# pseudo-differential chips require common mode voltage supplies,
164186
# true differential chips don't use them
165187
- if:
@@ -284,6 +306,7 @@ examples:
284306
spi-cpol;
285307
spi-cpha;
286308
spi-max-frequency = <80000000>;
309+
spi-rx-bus-width = <1>, <1>, <1>, <1>;
287310
288311
interrupts = <27 IRQ_TYPE_EDGE_FALLING>;
289312
interrupt-parent = <&gpio0>;

0 commit comments

Comments
 (0)