Skip to content

Commit 2eff01e

Browse files
committed
Merge tag 'char-misc-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc/IIO/whatever driver subsystem updates from Greg KH: "Here is the 'big and hairy' char/misc/iio and other small driver subsystem updates for 6.13-rc1. Loads of things in here, and even a fun merge conflict! - rust misc driver bindings and other rust changes to make misc drivers actually possible. I think this is the tipping point, expect to see way more rust drivers going forward now that these bindings are present. Next merge window hopefully we will have pci and platform drivers working, which will fully enable almost all driver subsystems to start accepting (or at least getting) rust drivers. This is the end result of a lot of work from a lot of people, congrats to all of them for getting this far, you've proved many of us wrong in the best way possible, working code :) - IIO driver updates, too many to list individually, that subsystem keeps growing and growing... - Interconnect driver updates - nvmem driver updates - pwm driver updates - platform_driver::remove() fixups, loads of them - counter driver updates - misc driver updates (keba?) - binder driver updates and fixes - loads of other small char/misc/etc driver updates and additions, full details in the shortlog. All of these have been in linux-next for a while, with no other reported issues other than that merge conflict" * tag 'char-misc-6.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (401 commits) mei: vsc: Fix typo "maintstepping" -> "mainstepping" firmware: Switch back to struct platform_driver::remove() misc: isl29020: Fix the wrong format specifier scripts/tags.sh: Don't tag usages of DEFINE_MUTEX fpga: Switch back to struct platform_driver::remove() mei: vsc: Improve error logging in vsc_identify_silicon() mei: vsc: Do not re-enable interrupt from vsc_tp_reset() dt-bindings: spmi: qcom,x1e80100-spmi-pmic-arb: Add SAR2130P compatible dt-bindings: spmi: spmi-mtk-pmif: Add compatible for MT8188 spmi: pmic-arb: fix return path in for_each_available_child_of_node() iio: Move __private marking before struct element priv in struct iio_dev docs: iio: ad7380: add adaq4370-4 and adaq4380-4 iio: adc: ad7380: add support for adaq4370-4 and adaq4380-4 iio: adc: ad7380: use local dev variable to shorten long lines iio: adc: ad7380: fix oversampling formula dt-bindings: iio: adc: ad7380: add adaq4370-4 and adaq4380-4 compatible parts bus: mhi: host: pci_generic: Use pcim_iomap_region() to request and map MHI BAR bus: mhi: host: Switch trace_mhi_gen_tre fields to native endian misc: atmel-ssc: Use of_property_present() for non-boolean properties misc: keba: Add hardware dependency ...
2 parents 55cb93f + 5a6c352 commit 2eff01e

File tree

449 files changed

+22876
-5438
lines changed

Some content is hidden

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

449 files changed

+22876
-5438
lines changed

Documentation/ABI/testing/sysfs-bus-iio

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2268,6 +2268,30 @@ Description:
22682268
An example format is 16-bytes, 2-digits-per-byte, HEX-string
22692269
representing the sensor unique ID number.
22702270

2271+
What: /sys/bus/iio/devices/iio:deviceX/filter_type_available
2272+
What: /sys/bus/iio/devices/iio:deviceX/in_voltage-voltage_filter_mode_available
2273+
KernelVersion: 6.1
2274+
Contact: linux-iio@vger.kernel.org
2275+
Description:
2276+
Reading returns a list with the possible filter modes. Options
2277+
for the attribute:
2278+
2279+
* "sinc3" - The digital sinc3 filter. Moderate 1st
2280+
conversion time. Good noise performance.
2281+
* "sinc4" - Sinc 4. Excellent noise performance. Long
2282+
1st conversion time.
2283+
* "sinc5" - The digital sinc5 filter. Excellent noise
2284+
performance
2285+
* "sinc4+sinc1" - Sinc4 + averaging by 8. Low 1st conversion
2286+
time.
2287+
* "sinc3+rej60" - Sinc3 + 60Hz rejection.
2288+
* "sinc3+sinc1" - Sinc3 + averaging by 8. Low 1st conversion
2289+
time.
2290+
* "sinc3+pf1" - Sinc3 + device specific Post Filter 1.
2291+
* "sinc3+pf2" - Sinc3 + device specific Post Filter 2.
2292+
* "sinc3+pf3" - Sinc3 + device specific Post Filter 3.
2293+
* "sinc3+pf4" - Sinc3 + device specific Post Filter 4.
2294+
22712295
What: /sys/.../events/in_proximity_thresh_either_runningperiod
22722296
KernelVersion: 6.6
22732297
Contact: linux-iio@vger.kernel.org
@@ -2339,3 +2363,11 @@ KernelVersion: 6.10
23392363
Contact: linux-iio@vger.kernel.org
23402364
Description:
23412365
The value of current sense resistor in Ohms.
2366+
2367+
What: /sys/.../iio:deviceX/in_attention_input
2368+
KernelVersion: 6.13
2369+
Contact: linux-iio@vger.kernel.org
2370+
Description:
2371+
Value representing the user's attention to the system expressed
2372+
in units as percentage. This usually means if the user is
2373+
looking at the screen or not.

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

Lines changed: 0 additions & 46 deletions
This file was deleted.

Documentation/devicetree/bindings/iio/adc/adc.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,10 @@ properties:
3737
to both the positive and negative inputs of a differential ADC.
3838
The first value specifies the positive input pin, the second
3939
specifies the negative input pin.
40+
There are also some ADCs, where the differential channel has dedicated
41+
positive and negative inputs which can be used to measure differential
42+
voltage levels. For those setups, this property can be configured with
43+
the 'reg' property for both inputs (i.e. diff-channels = <reg reg>).
4044

4145
single-channel:
4246
$ref: /schemas/types.yaml#/definitions/uint32

Documentation/devicetree/bindings/iio/adc/adi,ad7173.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ description: |
2828
Datasheets for supported chips:
2929
https://www.analog.com/media/en/technical-documentation/data-sheets/AD4111.pdf
3030
https://www.analog.com/media/en/technical-documentation/data-sheets/AD4112.pdf
31+
<AD4113: not released yet>
3132
https://www.analog.com/media/en/technical-documentation/data-sheets/AD4114.pdf
3233
https://www.analog.com/media/en/technical-documentation/data-sheets/AD4115.pdf
3334
https://www.analog.com/media/en/technical-documentation/data-sheets/AD4116.pdf
@@ -44,6 +45,7 @@ properties:
4445
enum:
4546
- adi,ad4111
4647
- adi,ad4112
48+
- adi,ad4113
4749
- adi,ad4114
4850
- adi,ad4115
4951
- adi,ad4116
@@ -331,6 +333,7 @@ allOf:
331333
enum:
332334
- adi,ad4111
333335
- adi,ad4112
336+
- adi,ad4113
334337
- adi,ad4114
335338
- adi,ad4115
336339
- adi,ad4116

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

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ description: |
2525
* https://www.analog.com/en/products/ad7386-4.html
2626
* https://www.analog.com/en/products/ad7387-4.html
2727
* https://www.analog.com/en/products/ad7388-4.html
28+
* https://www.analog.com/en/products/adaq4370-4.html
29+
* https://www.analog.com/en/products/adaq4380-4.html
2830
2931
3032
$ref: /schemas/spi/spi-peripheral-props.yaml#
@@ -46,6 +48,8 @@ properties:
4648
- adi,ad7386-4
4749
- adi,ad7387-4
4850
- adi,ad7388-4
51+
- adi,adaq4370-4
52+
- adi,adaq4380-4
4953

5054
reg:
5155
maxItems: 1
@@ -70,6 +74,20 @@ properties:
7074
refin-supply:
7175
description:
7276
A 2.5V to 3.3V supply for external reference voltage, for ad7380-4 only.
77+
For adaq devices, a 5V supply voltage. A 3.3V internal reference is
78+
derived from it. Connect to vs-p-supply for normal operation.
79+
80+
vs-p-supply:
81+
description:
82+
Amplifiers positive supply.
83+
84+
vs-n-supply:
85+
description:
86+
Amplifiers negative supply.
87+
88+
ldo-supply:
89+
description:
90+
LDO supply. Connect to vs-p-supply or a 3.6 to 5.5 V supply.
7391

7492
aina-supply:
7593
description:
@@ -97,12 +115,45 @@ properties:
97115
specify the ALERT interrupt.
98116
maxItems: 1
99117

118+
"#address-cells":
119+
const: 1
120+
121+
"#size-cells":
122+
const: 0
123+
100124
required:
101125
- compatible
102126
- reg
103127
- vcc-supply
104128
- vlogic-supply
105129

130+
patternProperties:
131+
"^channel@[0-3]$":
132+
$ref: adc.yaml
133+
type: object
134+
135+
properties:
136+
reg:
137+
description:
138+
The channel number. From 0 to 3 corresponding to channels A,B,C,D
139+
minimum: 0
140+
maximum: 3
141+
142+
adi,gain-milli:
143+
description:
144+
The hardware gain applied to the ADC input (in milli units).
145+
If not present, default to 1000 (no actual gain applied).
146+
Refer to the typical connection diagrams section of the datasheet for
147+
pin wiring.
148+
$ref: /schemas/types.yaml#/definitions/uint16
149+
enum: [300, 600, 1000, 1600]
150+
default: 1000
151+
152+
required:
153+
- reg
154+
155+
additionalProperties: false
156+
106157
unevaluatedProperties: false
107158

108159
allOf:
@@ -140,13 +191,16 @@ allOf:
140191
aind-supply: false
141192

142193
# ad7380-4 uses refin-supply as external reference.
194+
# adaq devices use internal reference only, derived from refin-supply
143195
# All other chips from ad738x family use refio as optional external reference.
144196
# When refio-supply is omitted, internal reference is used.
145197
- if:
146198
properties:
147199
compatible:
148200
enum:
149201
- adi,ad7380-4
202+
- adi,adaq4370-4
203+
- adi,adaq4380-4
150204
then:
151205
properties:
152206
refio-supply: false
@@ -156,6 +210,27 @@ allOf:
156210
properties:
157211
refin-supply: false
158212

213+
# adaq devices need more supplies and using channel to declare gain property
214+
# only applies to adaq devices
215+
- if:
216+
properties:
217+
compatible:
218+
enum:
219+
- adi,adaq4370-4
220+
- adi,adaq4380-4
221+
then:
222+
required:
223+
- vs-p-supply
224+
- vs-n-supply
225+
- ldo-supply
226+
else:
227+
properties:
228+
vs-p-supply: false
229+
vs-n-supply: false
230+
ldo-supply: false
231+
patternProperties:
232+
"^channel@[0-3]$": false
233+
159234
examples:
160235
- |
161236
#include <dt-bindings/interrupt-controller/irq.h>
@@ -180,3 +255,48 @@ examples:
180255
refio-supply = <&supply_2_5V>;
181256
};
182257
};
258+
259+
- |
260+
#include <dt-bindings/interrupt-controller/irq.h>
261+
262+
spi {
263+
#address-cells = <1>;
264+
#size-cells = <0>;
265+
266+
adc@0 {
267+
compatible = "adi,adaq4380-4";
268+
reg = <0>;
269+
270+
spi-cpol;
271+
spi-cpha;
272+
spi-max-frequency = <80000000>;
273+
274+
interrupts = <27 IRQ_TYPE_EDGE_FALLING>;
275+
interrupt-parent = <&gpio0>;
276+
277+
vcc-supply = <&supply_3_3V>;
278+
vlogic-supply = <&supply_3_3V>;
279+
refin-supply = <&supply_5V>;
280+
vs-p-supply = <&supply_5V>;
281+
vs-n-supply = <&supply_0V>;
282+
ldo-supply = <&supply_5V>;
283+
284+
#address-cells = <1>;
285+
#size-cells = <0>;
286+
287+
channel@0 {
288+
reg = <0>;
289+
adi,gain-milli = /bits/ 16 <300>;
290+
};
291+
292+
channel@2 {
293+
reg = <2>;
294+
adi,gain-milli = /bits/ 16 <600>;
295+
};
296+
297+
channel@3 {
298+
reg = <3>;
299+
adi,gain-milli = /bits/ 16 <1000>;
300+
};
301+
};
302+
};

0 commit comments

Comments
 (0)