Skip to content

Commit 6f3ee0e

Browse files
committed
Merge tag 'irqchip-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Pull irqchip updates from Marc Zyngier: - New and improved irqdomain locking, closing a number of races that became apparent now that we are able to probe drivers in parallel - A bunch of OF node refcounting bugs have been fixed - We now have a new IPI mux, lifted from the Apple AIC code and made common. It is expected that riscv will eventually benefit from it - Two small fixes for the Broadcom L2 drivers - Various cleanups and minor bug fixes Link: https://lore.kernel.org/r/[email protected]
2 parents 188a569 + a83bf17 commit 6f3ee0e

File tree

410 files changed

+5085
-4481
lines changed

Some content is hidden

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

410 files changed

+5085
-4481
lines changed

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,7 @@ Tony Luck <[email protected]>
422422
423423
424424
Tsuneo Yoshioka <[email protected]>
425+
425426
426427
427428
Uwe Kleine-König <[email protected]>

Documentation/arm64/silicon-errata.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,8 @@ stable kernels.
120120
+----------------+-----------------+-----------------+-----------------------------+
121121
| ARM | Cortex-A710 | #2224489 | ARM64_ERRATUM_2224489 |
122122
+----------------+-----------------+-----------------+-----------------------------+
123+
| ARM | Cortex-A715 | #2645198 | ARM64_ERRATUM_2645198 |
124+
+----------------+-----------------+-----------------+-----------------------------+
123125
| ARM | Cortex-X2 | #2119858 | ARM64_ERRATUM_2119858 |
124126
+----------------+-----------------+-----------------+-----------------------------+
125127
| ARM | Cortex-X2 | #2224489 | ARM64_ERRATUM_2224489 |

Documentation/conf.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@ def have_command(cmd):
3131
# Get Sphinx version
3232
major, minor, patch = sphinx.version_info[:3]
3333

34+
#
35+
# Warn about older versions that we don't want to support for much
36+
# longer.
37+
#
38+
if (major < 2) or (major == 2 and minor < 4):
39+
print('WARNING: support for Sphinx < 2.4 will be removed soon.')
3440

3541
# If extensions (or modules to document with autodoc) are in another directory,
3642
# add these directories to sys.path here. If the directory is relative to the
@@ -339,7 +345,11 @@ def get_cline_version():
339345

340346
# Custom sidebar templates, maps document names to template names.
341347
# Note that the RTD theme ignores this
342-
html_sidebars = { '**': ["about.html", 'searchbox.html', 'localtoc.html', 'sourcelink.html']}
348+
html_sidebars = { '**': ['searchbox.html', 'localtoc.html', 'sourcelink.html']}
349+
350+
# about.html is available for alabaster theme. Add it at the front.
351+
if html_theme == 'alabaster':
352+
html_sidebars['**'].insert(0, 'about.html')
343353

344354
# Output file base name for HTML help builder.
345355
htmlhelp_basename = 'TheLinuxKerneldoc'

Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,17 @@ properties:
5454
- const: xo
5555
- const: alternate
5656

57+
interrupts:
58+
minItems: 1
59+
maxItems: 3
60+
61+
interrupt-names:
62+
minItems: 1
63+
items:
64+
- const: dcvsh-irq-0
65+
- const: dcvsh-irq-1
66+
- const: dcvsh-irq-2
67+
5768
'#freq-domain-cells':
5869
const: 1
5970

Documentation/devicetree/bindings/crypto/atmel,at91sam9g46-aes.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
88
title: Atmel Advanced Encryption Standard (AES) HW cryptographic accelerator
99

1010
maintainers:
11-
- Tudor Ambarus <tudor.ambarus@microchip.com>
11+
- Tudor Ambarus <tudor.ambarus@linaro.org>
1212

1313
properties:
1414
compatible:

Documentation/devicetree/bindings/crypto/atmel,at91sam9g46-sha.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
88
title: Atmel Secure Hash Algorithm (SHA) HW cryptographic accelerator
99

1010
maintainers:
11-
- Tudor Ambarus <tudor.ambarus@microchip.com>
11+
- Tudor Ambarus <tudor.ambarus@linaro.org>
1212

1313
properties:
1414
compatible:

Documentation/devicetree/bindings/crypto/atmel,at91sam9g46-tdes.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
88
title: Atmel Triple Data Encryption Standard (TDES) HW cryptographic accelerator
99

1010
maintainers:
11-
- Tudor Ambarus <tudor.ambarus@microchip.com>
11+
- Tudor Ambarus <tudor.ambarus@linaro.org>
1212

1313
properties:
1414
compatible:

Documentation/devicetree/bindings/display/msm/dsi-controller-main.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ properties:
3232
- description: Display byte clock
3333
- description: Display byte interface clock
3434
- description: Display pixel clock
35-
- description: Display escape clock
35+
- description: Display core clock
3636
- description: Display AHB clock
3737
- description: Display AXI clock
3838

@@ -137,8 +137,6 @@ required:
137137
- phys
138138
- assigned-clocks
139139
- assigned-clock-parents
140-
- power-domains
141-
- operating-points-v2
142140
- ports
143141

144142
additionalProperties: false

Documentation/devicetree/bindings/display/msm/dsi-phy-10nm.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ required:
6969
- compatible
7070
- reg
7171
- reg-names
72-
- vdds-supply
7372

7473
unevaluatedProperties: false
7574

Documentation/devicetree/bindings/display/msm/dsi-phy-14nm.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ required:
3939
- compatible
4040
- reg
4141
- reg-names
42-
- vcca-supply
4342

4443
unevaluatedProperties: false
4544

0 commit comments

Comments
 (0)