Skip to content

Commit ab970ae

Browse files
author
Jiri Kosina
committed
Merge branch 'for-6.2/default-remove-cleanup' into for-linus
- removal of superfluous hid_hw_stop() calls for drivers with default .remove callback (Marcus Folkesson)
2 parents cfd1f6c + 163a7fb commit ab970ae

File tree

1,165 files changed

+13822
-9093
lines changed

Some content is hidden

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

1,165 files changed

+13822
-9093
lines changed

CREDITS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -918,6 +918,11 @@ S: Ottawa, Ontario
918918
S: K1N 6Z9
919919
S: CANADA
920920

921+
N: Vivien Didelot
922+
923+
D: DSA framework and MV88E6XXX driver
924+
S: Montreal, Quebec, Canada
925+
921926
N: Jeff Dike
922927
923928
W: http://user-mode-linux.sourceforge.net

Documentation/ABI/testing/sysfs-kernel-mm-memory-tiers

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Description: A collection of all the memory tiers allocated.
1010

1111

1212
What: /sys/devices/virtual/memory_tiering/memory_tierN/
13-
/sys/devices/virtual/memory_tiering/memory_tierN/nodes
13+
/sys/devices/virtual/memory_tiering/memory_tierN/nodelist
1414
Date: August 2022
1515
Contact: Linux memory management mailing list <[email protected]>
1616
Description: Directory with details of a specific memory tier
@@ -21,5 +21,5 @@ Description: Directory with details of a specific memory tier
2121
A smaller value of N implies a higher (faster) memory tier in the
2222
hierarchy.
2323

24-
nodes: NUMA nodes that are part of this memory tier.
24+
nodelist: NUMA nodes that are part of this memory tier.
2525

Documentation/admin-guide/acpi/index.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ the Linux ACPI support.
99
:maxdepth: 1
1010

1111
initrd_table_override
12-
dsdt-override
1312
ssdt-overlays
1413
cppc_sysfs
1514
fan_performance_states

Documentation/admin-guide/media/vivid.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1318,7 +1318,7 @@ instance. This setup would require the following commands:
13181318
$ v4l2-ctl -d2 -i2
13191319
$ v4l2-ctl -d2 -c horizontal_movement=4
13201320
$ v4l2-ctl -d1 --overlay=1
1321-
$ v4l2-ctl -d1 -c loop_video=1
1321+
$ v4l2-ctl -d0 -c loop_video=1
13221322
$ v4l2-ctl -d2 --stream-mmap --overlay=1
13231323
13241324
And from another console:

Documentation/arm64/booting.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,14 @@ Before jumping into the kernel, the following conditions must be met:
340340
- SMCR_EL2.LEN must be initialised to the same value for all CPUs the
341341
kernel will execute on.
342342

343+
- HWFGRTR_EL2.nTPIDR2_EL0 (bit 55) must be initialised to 0b01.
344+
345+
- HWFGWTR_EL2.nTPIDR2_EL0 (bit 55) must be initialised to 0b01.
346+
347+
- HWFGRTR_EL2.nSMPRI_EL1 (bit 54) must be initialised to 0b01.
348+
349+
- HWFGWTR_EL2.nSMPRI_EL1 (bit 54) must be initialised to 0b01.
350+
343351
For CPUs with the Scalable Matrix Extension FA64 feature (FEAT_SME_FA64)
344352

345353
- If EL3 is present:

Documentation/arm64/cpu-feature-registers.rst

Lines changed: 37 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ operation if the source belongs to the supported system register space.
9292

9393
The infrastructure emulates only the following system register space::
9494

95-
Op0=3, Op1=0, CRn=0, CRm=0,4,5,6,7
95+
Op0=3, Op1=0, CRn=0, CRm=0,2,3,4,5,6,7
9696

9797
(See Table C5-6 'System instruction encodings for non-Debug System
9898
register accesses' in ARMv8 ARM DDI 0487A.h, for the list of
@@ -293,6 +293,42 @@ infrastructure:
293293
| WFXT | [3-0] | y |
294294
+------------------------------+---------+---------+
295295

296+
10) MVFR0_EL1 - AArch32 Media and VFP Feature Register 0
297+
298+
+------------------------------+---------+---------+
299+
| Name | bits | visible |
300+
+------------------------------+---------+---------+
301+
| FPDP | [11-8] | y |
302+
+------------------------------+---------+---------+
303+
304+
11) MVFR1_EL1 - AArch32 Media and VFP Feature Register 1
305+
306+
+------------------------------+---------+---------+
307+
| Name | bits | visible |
308+
+------------------------------+---------+---------+
309+
| SIMDFMAC | [31-28] | y |
310+
+------------------------------+---------+---------+
311+
| SIMDSP | [19-16] | y |
312+
+------------------------------+---------+---------+
313+
| SIMDInt | [15-12] | y |
314+
+------------------------------+---------+---------+
315+
| SIMDLS | [11-8] | y |
316+
+------------------------------+---------+---------+
317+
318+
12) ID_ISAR5_EL1 - AArch32 Instruction Set Attribute Register 5
319+
320+
+------------------------------+---------+---------+
321+
| Name | bits | visible |
322+
+------------------------------+---------+---------+
323+
| CRC32 | [19-16] | y |
324+
+------------------------------+---------+---------+
325+
| SHA2 | [15-12] | y |
326+
+------------------------------+---------+---------+
327+
| SHA1 | [11-8] | y |
328+
+------------------------------+---------+---------+
329+
| AES | [7-4] | y |
330+
+------------------------------+---------+---------+
331+
296332

297333
Appendix I: Example
298334
-------------------

Documentation/core-api/kernel-api.rst

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,12 @@ Text Searching
118118
CRC and Math Functions in Linux
119119
===============================
120120

121+
Arithmetic Overflow Checking
122+
----------------------------
123+
124+
.. kernel-doc:: include/linux/overflow.h
125+
:internal:
126+
121127
CRC Functions
122128
-------------
123129

Documentation/devicetree/bindings/hwlock/qcom-hwspinlock.yaml

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,22 @@ description:
1515

1616
properties:
1717
compatible:
18-
enum:
19-
- qcom,sfpb-mutex
20-
- qcom,tcsr-mutex
18+
oneOf:
19+
- enum:
20+
- qcom,sfpb-mutex
21+
- qcom,tcsr-mutex
22+
- items:
23+
- enum:
24+
- qcom,apq8084-tcsr-mutex
25+
- qcom,ipq6018-tcsr-mutex
26+
- qcom,msm8226-tcsr-mutex
27+
- qcom,msm8994-tcsr-mutex
28+
- const: qcom,tcsr-mutex
29+
- items:
30+
- enum:
31+
- qcom,msm8974-tcsr-mutex
32+
- const: qcom,tcsr-mutex
33+
- const: syscon
2134

2235
reg:
2336
maxItems: 1
@@ -34,9 +47,9 @@ additionalProperties: false
3447

3548
examples:
3649
- |
37-
tcsr_mutex: hwlock@1f40000 {
38-
compatible = "qcom,tcsr-mutex";
39-
reg = <0x01f40000 0x40000>;
40-
#hwlock-cells = <1>;
41-
};
50+
hwlock@1f40000 {
51+
compatible = "qcom,tcsr-mutex";
52+
reg = <0x01f40000 0x40000>;
53+
#hwlock-cells = <1>;
54+
};
4255
...

Documentation/devicetree/bindings/media/i2c/dongwoon,dw9714.txt

Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/media/i2c/dongwoon,dw9714.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Dongwoon Anatech DW9714 camera voice coil lens driver
8+
9+
maintainers:
10+
- Krzysztof Kozlowski <[email protected]>
11+
12+
description:
13+
DW9174 is a 10-bit DAC with current sink capability. It is intended for
14+
driving voice coil lenses in camera modules.
15+
16+
properties:
17+
compatible:
18+
const: dongwoon,dw9714
19+
20+
reg:
21+
maxItems: 1
22+
23+
powerdown-gpios:
24+
description:
25+
XSD pin for shutdown (active low)
26+
27+
vcc-supply:
28+
description: VDD power supply
29+
30+
required:
31+
- compatible
32+
- reg
33+
34+
additionalProperties: false
35+
36+
examples:
37+
- |
38+
i2c {
39+
#address-cells = <1>;
40+
#size-cells = <0>;
41+
42+
camera-lens@c {
43+
compatible = "dongwoon,dw9714";
44+
reg = <0x0c>;
45+
vcc-supply = <&reg_csi_1v8>;
46+
};
47+
};

0 commit comments

Comments
 (0)