Skip to content

Commit 1785d11

Browse files
committed
Merge tag 'char-misc-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull char/misc driver updates from Greg KH: "Here is the large set of char and misc and other driver subsystem patches for 5.9-rc1. Lots of new driver submissions in here, and cleanups and features for existing drivers. Highlights are: - habanalabs driver updates - coresight driver updates - nvmem driver updates - huge number of "W=1" build warning cleanups from Lee Jones - dyndbg updates - virtbox driver fixes and updates - soundwire driver updates - mei driver updates - phy driver updates - fpga driver updates - lots of smaller individual misc/char driver cleanups and fixes Full details are in the shortlog. All of these have been in linux-next with no reported issues" * tag 'char-misc-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (322 commits) habanalabs: remove unused but set variable 'ctx_asid' nvmem: qcom-spmi-sdam: Enable multiple devices dt-bindings: nvmem: SID: add binding for A100's SID controller nvmem: update Kconfig description nvmem: qfprom: Add fuse blowing support dt-bindings: nvmem: Add properties needed for blowing fuses dt-bindings: nvmem: qfprom: Convert to yaml nvmem: qfprom: use NVMEM_DEVID_AUTO for multiple instances nvmem: core: add support to auto devid nvmem: core: Add nvmem_cell_read_u8() nvmem: core: Grammar fixes for help text nvmem: sc27xx: add sc2730 efuse support nvmem: Enforce nvmem stride in the sysfs interface MAINTAINERS: Add git tree for NVMEM FRAMEWORK nvmem: sprd: Fix return value of sprd_efuse_probe() drivers: android: Fix the SPDX comment style drivers: android: Fix a variable declaration coding style issue drivers: android: Remove braces for a single statement if-else block drivers: android: Remove the use of else after return drivers: android: Fix a variable declaration coding style issue ...
2 parents 060a72a + 22362aa commit 1785d11

File tree

291 files changed

+10369
-4128
lines changed

Some content is hidden

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

291 files changed

+10369
-4128
lines changed

Documentation/ABI/testing/sysfs-class-mei

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,3 +90,16 @@ Description: Display trc status register content
9090
The ME FW writes Glitch Detection HW (TRC)
9191
status information into trc status register
9292
for BIOS and OS to monitor fw health.
93+
94+
What: /sys/class/mei/meiN/kind
95+
Date: Jul 2020
96+
KernelVersion: 5.8
97+
Contact: Tomas Winkler <[email protected]>
98+
Description: Display kind of the device
99+
100+
Generic devices are marked as "mei"
101+
while special purpose have their own
102+
names.
103+
Available options:
104+
- mei: generic mei device.
105+
- itouch: itouch (ipts) mei device.

Documentation/ABI/testing/sysfs-devices-platform-stratix10-rsu

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,3 +126,39 @@ Description:
126126
1 no action
127127
0 firmware record the notify code defined
128128
in b[15:0].
129+
130+
What: /sys/devices/platform/stratix10-rsu.0/dcmf0
131+
Date: June 2020
132+
KernelVersion: 5.8
133+
Contact: Richard Gong <[email protected]>
134+
Description:
135+
(RO) Decision firmware copy 0 version information.
136+
137+
What: /sys/devices/platform/stratix10-rsu.0/dcmf1
138+
Date: June 2020
139+
KernelVersion: 5.8
140+
Contact: Richard Gong <[email protected]>
141+
Description:
142+
(RO) Decision firmware copy 1 version information.
143+
144+
What: /sys/devices/platform/stratix10-rsu.0/dcmf2
145+
Date: June 2020
146+
KernelVersion: 5.8
147+
Contact: Richard Gong <[email protected]>
148+
Description:
149+
(RO) Decision firmware copy 2 version information.
150+
151+
What: /sys/devices/platform/stratix10-rsu.0/dcmf3
152+
Date: June 2020
153+
KernelVersion: 5.8
154+
Contact: Richard Gong <[email protected]>
155+
Description:
156+
(RO) Decision firmware copy 3 version information.
157+
158+
What: /sys/devices/platform/stratix10-rsu.0/max_retry
159+
Date: June 2020
160+
KernelVersion: 5.8
161+
Contact: Richard Gong <[email protected]>
162+
Description:
163+
(RO) max retry parameter is stored in the firmware
164+
decision IO section, as a byte located at offset 0x18c.

Documentation/admin-guide/dynamic-debug-howto.rst

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,10 @@ statements via::
7070

7171
nullarbor:~ # cat <debugfs>/dynamic_debug/control
7272
# filename:lineno [module]function flags format
73-
/usr/src/packages/BUILD/sgi-enhancednfs-1.4/default/net/sunrpc/svc_rdma.c:323 [svcxprt_rdma]svc_rdma_cleanup =_ "SVCRDMA Module Removed, deregister RPC RDMA transport\012"
74-
/usr/src/packages/BUILD/sgi-enhancednfs-1.4/default/net/sunrpc/svc_rdma.c:341 [svcxprt_rdma]svc_rdma_init =_ "\011max_inline : %d\012"
75-
/usr/src/packages/BUILD/sgi-enhancednfs-1.4/default/net/sunrpc/svc_rdma.c:340 [svcxprt_rdma]svc_rdma_init =_ "\011sq_depth : %d\012"
76-
/usr/src/packages/BUILD/sgi-enhancednfs-1.4/default/net/sunrpc/svc_rdma.c:338 [svcxprt_rdma]svc_rdma_init =_ "\011max_requests : %d\012"
73+
net/sunrpc/svc_rdma.c:323 [svcxprt_rdma]svc_rdma_cleanup =_ "SVCRDMA Module Removed, deregister RPC RDMA transport\012"
74+
net/sunrpc/svc_rdma.c:341 [svcxprt_rdma]svc_rdma_init =_ "\011max_inline : %d\012"
75+
net/sunrpc/svc_rdma.c:340 [svcxprt_rdma]svc_rdma_init =_ "\011sq_depth : %d\012"
76+
net/sunrpc/svc_rdma.c:338 [svcxprt_rdma]svc_rdma_init =_ "\011max_requests : %d\012"
7777
...
7878

7979

@@ -93,7 +93,7 @@ the debug statement callsites with any non-default flags::
9393

9494
nullarbor:~ # awk '$3 != "=_"' <debugfs>/dynamic_debug/control
9595
# filename:lineno [module]function flags format
96-
/usr/src/packages/BUILD/sgi-enhancednfs-1.4/default/net/sunrpc/svcsock.c:1603 [sunrpc]svc_send p "svc_process: st_sendto returned %d\012"
96+
net/sunrpc/svcsock.c:1603 [sunrpc]svc_send p "svc_process: st_sendto returned %d\012"
9797

9898
Command Language Reference
9999
==========================
@@ -156,6 +156,7 @@ against. Possible keywords are:::
156156
``line-range`` cannot contain space, e.g.
157157
"1-30" is valid range but "1 - 30" is not.
158158

159+
``module=foo`` combined keyword=value form is interchangably accepted
159160

160161
The meanings of each keyword are:
161162

@@ -164,15 +165,18 @@ func
164165
of each callsite. Example::
165166

166167
func svc_tcp_accept
168+
func *recv* # in rfcomm, bluetooth, ping, tcp
167169

168170
file
169-
The given string is compared against either the full pathname, the
170-
src-root relative pathname, or the basename of the source file of
171-
each callsite. Examples::
171+
The given string is compared against either the src-root relative
172+
pathname, or the basename of the source file of each callsite.
173+
Examples::
172174

173175
file svcsock.c
174-
file kernel/freezer.c
175-
file /usr/src/packages/BUILD/sgi-enhancednfs-1.4/default/net/sunrpc/svcsock.c
176+
file kernel/freezer.c # ie column 1 of control file
177+
file drivers/usb/* # all callsites under it
178+
file inode.c:start_* # parse :tail as a func (above)
179+
file inode.c:1-100 # parse :tail as a line-range (above)
176180

177181
module
178182
The given string is compared against the module name
@@ -182,6 +186,7 @@ module
182186

183187
module sunrpc
184188
module nfsd
189+
module drm* # both drm, drm_kms_helper
185190

186191
format
187192
The given string is searched for in the dynamic debug format
@@ -251,8 +256,8 @@ the syntax described above, but must not exceed 1023 characters. Your
251256
bootloader may impose lower limits.
252257

253258
These ``dyndbg`` params are processed just after the ddebug tables are
254-
processed, as part of the arch_initcall. Thus you can enable debug
255-
messages in all code run after this arch_initcall via this boot
259+
processed, as part of the early_initcall. Thus you can enable debug
260+
messages in all code run after this early_initcall via this boot
256261
parameter.
257262

258263
On an x86 system for example ACPI enablement is a subsys_initcall and::

Documentation/devicetree/bindings/arm/coresight.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,13 @@ its hardware characteristcs.
108108
* arm,cp14: must be present if the system accesses ETM/PTM management
109109
registers via co-processor 14.
110110

111+
* qcom,skip-power-up: boolean. Indicates that an implementation can
112+
skip powering up the trace unit. TRCPDCR.PU does not have to be set
113+
on Qualcomm Technologies Inc. systems since ETMs are in the same power
114+
domain as their CPU cores. This property is required to identify such
115+
systems with hardware errata where the CPU watchdog counter is stopped
116+
when TRCPDCR.PU is set.
117+
111118
* Optional property for TMC:
112119

113120
* arm,buffer-size: size of contiguous buffer space for TMC ETR
@@ -121,6 +128,12 @@ its hardware characteristcs.
121128
* interrupts : Exactly one SPI may be listed for reporting the address
122129
error
123130

131+
* Optional property for configurable replicators:
132+
133+
* qcom,replicator-loses-context: boolean. Indicates that the replicator
134+
will lose register context when AMBA clock is removed which is observed
135+
in some replicator designs.
136+
124137
Graph bindings for Coresight
125138
-------------------------------
126139

Documentation/devicetree/bindings/fpga/xilinx-slave-serial.txt

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,25 @@
11
Xilinx Slave Serial SPI FPGA Manager
22

3-
Xilinx Spartan-6 FPGAs support a method of loading the bitstream over
4-
what is referred to as "slave serial" interface.
3+
Xilinx Spartan-6 and 7 Series FPGAs support a method of loading the
4+
bitstream over what is referred to as "slave serial" interface.
55
The slave serial link is not technically SPI, and might require extra
66
circuits in order to play nicely with other SPI slaves on the same bus.
77

8-
See https://www.xilinx.com/support/documentation/user_guides/ug380.pdf
8+
See:
9+
- https://www.xilinx.com/support/documentation/user_guides/ug380.pdf
10+
- https://www.xilinx.com/support/documentation/user_guides/ug470_7Series_Config.pdf
11+
- https://www.xilinx.com/support/documentation/application_notes/xapp583-fpga-configuration.pdf
912

1013
Required properties:
1114
- compatible: should contain "xlnx,fpga-slave-serial"
1215
- reg: spi chip select of the FPGA
1316
- prog_b-gpios: config pin (referred to as PROGRAM_B in the manual)
1417
- done-gpios: config status pin (referred to as DONE in the manual)
1518

19+
Optional properties:
20+
- init-b-gpios: initialization status and configuration error pin
21+
(referred to as INIT_B in the manual)
22+
1623
Example for full FPGA configuration:
1724

1825
fpga-region0 {
@@ -37,7 +44,8 @@ Example for full FPGA configuration:
3744
spi-max-frequency = <60000000>;
3845
spi-cpha;
3946
reg = <0>;
40-
done-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
4147
prog_b-gpios = <&gpio0 29 GPIO_ACTIVE_LOW>;
48+
init-b-gpios = <&gpio0 28 GPIO_ACTIVE_LOW>;
49+
done-gpios = <&gpio0 9 GPIO_ACTIVE_HIGH>;
4250
};
4351
};

Documentation/devicetree/bindings/nvmem/allwinner,sun4i-a10-sid.yaml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,17 @@ allOf:
1515

1616
properties:
1717
compatible:
18-
enum:
19-
- allwinner,sun4i-a10-sid
20-
- allwinner,sun7i-a20-sid
21-
- allwinner,sun8i-a83t-sid
22-
- allwinner,sun8i-h3-sid
23-
- allwinner,sun50i-a64-sid
24-
- allwinner,sun50i-h5-sid
25-
- allwinner,sun50i-h6-sid
18+
oneOf:
19+
- const: allwinner,sun4i-a10-sid
20+
- const: allwinner,sun7i-a20-sid
21+
- const: allwinner,sun8i-a83t-sid
22+
- const: allwinner,sun8i-h3-sid
23+
- const: allwinner,sun50i-a64-sid
24+
- items:
25+
- const: allwinner,sun50i-a100-sid
26+
- const: allwinner,sun50i-a64-sid
27+
- const: allwinner,sun50i-h5-sid
28+
- const: allwinner,sun50i-h6-sid
2629

2730
reg:
2831
maxItems: 1
Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,96 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/nvmem/qcom,qfprom.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Technologies Inc, QFPROM Efuse bindings
8+
9+
maintainers:
10+
- Srinivas Kandagatla <[email protected]>
11+
12+
allOf:
13+
- $ref: "nvmem.yaml#"
14+
15+
properties:
16+
compatible:
17+
const: qcom,qfprom
18+
19+
reg:
20+
# If the QFPROM is read-only OS image then only the corrected region
21+
# needs to be provided. If the QFPROM is writable then all 4 regions
22+
# must be provided.
23+
oneOf:
24+
- items:
25+
- description: The corrected region.
26+
- items:
27+
- description: The corrected region.
28+
- description: The raw region.
29+
- description: The config region.
30+
- description: The security control region.
31+
32+
# Clock must be provided if QFPROM is writable from the OS image.
33+
clocks:
34+
maxItems: 1
35+
clock-names:
36+
const: core
37+
38+
# Supply reference must be provided if QFPROM is writable from the OS image.
39+
vcc-supply:
40+
description: Our power supply.
41+
42+
# Needed if any child nodes are present.
43+
"#address-cells":
44+
const: 1
45+
"#size-cells":
46+
const: 1
47+
48+
required:
49+
- compatible
50+
- reg
51+
52+
examples:
53+
- |
54+
#include <dt-bindings/clock/qcom,gcc-sc7180.h>
55+
56+
soc {
57+
#address-cells = <2>;
58+
#size-cells = <2>;
59+
60+
efuse@784000 {
61+
compatible = "qcom,qfprom";
62+
reg = <0 0x00784000 0 0x8ff>,
63+
<0 0x00780000 0 0x7a0>,
64+
<0 0x00782000 0 0x100>,
65+
<0 0x00786000 0 0x1fff>;
66+
clocks = <&gcc GCC_SEC_CTRL_CLK_SRC>;
67+
clock-names = "core";
68+
#address-cells = <1>;
69+
#size-cells = <1>;
70+
71+
vcc-supply = <&vreg_l11a_1p8>;
72+
73+
hstx-trim-primary@25b {
74+
reg = <0x25b 0x1>;
75+
bits = <1 3>;
76+
};
77+
};
78+
};
79+
80+
- |
81+
soc {
82+
#address-cells = <2>;
83+
#size-cells = <2>;
84+
85+
efuse@784000 {
86+
compatible = "qcom,qfprom";
87+
reg = <0 0x00784000 0 0x8ff>;
88+
#address-cells = <1>;
89+
#size-cells = <1>;
90+
91+
hstx-trim-primary@1eb {
92+
reg = <0x1eb 0x1>;
93+
bits = <1 4>;
94+
};
95+
};
96+
};

Documentation/devicetree/bindings/nvmem/qfprom.txt

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

0 commit comments

Comments
 (0)