Skip to content

Commit

Permalink
Merge tag 'v5.18-rc7' into arm/smmu
Browse files Browse the repository at this point in the history
Linux 5.18-rc7
  • Loading branch information
joergroedel committed May 20, 2022
2 parents e3b9bf1 + 42226c9 commit b11deb2
Show file tree
Hide file tree
Showing 736 changed files with 6,678 additions and 3,659 deletions.
3 changes: 3 additions & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ Andrey Konovalov <[email protected]> <[email protected]>
Andrey Ryabinin <[email protected]> <[email protected]>
Andrey Ryabinin <[email protected]> <[email protected]>
Andrzej Hajda <[email protected]> <[email protected]>
André Almeida <[email protected]> <[email protected]>
Andy Adamson <[email protected]>
Antoine Tenart <[email protected]> <[email protected]>
Antoine Tenart <[email protected]> <[email protected]>
Expand Down Expand Up @@ -204,6 +205,7 @@ Juha Yrjola <at solidboot.com>
Juha Yrjola <[email protected]>
Juha Yrjola <[email protected]>
Julien Thierry <[email protected]> <[email protected]>
Kalle Valo <[email protected]> <[email protected]>
Kalyan Thota <[email protected]> <[email protected]>
Kay Sievers <[email protected]>
Kees Cook <[email protected]> <[email protected]>
Expand Down Expand Up @@ -249,6 +251,7 @@ Mark Yao <[email protected]> <[email protected]>
Martin Kepplinger <[email protected]> <[email protected]>
Martin Kepplinger <[email protected]> <[email protected]>
Martin Kepplinger <[email protected]> <[email protected]>
Martyna Szapar-Mudlaw <[email protected]> <[email protected]>
Mathieu Othacehe <[email protected]>
Matthew Wilcox <[email protected]> <[email protected]>
Matthew Wilcox <[email protected]> <[email protected]>
Expand Down
4 changes: 2 additions & 2 deletions Documentation/arm64/memory-tagging-extension.rst
Original file line number Diff line number Diff line change
Expand Up @@ -228,10 +228,10 @@ Core dump support
-----------------

The allocation tags for user memory mapped with ``PROT_MTE`` are dumped
in the core file as additional ``PT_ARM_MEMTAG_MTE`` segments. The
in the core file as additional ``PT_AARCH64_MEMTAG_MTE`` segments. The
program header for such segment is defined as:

:``p_type``: ``PT_ARM_MEMTAG_MTE``
:``p_type``: ``PT_AARCH64_MEMTAG_MTE``
:``p_flags``: 0
:``p_offset``: segment file offset
:``p_vaddr``: segment virtual address, same as the corresponding
Expand Down
3 changes: 3 additions & 0 deletions Documentation/arm64/silicon-errata.rst
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,9 @@ stable kernels.
+----------------+-----------------+-----------------+-----------------------------+
| Qualcomm Tech. | Kryo4xx Silver | N/A | ARM64_ERRATUM_1024718 |
+----------------+-----------------+-----------------+-----------------------------+
| Qualcomm Tech. | Kryo4xx Gold | N/A | ARM64_ERRATUM_1286807 |
+----------------+-----------------+-----------------+-----------------------------+

+----------------+-----------------+-----------------+-----------------------------+
| Fujitsu | A64FX | E#010001 | FUJITSU_ERRATUM_010001 |
+----------------+-----------------+-----------------+-----------------------------+
4 changes: 0 additions & 4 deletions Documentation/devicetree/bindings/clock/imx8m-clock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ allOf:
then:
properties:
clocks:
minItems: 7
maxItems: 7
items:
- description: 32k osc
- description: 25m osc
Expand All @@ -66,8 +64,6 @@ allOf:
- description: ext3 clock input
- description: ext4 clock input
clock-names:
minItems: 7
maxItems: 7
items:
- const: ckil
- const: osc_25m
Expand Down
13 changes: 11 additions & 2 deletions Documentation/devicetree/bindings/clock/microchip,mpfs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,16 @@ properties:
const: microchip,mpfs-clkcfg

reg:
maxItems: 1
items:
- description: |
clock config registers:
These registers contain enable, reset & divider tables for the, cpu,
axi, ahb and rtc/mtimer reference clocks as well as enable and reset
for the peripheral clocks.
- description: |
mss pll dri registers:
Block of registers responsible for dynamic reconfiguration of the mss
pll
clocks:
maxItems: 1
Expand Down Expand Up @@ -51,7 +60,7 @@ examples:
#size-cells = <2>;
clkcfg: clock-controller@20002000 {
compatible = "microchip,mpfs-clkcfg";
reg = <0x0 0x20002000 0x0 0x1000>;
reg = <0x0 0x20002000 0x0 0x1000>, <0x0 0x3E001000 0x0 0x1000>;
clocks = <&ref>;
#clock-cells = <1>;
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ then:
properties:
clocks:
minItems: 1
maxItems: 4
items:
- description: Functional clock
- description: EXTAL input clock
Expand All @@ -104,7 +103,6 @@ then:

clock-names:
minItems: 1
maxItems: 4
items:
- const: fck
# The LVDS encoder can use the EXTAL or DU_DOTCLKINx clocks.
Expand All @@ -128,12 +126,10 @@ then:
else:
properties:
clocks:
maxItems: 1
items:
- description: Functional clock

clock-names:
maxItems: 1
items:
- const: fck

Expand Down
23 changes: 0 additions & 23 deletions Documentation/devicetree/bindings/display/renesas,du.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -109,15 +109,13 @@ allOf:
properties:
clocks:
minItems: 1
maxItems: 3
items:
- description: Functional clock
- description: DU_DOTCLKIN0 input clock
- description: DU_DOTCLKIN1 input clock

clock-names:
minItems: 1
maxItems: 3
items:
- const: du.0
- pattern: '^dclkin\.[01]$'
Expand Down Expand Up @@ -159,7 +157,6 @@ allOf:
properties:
clocks:
minItems: 2
maxItems: 4
items:
- description: Functional clock for DU0
- description: Functional clock for DU1
Expand All @@ -168,7 +165,6 @@ allOf:

clock-names:
minItems: 2
maxItems: 4
items:
- const: du.0
- const: du.1
Expand Down Expand Up @@ -216,7 +212,6 @@ allOf:
properties:
clocks:
minItems: 2
maxItems: 4
items:
- description: Functional clock for DU0
- description: Functional clock for DU1
Expand All @@ -225,7 +220,6 @@ allOf:

clock-names:
minItems: 2
maxItems: 4
items:
- const: du.0
- const: du.1
Expand Down Expand Up @@ -271,7 +265,6 @@ allOf:
properties:
clocks:
minItems: 2
maxItems: 4
items:
- description: Functional clock for DU0
- description: Functional clock for DU1
Expand All @@ -280,7 +273,6 @@ allOf:

clock-names:
minItems: 2
maxItems: 4
items:
- const: du.0
- const: du.1
Expand Down Expand Up @@ -327,7 +319,6 @@ allOf:
properties:
clocks:
minItems: 2
maxItems: 4
items:
- description: Functional clock for DU0
- description: Functional clock for DU1
Expand All @@ -336,7 +327,6 @@ allOf:

clock-names:
minItems: 2
maxItems: 4
items:
- const: du.0
- const: du.1
Expand Down Expand Up @@ -386,7 +376,6 @@ allOf:
properties:
clocks:
minItems: 3
maxItems: 6
items:
- description: Functional clock for DU0
- description: Functional clock for DU1
Expand All @@ -397,7 +386,6 @@ allOf:

clock-names:
minItems: 3
maxItems: 6
items:
- const: du.0
- const: du.1
Expand Down Expand Up @@ -448,7 +436,6 @@ allOf:
properties:
clocks:
minItems: 4
maxItems: 8
items:
- description: Functional clock for DU0
- description: Functional clock for DU1
Expand All @@ -461,7 +448,6 @@ allOf:

clock-names:
minItems: 4
maxItems: 8
items:
- const: du.0
- const: du.1
Expand Down Expand Up @@ -525,7 +511,6 @@ allOf:
properties:
clocks:
minItems: 3
maxItems: 6
items:
- description: Functional clock for DU0
- description: Functional clock for DU1
Expand All @@ -536,7 +521,6 @@ allOf:

clock-names:
minItems: 3
maxItems: 6
items:
- const: du.0
- const: du.1
Expand Down Expand Up @@ -596,7 +580,6 @@ allOf:
properties:
clocks:
minItems: 3
maxItems: 6
items:
- description: Functional clock for DU0
- description: Functional clock for DU1
Expand All @@ -607,7 +590,6 @@ allOf:

clock-names:
minItems: 3
maxItems: 6
items:
- const: du.0
- const: du.1
Expand Down Expand Up @@ -666,14 +648,12 @@ allOf:
properties:
clocks:
minItems: 1
maxItems: 2
items:
- description: Functional clock for DU0
- description: DU_DOTCLKIN0 input clock

clock-names:
minItems: 1
maxItems: 2
items:
- const: du.0
- const: dclkin.0
Expand Down Expand Up @@ -723,7 +703,6 @@ allOf:
properties:
clocks:
minItems: 2
maxItems: 4
items:
- description: Functional clock for DU0
- description: Functional clock for DU1
Expand All @@ -732,7 +711,6 @@ allOf:

clock-names:
minItems: 2
maxItems: 4
items:
- const: du.0
- const: du.1
Expand Down Expand Up @@ -791,7 +769,6 @@ allOf:
- description: Functional clock

clock-names:
maxItems: 1
items:
- const: du.0

Expand Down
7 changes: 3 additions & 4 deletions Documentation/devicetree/bindings/hwmon/ti,tmp421.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,9 @@ patternProperties:
description: |
The value (two's complement) to be programmed in the channel specific N correction register.
For remote channels only.
$ref: /schemas/types.yaml#/definitions/uint32
items:
minimum: 0
maximum: 255
$ref: /schemas/types.yaml#/definitions/int32
minimum: -128
maximum: 127

required:
- reg
Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/iio/adc/st,stm32-adc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,6 @@ allOf:
- const: bus
- const: adc
minItems: 1
maxItems: 2

interrupts:
items:
Expand Down Expand Up @@ -170,7 +169,6 @@ allOf:
- const: bus
- const: adc
minItems: 1
maxItems: 2

interrupts:
items:
Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/leds/leds-mt6360.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,6 @@ patternProperties:
- 4 # LED output FLASH1
- 5 # LED output FLASH2

unevaluatedProperties: false

required:
- compatible
- "#address-cells"
Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/mfd/atmel-flexcom.txt
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ flexcom@f8034000 {
clock-names = "spi_clk";
atmel,fifo-size = <32>;

mtd_dataflash@0 {
flash@0 {
compatible = "atmel,at25f512b";
reg = <0>;
spi-max-frequency = <20000000>;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,22 +202,17 @@ allOf:
clocks:
items:
- description: module clock
minItems: 1
maxItems: 1
else:
properties:
clocks:
items:
- description: module clock
- description: timeout clock
minItems: 2
maxItems: 2

clock-names:
items:
- const: sdhci
- const: tmclk
minItems: 2
maxItems: 2
required:
- clock-names

Expand Down
2 changes: 0 additions & 2 deletions Documentation/devicetree/bindings/mtd/gpmi-nand.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,6 @@ allOf:
- description: SoC gpmi io clock
- description: SoC gpmi bch apb clock
clock-names:
minItems: 2
maxItems: 2
items:
- const: gpmi_io
- const: gpmi_bch_apb
Expand Down
Loading

0 comments on commit b11deb2

Please sign in to comment.