Skip to content

Commit 3bad80d

Browse files
torvaldstorvalds
committed
Merge tag 'char-misc-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc and other driver updates from Greg KH: "Here is the large set of char, misc, and other "small" driver subsystem changes for 5.17-rc1. Lots of different things are in here for char/misc drivers such as: - habanalabs driver updates - mei driver updates - lkdtm driver updates - vmw_vmci driver updates - android binder driver updates - other small char/misc driver updates Also smaller driver subsystems have also been updated, including: - fpga subsystem updates - iio subsystem updates - soundwire subsystem updates - extcon subsystem updates - gnss subsystem updates - phy subsystem updates - coresight subsystem updates - firmware subsystem updates - comedi subsystem updates - mhi subsystem updates - speakup subsystem updates - rapidio subsystem updates - spmi subsystem updates - virtual driver updates - counter subsystem updates Too many individual changes to summarize, the shortlog contains the full details. All of these have been in linux-next for a while with no reported issues" * tag 'char-misc-5.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (406 commits) counter: 104-quad-8: Fix use-after-free by quad8_irq_handler dt-bindings: mux: Document mux-states property dt-bindings: ti-serdes-mux: Add defines for J721S2 SoC counter: remove old and now unused registration API counter: ti-eqep: Convert to new counter registration counter: stm32-lptimer-cnt: Convert to new counter registration counter: stm32-timer-cnt: Convert to new counter registration counter: microchip-tcb-capture: Convert to new counter registration counter: ftm-quaddec: Convert to new counter registration counter: intel-qep: Convert to new counter registration counter: interrupt-cnt: Convert to new counter registration counter: 104-quad-8: Convert to new counter registration counter: Update documentation for new counter registration functions counter: Provide alternative counter registration functions counter: stm32-timer-cnt: Convert to counter_priv() wrapper counter: stm32-lptimer-cnt: Convert to counter_priv() wrapper counter: ti-eqep: Convert to counter_priv() wrapper counter: ftm-quaddec: Convert to counter_priv() wrapper counter: intel-qep: Convert to counter_priv() wrapper counter: microchip-tcb-capture: Convert to counter_priv() wrapper ...
2 parents 871bfa0 + d47c740 commit 3bad80d

532 files changed

Lines changed: 26916 additions & 4554 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/debugfs-driver-habanalabs‎

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ Description: Allow the root user to disable/enable in runtime the clock
2121
a different engine to disable/enable its clock gating feature.
2222
The bitmask is composed of 20 bits:
2323

24-
======= ============
24+
======= ============
2525
0 - 7 DMA channels
2626
8 - 11 MME engines
2727
12 - 19 TPC engines
28-
======= ============
28+
======= ============
2929

3030
The bit's location of a specific engine can be determined
3131
using (1 << GAUDI_ENGINE_ID_*). GAUDI_ENGINE_ID_* values
@@ -155,6 +155,13 @@ Description: Triggers an I2C transaction that is generated by the device's
155155
CPU. Writing to this file generates a write transaction while
156156
reading from the file generates a read transaction
157157

158+
What: /sys/kernel/debug/habanalabs/hl<n>/i2c_len
159+
Date: Dec 2021
160+
KernelVersion: 5.17
161+
Contact: obitton@habana.ai
162+
Description: Sets I2C length in bytes for I2C transaction that is generated by
163+
the device's CPU
164+
158165
What: /sys/kernel/debug/habanalabs/hl<n>/i2c_reg
159166
Date: Jan 2019
160167
KernelVersion: 5.1
@@ -226,19 +233,19 @@ Description: Gets the state dump occurring on a CS timeout or failure.
226233
Writing an integer X discards X state dumps, so that the
227234
next read would return X+1-st newest state dump.
228235

229-
What: /sys/kernel/debug/habanalabs/hl<n>/timeout_locked
230-
Date: Sep 2021
231-
KernelVersion: 5.16
232-
Contact: obitton@habana.ai
233-
Description: Sets the command submission timeout value in seconds.
234-
235236
What: /sys/kernel/debug/habanalabs/hl<n>/stop_on_err
236237
Date: Mar 2020
237238
KernelVersion: 5.6
238239
Contact: ogabbay@kernel.org
239240
Description: Sets the stop-on_error option for the device engines. Value of
240241
"0" is for disable, otherwise enable.
241242

243+
What: /sys/kernel/debug/habanalabs/hl<n>/timeout_locked
244+
Date: Sep 2021
245+
KernelVersion: 5.16
246+
Contact: obitton@habana.ai
247+
Description: Sets the command submission timeout value in seconds.
248+
242249
What: /sys/kernel/debug/habanalabs/hl<n>/userptr
243250
Date: Jan 2019
244251
KernelVersion: 5.1

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/filter_mode_available
2+
KernelVersion:
3+
Contact: linux-iio@vger.kernel.org
4+
Description:
5+
Reading this returns the valid values that can be written to the
6+
on_altvoltage0_mode attribute:
7+
8+
- auto -> Adjust bandpass filter to track changes in input clock rate.
9+
- manual -> disable/unregister the clock rate notifier / input clock tracking.
10+
11+
What: /sys/bus/iio/devices/iio:deviceX/filter_mode
12+
KernelVersion:
13+
Contact: linux-iio@vger.kernel.org
14+
Description:
15+
This attribute configures the filter mode.
16+
Reading returns the actual mode.

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/in_altvoltage0-1_i_calibphase
2+
KernelVersion:
3+
Contact: linux-iio@vger.kernel.org
4+
Description:
5+
Read/write unscaled value for the Local Oscillatior path quadrature I phase shift.
6+
7+
What: /sys/bus/iio/devices/iio:deviceX/in_altvoltage0-1_q_calibphase
8+
KernelVersion:
9+
Contact: linux-iio@vger.kernel.org
10+
Description:
11+
Read/write unscaled value for the Local Oscillatior path quadrature Q phase shift.
12+
13+
What: /sys/bus/iio/devices/iio:deviceX/in_altvoltage0_i_calibbias
14+
KernelVersion:
15+
Contact: linux-iio@vger.kernel.org
16+
Description:
17+
Read/write value for the Local Oscillatior Feedthrough Offset Calibration I Positive
18+
side.
19+
20+
What: /sys/bus/iio/devices/iio:deviceX/in_altvoltage0_q_calibbias
21+
KernelVersion:
22+
Contact: linux-iio@vger.kernel.org
23+
Description:
24+
Read/write value for the Local Oscillatior Feedthrough Offset Calibration Q Positive side.
25+
26+
What: /sys/bus/iio/devices/iio:deviceX/in_altvoltage1_i_calibbias
27+
KernelVersion:
28+
Contact: linux-iio@vger.kernel.org
29+
Description:
30+
Read/write raw value for the Local Oscillatior Feedthrough Offset Calibration I Negative
31+
side.
32+
33+
What: /sys/bus/iio/devices/iio:deviceX/in_altvoltage1_q_calibbias
34+
KernelVersion:
35+
Contact: linux-iio@vger.kernel.org
36+
Description:
37+
Read/write raw value for the Local Oscillatior Feedthrough Offset Calibration Q Negative
38+
side.

‎Documentation/devicetree/bindings/iio/adc/fsl,vf610-adc.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: ADC found on Freescale vf610 and similar SoCs
88

99
maintainers:
10-
- Fugang Duan <fugang.duan@nxp.com>
10+
- Haibo Chen <haibo.chen@nxp.com>
1111

1212
description:
1313
ADCs found on vf610/i.MX6slx and upward SoCs from Freescale.

‎Documentation/devicetree/bindings/iio/adc/x-powers,axp209-adc.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,15 @@ description: |
2727
8 | batt_v
2828
9 | batt_chrg_i
2929
10 | batt_dischrg_i
30+
11 | ts_v
3031
3132
AXP22x
3233
------
3334
0 | pmic_temp
3435
1 | batt_v
3536
2 | batt_chrg_i
3637
3 | batt_dischrg_i
38+
4 | ts_v
3739
3840
AXP813
3941
------
@@ -42,6 +44,7 @@ description: |
4244
2 | batt_v
4345
3 | batt_chrg_i
4446
4 | batt_dischrg_i
47+
5 | ts_v
4548
4649
4750
properties:

‎Documentation/devicetree/bindings/iio/adc/xlnx,zynqmp-ams.yaml‎

Lines changed: 227 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,227 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/iio/adc/xlnx,zynqmp-ams.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Xilinx Zynq Ultrascale AMS controller
8+
9+
maintainers:
10+
- Anand Ashok Dumbre <anand.ashok.dumbre@xilinx.com>
11+
12+
description: |
13+
The AMS (Analog Monitoring System) includes an ADC as well as on-chip sensors
14+
that can be used to sample external voltages and monitor on-die operating
15+
conditions, such as temperature and supply voltage levels.
16+
The AMS has two SYSMON blocks which are PL (Programmable Logic) SYSMON and
17+
PS (Processing System) SYSMON.
18+
All designs should have AMS registers, but PS and PL are optional. The
19+
AMS controller can work with only PS, only PL and both PS and PL
20+
configurations. Please specify registers according to your design. Devicetree
21+
should always have AMS module property. Providing PS & PL module is optional.
22+
23+
AMS Channel Details
24+
```````````````````
25+
Sysmon Block |Channel| Details |Measurement
26+
|Number | |Type
27+
---------------------------------------------------------------------------------------------------------
28+
AMS CTRL |0 |System PLLs voltage measurement, VCC_PSPLL. |Voltage
29+
|1 |Battery voltage measurement, VCC_PSBATT. |Voltage
30+
|2 |PL Internal voltage measurement, VCCINT. |Voltage
31+
|3 |Block RAM voltage measurement, VCCBRAM. |Voltage
32+
|4 |PL Aux voltage measurement, VCCAUX. |Voltage
33+
|5 |Voltage measurement for six DDR I/O PLLs, VCC_PSDDR_PLL. |Voltage
34+
|6 |VCC_PSINTFP_DDR voltage measurement. |Voltage
35+
---------------------------------------------------------------------------------------------------------
36+
PS Sysmon |7 |LPD temperature measurement. |Temperature
37+
|8 |FPD temperature measurement (REMOTE). |Temperature
38+
|9 |VCC PS LPD voltage measurement (supply1). |Voltage
39+
|10 |VCC PS FPD voltage measurement (supply2). |Voltage
40+
|11 |PS Aux voltage reference (supply3). |Voltage
41+
|12 |DDR I/O VCC voltage measurement. |Voltage
42+
|13 |PS IO Bank 503 voltage measurement (supply5). |Voltage
43+
|14 |PS IO Bank 500 voltage measurement (supply6). |Voltage
44+
|15 |VCCO_PSIO1 voltage measurement. |Voltage
45+
|16 |VCCO_PSIO2 voltage measurement. |Voltage
46+
|17 |VCC_PS_GTR voltage measurement (VPS_MGTRAVCC). |Voltage
47+
|18 |VTT_PS_GTR voltage measurement (VPS_MGTRAVTT). |Voltage
48+
|19 |VCC_PSADC voltage measurement. |Voltage
49+
---------------------------------------------------------------------------------------------------------
50+
PL Sysmon |20 |PL temperature measurement. |Temperature
51+
|21 |PL Internal voltage measurement, VCCINT. |Voltage
52+
|22 |PL Auxiliary voltage measurement, VCCAUX. |Voltage
53+
|23 |ADC Reference P+ voltage measurement. |Voltage
54+
|24 |ADC Reference N- voltage measurement. |Voltage
55+
|25 |PL Block RAM voltage measurement, VCCBRAM. |Voltage
56+
|26 |LPD Internal voltage measurement, VCC_PSINTLP (supply4). |Voltage
57+
|27 |FPD Internal voltage measurement, VCC_PSINTFP (supply5). |Voltage
58+
|28 |PS Auxiliary voltage measurement (supply6). |Voltage
59+
|29 |PL VCCADC voltage measurement (vccams). |Voltage
60+
|30 |Differential analog input signal voltage measurment. |Voltage
61+
|31 |VUser0 voltage measurement (supply7). |Voltage
62+
|32 |VUser1 voltage measurement (supply8). |Voltage
63+
|33 |VUser2 voltage measurement (supply9). |Voltage
64+
|34 |VUser3 voltage measurement (supply10). |Voltage
65+
|35 |Auxiliary ch 0 voltage measurement (VAux0). |Voltage
66+
|36 |Auxiliary ch 1 voltage measurement (VAux1). |Voltage
67+
|37 |Auxiliary ch 2 voltage measurement (VAux2). |Voltage
68+
|38 |Auxiliary ch 3 voltage measurement (VAux3). |Voltage
69+
|39 |Auxiliary ch 4 voltage measurement (VAux4). |Voltage
70+
|40 |Auxiliary ch 5 voltage measurement (VAux5). |Voltage
71+
|41 |Auxiliary ch 6 voltage measurement (VAux6). |Voltage
72+
|42 |Auxiliary ch 7 voltage measurement (VAux7). |Voltage
73+
|43 |Auxiliary ch 8 voltage measurement (VAux8). |Voltage
74+
|44 |Auxiliary ch 9 voltage measurement (VAux9). |Voltage
75+
|45 |Auxiliary ch 10 voltage measurement (VAux10). |Voltage
76+
|46 |Auxiliary ch 11 voltage measurement (VAux11). |Voltage
77+
|47 |Auxiliary ch 12 voltage measurement (VAux12). |Voltage
78+
|48 |Auxiliary ch 13 voltage measurement (VAux13). |Voltage
79+
|49 |Auxiliary ch 14 voltage measurement (VAux14). |Voltage
80+
|50 |Auxiliary ch 15 voltage measurement (VAux15). |Voltage
81+
--------------------------------------------------------------------------------------------------------
82+
83+
properties:
84+
compatible:
85+
enum:
86+
- xlnx,zynqmp-ams
87+
88+
interrupts:
89+
maxItems: 1
90+
91+
reg:
92+
description: AMS Controller register space
93+
maxItems: 1
94+
95+
ranges:
96+
description:
97+
Maps the child address space for PS and/or PL.
98+
maxItems: 1
99+
100+
'#address-cells':
101+
const: 1
102+
103+
'#size-cells':
104+
const: 1
105+
106+
'#io-channel-cells':
107+
const: 1
108+
109+
ams-ps@0:
110+
type: object
111+
description: |
112+
PS (Processing System) SYSMON is memory mapped to PS. This block has
113+
built-in alarm generation logic that is used to interrupt the processor
114+
based on condition set.
115+
116+
properties:
117+
compatible:
118+
enum:
119+
- xlnx,zynqmp-ams-ps
120+
121+
reg:
122+
description: Register Space for PS-SYSMON
123+
maxItems: 1
124+
125+
required:
126+
- compatible
127+
- reg
128+
129+
additionalProperties: false
130+
131+
ams-pl@400:
132+
type: object
133+
description:
134+
PL-SYSMON is capable of monitoring off chip voltage and temperature.
135+
PL-SYSMON block has DRP, JTAG and I2C interface to enable monitoring
136+
from external master. Out of this interface currently only DRP is
137+
supported. This block has alarm generation logic that is used to
138+
interrupt the processor based on condition set.
139+
140+
properties:
141+
compatible:
142+
items:
143+
- enum:
144+
- xlnx,zynqmp-ams-pl
145+
146+
reg:
147+
description: Register Space for PL-SYSMON.
148+
maxItems: 1
149+
150+
'#address-cells':
151+
const: 1
152+
153+
'#size-cells':
154+
const: 0
155+
156+
patternProperties:
157+
"^channel@([2-4][0-9]|50)$":
158+
type: object
159+
description:
160+
Describes the external channels connected.
161+
162+
properties:
163+
reg:
164+
description:
165+
Pair of pins the channel is connected to. This value is
166+
same as Channel Number for a particular channel.
167+
minimum: 20
168+
maximum: 50
169+
170+
xlnx,bipolar:
171+
$ref: /schemas/types.yaml#/definitions/flag
172+
type: boolean
173+
description:
174+
If the set channel is used in bipolar mode.
175+
176+
required:
177+
- reg
178+
179+
additionalProperties: false
180+
181+
required:
182+
- compatible
183+
- reg
184+
- ranges
185+
186+
additionalProperties: false
187+
188+
examples:
189+
- |
190+
bus {
191+
#address-cells = <2>;
192+
#size-cells = <2>;
193+
194+
xilinx_ams: ams@ffa50000 {
195+
compatible = "xlnx,zynqmp-ams";
196+
interrupt-parent = <&gic>;
197+
interrupts = <0 56 4>;
198+
reg = <0x0 0xffa50000 0x0 0x800>;
199+
#address-cells = <1>;
200+
#size-cells = <1>;
201+
#io-channel-cells = <1>;
202+
ranges = <0 0 0xffa50800 0x800>;
203+
204+
ams_ps: ams-ps@0 {
205+
compatible = "xlnx,zynqmp-ams-ps";
206+
reg = <0 0x400>;
207+
};
208+
209+
ams_pl: ams-pl@400 {
210+
compatible = "xlnx,zynqmp-ams-pl";
211+
reg = <0x400 0x400>;
212+
#address-cells = <1>;
213+
#size-cells = <0>;
214+
channel@30 {
215+
reg = <30>;
216+
xlnx,bipolar;
217+
};
218+
channel@31 {
219+
reg = <31>;
220+
};
221+
channel@38 {
222+
reg = <38>;
223+
xlnx,bipolar;
224+
};
225+
};
226+
};
227+
};

0 commit comments

Comments
 (0)