Skip to content

Commit bb41fe3

Browse files
torvaldstorvalds
committed
Merge tag 'char-misc-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc and other driver subsystem updates from Greg KH: "Here is the big set of char/misc and a number of other driver subsystem updates for 6.9-rc1. Included in here are: - IIO driver updates, loads of new ones and evolution of existing ones - coresight driver updates - const cleanups for many driver subsystems - speakup driver additions - platform remove callback void cleanups - mei driver updates - mhi driver updates - cdx driver updates for MSI interrupt handling - nvmem driver updates - other smaller driver updates and cleanups, full details in the shortlog All of these have been in linux-next for a long time with no reported issue, other than a build warning for the speakup driver" The build warning hits clang and is a gcc (and C23) extension, and is fixed up in the merge. Link: https://lore.kernel.org/all/20240321134831.GA2762840@dev-arch.thelio-3990X/ * tag 'char-misc-6.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (279 commits) binder: remove redundant variable page_addr uio_dmem_genirq: UIO_MEM_DMA_COHERENT conversion uio_pruss: UIO_MEM_DMA_COHERENT conversion cnic,bnx2,bnx2x: use UIO_MEM_DMA_COHERENT uio: introduce UIO_MEM_DMA_COHERENT type cdx: add MSI support for CDX bus pps: use cflags-y instead of EXTRA_CFLAGS speakup: Add /dev/synthu device speakup: Fix 8bit characters from direct synth parport: sunbpp: Convert to platform remove callback returning void parport: amiga: Convert to platform remove callback returning void char: xillybus: Convert to platform remove callback returning void vmw_balloon: change maintainership MAINTAINERS: change the maintainer for hpilo driver char: xilinx_hwicap: Fix NULL vs IS_ERR() bug hpet: remove hpets::hp_clocksource platform: goldfish: move the separate 'default' propery for CONFIG_GOLDFISH char: xilinx_hwicap: drop casting to void in dev_set_drvdata greybus: move is_gb_* functions out of greybus.h greybus: Remove usage of the deprecated ida_simple_xx() API ...
2 parents 0a59b3f + 367b356 commit bb41fe3

305 files changed

Lines changed: 15165 additions & 4492 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: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,8 @@ Mukesh Ojha <quic_mojha@quicinc.com> <mojha@codeaurora.org>
439439
Muna Sinada <quic_msinada@quicinc.com> <msinada@codeaurora.org>
440440
Murali Nalajala <quic_mnalajal@quicinc.com> <mnalajal@codeaurora.org>
441441
Mythri P K <mythripk@ti.com>
442+
Nadav Amit <nadav.amit@gmail.com> <namit@vmware.com>
443+
Nadav Amit <nadav.amit@gmail.com> <namit@cs.technion.ac.il>
442444
Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com>
443445
Naoya Horiguchi <naoya.horiguchi@nec.com> <n-horiguchi@ah.jp.nec.com>
444446
Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>

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

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,3 +170,90 @@ Contact: Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_t
170170
Description:
171171
(RW) Set/Get the MSR(mux select register) for the DSB subunit
172172
TPDM.
173+
174+
What: /sys/bus/coresight/devices/<tpdm-name>/cmb_mode
175+
Date: January 2024
176+
KernelVersion 6.9
177+
Contact: Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
178+
Description: (Write) Set the data collection mode of CMB tpdm. Continuous
179+
change creates CMB data set elements on every CMBCLK edge.
180+
Trace-on-change creates CMB data set elements only when a new
181+
data set element differs in value from the previous element
182+
in a CMB data set.
183+
184+
Accepts only one of the 2 values - 0 or 1.
185+
0 : Continuous CMB collection mode.
186+
1 : Trace-on-change CMB collection mode.
187+
188+
What: /sys/bus/coresight/devices/<tpdm-name>/cmb_trig_patt/xpr[0:1]
189+
Date: January 2024
190+
KernelVersion 6.9
191+
Contact: Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
192+
Description:
193+
(RW) Set/Get the value of the trigger pattern for the CMB
194+
subunit TPDM.
195+
196+
What: /sys/bus/coresight/devices/<tpdm-name>/cmb_trig_patt/xpmr[0:1]
197+
Date: January 2024
198+
KernelVersion 6.9
199+
Contact: Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
200+
Description:
201+
(RW) Set/Get the mask of the trigger pattern for the CMB
202+
subunit TPDM.
203+
204+
What: /sys/bus/coresight/devices/<tpdm-name>/dsb_patt/tpr[0:1]
205+
Date: January 2024
206+
KernelVersion 6.9
207+
Contact: Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
208+
Description:
209+
(RW) Set/Get the value of the pattern for the CMB subunit TPDM.
210+
211+
What: /sys/bus/coresight/devices/<tpdm-name>/dsb_patt/tpmr[0:1]
212+
Date: January 2024
213+
KernelVersion 6.9
214+
Contact: Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
215+
Description:
216+
(RW) Set/Get the mask of the pattern for the CMB subunit TPDM.
217+
218+
What: /sys/bus/coresight/devices/<tpdm-name>/cmb_patt/enable_ts
219+
Date: January 2024
220+
KernelVersion 6.9
221+
Contact: Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
222+
Description:
223+
(Write) Set the pattern timestamp of CMB tpdm. Read
224+
the pattern timestamp of CMB tpdm.
225+
226+
Accepts only one of the 2 values - 0 or 1.
227+
0 : Disable CMB pattern timestamp.
228+
1 : Enable CMB pattern timestamp.
229+
230+
What: /sys/bus/coresight/devices/<tpdm-name>/cmb_trig_ts
231+
Date: January 2024
232+
KernelVersion 6.9
233+
Contact: Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
234+
Description:
235+
(RW) Set/Get the trigger timestamp of the CMB for tpdm.
236+
237+
Accepts only one of the 2 values - 0 or 1.
238+
0 : Set the CMB trigger type to false
239+
1 : Set the CMB trigger type to true
240+
241+
What: /sys/bus/coresight/devices/<tpdm-name>/cmb_ts_all
242+
Date: January 2024
243+
KernelVersion 6.9
244+
Contact: Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
245+
Description:
246+
(RW) Read or write the status of timestamp upon all interface.
247+
Only value 0 and 1 can be written to this node. Set this node to 1 to requeset
248+
timestamp to all trace packet.
249+
Accepts only one of the 2 values - 0 or 1.
250+
0 : Disable the timestamp of all trace packets.
251+
1 : Enable the timestamp of all trace packets.
252+
253+
What: /sys/bus/coresight/devices/<tpdm-name>/cmb_msr/msr[0:31]
254+
Date: January 2024
255+
KernelVersion 6.9
256+
Contact: Jinlong Mao (QUIC) <quic_jinlmao@quicinc.com>, Tao Zhang (QUIC) <quic_taozha@quicinc.com>
257+
Description:
258+
(RW) Set/Get the MSR(mux select register) for the CMB subunit
259+
TPDM.

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
What: /sys/bus/iio/devices/iio:deviceX/in_shunt_resistorY
2+
KernelVersion: 6.7
3+
Contact: linux-iio@vger.kernel.org
4+
Description:
5+
The value of the shunt resistor may be known only at runtime
6+
and set by a client application. This attribute allows to
7+
set its value in micro-ohms. X is the IIO index of the device.
8+
Y is the channel number. The value is used to calculate
9+
current, power and accumulated energy.

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

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,21 @@ properties:
4444
minItems: 1
4545
maxItems: 2
4646

47-
qcom,dsb-element-size:
47+
qcom,dsb-element-bits:
4848
description:
4949
Specifies the DSB(Discrete Single Bit) element size supported by
5050
the monitor. The associated aggregator will read this size before it
5151
is enabled. DSB element size currently only supports 32-bit and 64-bit.
52-
$ref: /schemas/types.yaml#/definitions/uint8
5352
enum: [32, 64]
5453

54+
qcom,cmb-element-bits:
55+
description:
56+
Specifies the CMB(Continuous Multi-Bit) element size supported by
57+
the monitor. The associated aggregator will read this size before it
58+
is enabled. CMB element size currently only supports 8-bit, 32-bit
59+
and 64-bit.
60+
enum: [8, 32, 64]
61+
5562
qcom,dsb-msrs-num:
5663
description:
5764
Specifies the number of DSB(Discrete Single Bit) MSR(mux select register)
@@ -61,6 +68,15 @@ properties:
6168
minimum: 0
6269
maximum: 32
6370

71+
qcom,cmb-msrs-num:
72+
description:
73+
Specifies the number of CMB MSR(mux select register) registers supported
74+
by the monitor. If this property is not configured or set to 0, it means
75+
this TPDM doesn't support CMB MSR.
76+
$ref: /schemas/types.yaml#/definitions/uint32
77+
minimum: 0
78+
maximum: 32
79+
6480
clocks:
6581
maxItems: 1
6682

@@ -94,7 +110,7 @@ examples:
94110
compatible = "qcom,coresight-tpdm", "arm,primecell";
95111
reg = <0x0684c000 0x1000>;
96112
97-
qcom,dsb-element-size = /bits/ 8 <32>;
113+
qcom,dsb-element-bits = <32>;
98114
qcom,dsb-msrs-num = <16>;
99115
100116
clocks = <&aoss_qmp>;
@@ -110,4 +126,22 @@ examples:
110126
};
111127
};
112128
129+
tpdm@6c29000 {
130+
compatible = "qcom,coresight-tpdm", "arm,primecell";
131+
reg = <0x06c29000 0x1000>;
132+
133+
qcom,cmb-element-bits = <64>;
134+
qcom,cmb-msrs-num = <32>;
135+
136+
clocks = <&aoss_qmp>;
137+
clock-names = "apb_pclk";
138+
139+
out-ports {
140+
port {
141+
tpdm_ipcc_out_funnel_center: endpoint {
142+
remote-endpoint = <&funnel_center_in_tpdm_ipcc>;
143+
};
144+
};
145+
};
146+
};
113147
...

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ properties:
2222
maxItems: 1
2323

2424
label:
25-
$ref: /schemas/types.yaml#/definitions/string
2625
description: Unique name to identify which channel this is.
2726

2827
bipolar:

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,9 @@ properties:
4444
Pin that controls the powerdown mode of the device.
4545
maxItems: 1
4646

47+
io-backends:
48+
maxItems: 1
49+
4750
reset-gpios:
4851
description:
4952
Reset pin for the device.
@@ -68,6 +71,7 @@ examples:
6871
reg = <0>;
6972
clocks = <&adc_clk>;
7073
clock-names = "adc-clk";
74+
io-backends = <&iio_backend>;
7175
};
7276
};
7377
...

‎Documentation/devicetree/bindings/iio/adc/adi,axi-adc.yaml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,15 @@ properties:
3939
$ref: /schemas/types.yaml#/definitions/phandle
4040
description:
4141
A reference to a the actual ADC to which this FPGA ADC interfaces to.
42+
deprecated: true
43+
44+
'#io-backend-cells':
45+
const: 0
4246

4347
required:
4448
- compatible
4549
- dmas
4650
- reg
47-
- adi,adc-dev
4851

4952
additionalProperties: false
5053

@@ -55,7 +58,6 @@ examples:
5558
reg = <0x44a00000 0x10000>;
5659
dmas = <&rx_dma 0>;
5760
dma-names = "rx";
58-
59-
adi,adc-dev = <&spi_adc>;
61+
#io-backend-cells = <0>;
6062
};
6163
...

‎Documentation/devicetree/bindings/iio/adc/microchip,pac1934.yaml‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/iio/adc/microchip,pac1934.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Microchip PAC1934 Power Monitors with Accumulator
8+
9+
maintainers:
10+
- Marius Cristea <marius.cristea@microchip.com>
11+
12+
description: |
13+
This device is part of the Microchip family of Power Monitors with
14+
Accumulator.
15+
The datasheet for PAC1931, PAC1932, PAC1933 and PAC1934 can be found here:
16+
https://ww1.microchip.com/downloads/aemDocuments/documents/OTH/ProductDocuments/DataSheets/PAC1931-Family-Data-Sheet-DS20005850E.pdf
17+
18+
properties:
19+
compatible:
20+
enum:
21+
- microchip,pac1931
22+
- microchip,pac1932
23+
- microchip,pac1933
24+
- microchip,pac1934
25+
26+
reg:
27+
maxItems: 1
28+
29+
"#address-cells":
30+
const: 1
31+
32+
"#size-cells":
33+
const: 0
34+
35+
interrupts:
36+
maxItems: 1
37+
38+
slow-io-gpios:
39+
description:
40+
A GPIO used to trigger a change is sampling rate (lowering the chip power
41+
consumption). If configured in SLOW mode, if this pin is forced high,
42+
sampling rate is forced to eight samples/second. When it is forced low,
43+
the sampling rate is 1024 samples/second unless a different sample rate
44+
has been programmed.
45+
46+
patternProperties:
47+
"^channel@[1-4]+$":
48+
type: object
49+
$ref: adc.yaml
50+
description:
51+
Represents the external channels which are connected to the ADC.
52+
53+
properties:
54+
reg:
55+
items:
56+
minimum: 1
57+
maximum: 4
58+
59+
shunt-resistor-micro-ohms:
60+
description:
61+
Value in micro Ohms of the shunt resistor connected between
62+
the SENSE+ and SENSE- inputs, across which the current is measured.
63+
Value is needed to compute the scaling of the measured current.
64+
65+
required:
66+
- reg
67+
- shunt-resistor-micro-ohms
68+
69+
unevaluatedProperties: false
70+
71+
required:
72+
- compatible
73+
- reg
74+
- "#address-cells"
75+
- "#size-cells"
76+
77+
additionalProperties: false
78+
79+
examples:
80+
- |
81+
i2c {
82+
#address-cells = <1>;
83+
#size-cells = <0>;
84+
85+
power-monitor@10 {
86+
compatible = "microchip,pac1934";
87+
reg = <0x10>;
88+
89+
#address-cells = <1>;
90+
#size-cells = <0>;
91+
92+
channel@1 {
93+
reg = <0x1>;
94+
shunt-resistor-micro-ohms = <24900000>;
95+
label = "CPU";
96+
};
97+
98+
channel@2 {
99+
reg = <0x2>;
100+
shunt-resistor-micro-ohms = <49900000>;
101+
label = "GPU";
102+
};
103+
104+
channel@3 {
105+
reg = <0x3>;
106+
shunt-resistor-micro-ohms = <75000000>;
107+
label = "MEM";
108+
bipolar;
109+
};
110+
111+
channel@4 {
112+
reg = <0x4>;
113+
shunt-resistor-micro-ohms = <100000000>;
114+
label = "NET";
115+
bipolar;
116+
};
117+
};
118+
};
119+
120+
...

‎Documentation/devicetree/bindings/iio/adc/nxp,imx93-adc.yaml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ properties:
3131
- description: normal conversion, include EOC (End of Conversion),
3232
ECH (End of Chain), JEOC (End of Injected Conversion) and
3333
JECH (End of injected Chain).
34-
- description: Self-testing Interrupts.
3534

3635
clocks:
3736
maxItems: 1
@@ -70,8 +69,7 @@ examples:
7069
reg = <0x44530000 0x10000>;
7170
interrupts = <GIC_SPI 217 IRQ_TYPE_LEVEL_HIGH>,
7271
<GIC_SPI 218 IRQ_TYPE_LEVEL_HIGH>,
73-
<GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>,
74-
<GIC_SPI 268 IRQ_TYPE_LEVEL_HIGH>;
72+
<GIC_SPI 219 IRQ_TYPE_LEVEL_HIGH>;
7573
clocks = <&clk IMX93_CLK_ADC1_GATE>;
7674
clock-names = "ipg";
7775
vref-supply = <&reg_vref_1v8>;

‎Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ patternProperties:
7575
in the PMIC-specific files in include/dt-bindings/iio/.
7676
7777
label:
78-
$ref: /schemas/types.yaml#/definitions/string
7978
description: |
8079
ADC input of the platform as seen in the schematics.
8180
For thermistor inputs connected to generic AMUX or GPIO inputs

0 commit comments

Comments
 (0)