Skip to content

Commit 8440d4a

Browse files
committed
Merge branch 'dt/schema-cleanups' into dt/linus
2 parents f8d8b46 + 4476157 commit 8440d4a

File tree

14,193 files changed

+825217
-292441
lines changed

Some content is hidden

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

14,193 files changed

+825217
-292441
lines changed

.clang-format

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ ForEachMacros:
8080
- 'ax25_uid_for_each'
8181
- '__bio_for_each_bvec'
8282
- 'bio_for_each_bvec'
83+
- 'bio_for_each_bvec_all'
8384
- 'bio_for_each_integrity_vec'
8485
- '__bio_for_each_segment'
8586
- 'bio_for_each_segment'
@@ -142,10 +143,13 @@ ForEachMacros:
142143
- 'for_each_card_auxs'
143144
- 'for_each_card_auxs_safe'
144145
- 'for_each_card_components'
146+
- 'for_each_card_dapms'
145147
- 'for_each_card_pre_auxs'
146148
- 'for_each_card_prelinks'
147149
- 'for_each_card_rtds'
148150
- 'for_each_card_rtds_safe'
151+
- 'for_each_card_widgets'
152+
- 'for_each_card_widgets_safe'
149153
- 'for_each_cgroup_storage_type'
150154
- 'for_each_child_of_node'
151155
- 'for_each_clear_bit'
@@ -160,6 +164,7 @@ ForEachMacros:
160164
- 'for_each_cpu_and'
161165
- 'for_each_cpu_not'
162166
- 'for_each_cpu_wrap'
167+
- 'for_each_dapm_widgets'
163168
- 'for_each_dev_addr'
164169
- 'for_each_dev_scope'
165170
- 'for_each_displayid_db'
@@ -170,7 +175,6 @@ ForEachMacros:
170175
- 'for_each_dpcm_fe'
171176
- 'for_each_drhd_unit'
172177
- 'for_each_dss_dev'
173-
- 'for_each_efi_handle'
174178
- 'for_each_efi_memory_desc'
175179
- 'for_each_efi_memory_desc_in_map'
176180
- 'for_each_element'
@@ -191,6 +195,7 @@ ForEachMacros:
191195
- 'for_each_ip_tunnel_rcu'
192196
- 'for_each_irq_nr'
193197
- 'for_each_link_codecs'
198+
- 'for_each_link_cpus'
194199
- 'for_each_link_platforms'
195200
- 'for_each_lru'
196201
- 'for_each_matching_node'
@@ -250,6 +255,7 @@ ForEachMacros:
250255
- 'for_each_pci_bridge'
251256
- 'for_each_pci_dev'
252257
- 'for_each_pci_msi_entry'
258+
- 'for_each_pcm_streams'
253259
- 'for_each_populated_zone'
254260
- 'for_each_possible_cpu'
255261
- 'for_each_present_cpu'
@@ -260,9 +266,12 @@ ForEachMacros:
260266
- 'for_each_property_of_node'
261267
- 'for_each_registered_fb'
262268
- 'for_each_reserved_mem_region'
263-
- 'for_each_rtd_codec_dai'
264-
- 'for_each_rtd_codec_dai_rollback'
269+
- 'for_each_rtd_codec_dais'
270+
- 'for_each_rtd_codec_dais_rollback'
265271
- 'for_each_rtd_components'
272+
- 'for_each_rtd_cpu_dais'
273+
- 'for_each_rtd_cpu_dais_rollback'
274+
- 'for_each_rtd_dais'
266275
- 'for_each_set_bit'
267276
- 'for_each_set_bit_from'
268277
- 'for_each_set_clump8'
@@ -334,6 +343,7 @@ ForEachMacros:
334343
- 'klp_for_each_object'
335344
- 'klp_for_each_object_safe'
336345
- 'klp_for_each_object_static'
346+
- 'kunit_suite_for_each_test_case'
337347
- 'kvm_for_each_memslot'
338348
- 'kvm_for_each_vcpu'
339349
- 'list_for_each'
@@ -387,6 +397,7 @@ ForEachMacros:
387397
- 'of_property_for_each_string'
388398
- 'of_property_for_each_u32'
389399
- 'pci_bus_for_each_resource'
400+
- 'pcm_for_each_format'
390401
- 'ping_portaddr_for_each_entry'
391402
- 'plist_for_each'
392403
- 'plist_for_each_continue'
@@ -482,7 +493,7 @@ KeepEmptyLinesAtTheStartOfBlocks: false
482493
MacroBlockBegin: ''
483494
MacroBlockEnd: ''
484495
MaxEmptyLinesToKeep: 1
485-
NamespaceIndentation: Inner
496+
NamespaceIndentation: None
486497
#ObjCBinPackProtocolList: Auto # Unknown to clang-format-5.0
487498
ObjCBlockIndentWidth: 8
488499
ObjCSpaceAfterProperty: true

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ modules.order
5656
/linux
5757
/vmlinux
5858
/vmlinux.32
59+
/vmlinux.symvers
5960
/vmlinux-gdb.py
6061
/vmlinuz
6162
/System.map

.mailmap

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ Krzysztof Kozlowski <[email protected]> <[email protected]>
152152
Kuninori Morimoto <[email protected]>
153153
154154
155+
155156
Leonid I Ananiev <[email protected]>
156157
Linas Vepstas <[email protected]>
157158
@@ -234,7 +235,9 @@ Ralf Baechle <[email protected]>
234235
Ralf Wildenhues <[email protected]>
235236
236237
Rémi Denis-Courmont <[email protected]>
237-
Ricardo Ribalda Delgado <[email protected]>
238+
239+
240+
Ricardo Ribalda <[email protected]> Ricardo Ribalda Delgado <[email protected]>
238241
239242
Rudolf Marek <[email protected]>
240243
Rui Saraiva <[email protected]>
@@ -288,6 +291,8 @@ Vladimir Davydov <[email protected]> <[email protected]>
288291
289292
Takashi YOSHII <[email protected]>
290293
294+
295+
291296
292297
Yusuke Goda <[email protected]>
293298
Gustavo Padovan <[email protected]>

CREDITS

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3104,14 +3104,16 @@ W: http://www.qsl.net/dl1bke/
31043104
D: Generic Z8530 driver, AX.25 DAMA slave implementation
31053105
D: Several AX.25 hacks
31063106

3107-
N: Ricardo Ribalda Delgado
3108-
E: ricardo.ribalda@gmail.com
3107+
N: Ricardo Ribalda
3108+
E: ribalda@kernel.org
31093109
W: http://ribalda.com
31103110
D: PLX USB338x driver
31113111
D: PCA9634 driver
31123112
D: Option GTM671WFS
31133113
D: Fintek F81216A
31143114
D: AD5761 iio driver
3115+
D: TI DAC7612 driver
3116+
D: Sony IMX214 driver
31153117
D: Various kernel hacks
31163118
S: Qtechnology A/S
31173119
S: Valby Langgade 142
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
What: /sys/devices/system/cpu/cpuidle/current_governor_ro
2+
Date: April, 2020
3+
4+
Description:
5+
current_governor_ro shows current using cpuidle governor, but read only.
6+
with the update that cpuidle governor can be changed at runtime in default,
7+
both current_governor and current_governor_ro co-exist under
8+
/sys/devices/system/cpu/cpuidle/ file, it's duplicate so make
9+
current_governor_ro obselete.
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
These files allow sending arbitrary IPC commands to the PMC/SCU which
2+
may be dangerous. These will be removed eventually and should not be
3+
used in any new applications.
4+
5+
What: /sys/bus/platform/devices/INT34D2:00/simplecmd
6+
Date: Jun 2015
7+
KernelVersion: 4.1
8+
Contact: Mika Westerberg <[email protected]>
9+
Description: This interface allows userspace to send an arbitrary
10+
IPC command to the PMC/SCU.
11+
12+
Format: %d %d where first number is command and
13+
second number is subcommand.
14+
15+
What: /sys/bus/platform/devices/INT34D2:00/northpeak
16+
Date: Jun 2015
17+
KernelVersion: 4.1
18+
Contact: Mika Westerberg <[email protected]>
19+
Description: This interface allows userspace to enable and disable
20+
Northpeak through the PMC/SCU.
21+
22+
Format: %u.

Documentation/ABI/stable/sysfs-devices-node

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Date: October 2002
5454
Contact: Linux Memory Management list <[email protected]>
5555
Description:
5656
Provides information about the node's distribution and memory
57-
utilization. Similar to /proc/meminfo, see Documentation/filesystems/proc.txt
57+
utilization. Similar to /proc/meminfo, see Documentation/filesystems/proc.rst
5858

5959
What: /sys/devices/system/node/nodeX/numastat
6060
Date: October 2002

Documentation/ABI/stable/sysfs-driver-dma-idxd

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
What: sys/bus/dsa/devices/dsa<m>/version
2+
Date: Apr 15, 2020
3+
KernelVersion: 5.8.0
4+
5+
Description: The hardware version number.
6+
17
What: sys/bus/dsa/devices/dsa<m>/cdev_major
28
Date: Oct 25, 2019
39
KernelVersion: 5.6.0
Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
What: /sys/devices/platform/firmware\:zynqmp-firmware/ggs*
2+
Date: March 2020
3+
KernelVersion: 5.6
4+
Contact: "Jolly Shah" <[email protected]>
5+
Description:
6+
Read/Write PMU global general storage register value,
7+
GLOBAL_GEN_STORAGE{0:3}.
8+
Global general storage register that can be used
9+
by system to pass information between masters.
10+
11+
The register is reset during system or power-on
12+
resets. Three registers are used by the FSBL and
13+
other Xilinx software products: GLOBAL_GEN_STORAGE{4:6}.
14+
15+
Usage:
16+
# cat /sys/devices/platform/firmware\:zynqmp-firmware/ggs0
17+
# echo <value> > /sys/devices/platform/firmware\:zynqmp-firmware/ggs0
18+
19+
Example:
20+
# cat /sys/devices/platform/firmware\:zynqmp-firmware/ggs0
21+
# echo 0x1234ABCD > /sys/devices/platform/firmware\:zynqmp-firmware/ggs0
22+
23+
Users: Xilinx
24+
25+
What: /sys/devices/platform/firmware\:zynqmp-firmware/pggs*
26+
Date: March 2020
27+
KernelVersion: 5.6
28+
Contact: "Jolly Shah" <[email protected]>
29+
Description:
30+
Read/Write PMU persistent global general storage register
31+
value, PERS_GLOB_GEN_STORAGE{0:3}.
32+
Persistent global general storage register that
33+
can be used by system to pass information between
34+
masters.
35+
36+
This register is only reset by the power-on reset
37+
and maintains its value through a system reset.
38+
Four registers are used by the FSBL and other Xilinx
39+
software products: PERS_GLOB_GEN_STORAGE{4:7}.
40+
Register is reset only by a POR reset.
41+
42+
Usage:
43+
# cat /sys/devices/platform/firmware\:zynqmp-firmware/pggs0
44+
# echo <value> > /sys/devices/platform/firmware\:zynqmp-firmware/pggs0
45+
46+
Example:
47+
# cat /sys/devices/platform/firmware\:zynqmp-firmware/pggs0
48+
# echo 0x1234ABCD > /sys/devices/platform/firmware\:zynqmp-firmware/pggs0
49+
50+
Users: Xilinx
51+
52+
What: /sys/devices/platform/firmware\:zynqmp-firmware/shutdown_scope
53+
Date: March 2020
54+
KernelVersion: 5.6
55+
Contact: "Jolly Shah" <[email protected]>
56+
Description:
57+
This sysfs interface allows to set the shutdown scope for the
58+
next shutdown request. When the next shutdown is performed, the
59+
platform specific portion of PSCI-system_off can use the chosen
60+
shutdown scope.
61+
62+
Following are available shutdown scopes(subtypes):
63+
64+
subsystem: Only the APU along with all of its peripherals
65+
not used by other processing units will be
66+
shut down. This may result in the FPD power
67+
domain being shut down provided that no other
68+
processing unit uses FPD peripherals or DRAM.
69+
ps_only: The complete PS will be shut down, including the
70+
RPU, PMU, etc. Only the PL domain (FPGA)
71+
remains untouched.
72+
system: The complete system/device is shut down.
73+
74+
Usage:
75+
# cat /sys/devices/platform/firmware\:zynqmp-firmware/shutdown_scope
76+
# echo <scope> > /sys/devices/platform/firmware\:zynqmp-firmware/shutdown_scope
77+
78+
Example:
79+
# cat /sys/devices/platform/firmware\:zynqmp-firmware/shutdown_scope
80+
# echo "subsystem" > /sys/devices/platform/firmware\:zynqmp-firmware/shutdown_scope
81+
82+
Users: Xilinx
83+
84+
What: /sys/devices/platform/firmware\:zynqmp-firmware/health_status
85+
Date: March 2020
86+
KernelVersion: 5.6
87+
Contact: "Jolly Shah" <[email protected]>
88+
Description:
89+
This sysfs interface allows to set the health status. If PMUFW
90+
is compiled with CHECK_HEALTHY_BOOT, it will check the healthy
91+
bit on FPD WDT expiration. If healthy bit is set by a user
92+
application running in Linux, PMUFW will do APU only restart. If
93+
healthy bit is not set during FPD WDT expiration, PMUFW will do
94+
system restart.
95+
96+
Usage:
97+
Set healthy bit
98+
# echo 1 > /sys/devices/platform/firmware\:zynqmp-firmware/health_status
99+
100+
Unset healthy bit
101+
# echo 0 > /sys/devices/platform/firmware\:zynqmp-firmware/health_status
102+
103+
Users: Xilinx

Documentation/ABI/testing/debugfs-cec-error-inj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ when changes are made.
3737

3838
The following CEC error injection implementations exist:
3939

40-
- Documentation/media/uapi/cec/cec-pin-error-inj.rst
40+
- Documentation/userspace-api/media/cec/cec-pin-error-inj.rst

0 commit comments

Comments
 (0)