Skip to content

Commit 38713c6

Browse files
joergroedeljoergroedel
committed
Merge branches 'apple/dart', 'arm/mediatek', 'arm/omap', 'arm/smmu', 'virtio', 'x86/vt-d', 'x86/amd' and 'core' into next
8 parents a380b8d + 717ec15 + 184233a + d2f2f1d + 0c9ccaf + 6ad931a + f9e2f0e + 4f58330 commit 38713c6

File tree

729 files changed

+7100
-5453
lines changed

Some content is hidden

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

729 files changed

+7100
-5453
lines changed

‎.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,7 @@ Morten Welinder <welinder@troll.com>
315315
Mythri P K <mythripk@ti.com>
316316
Nadia Yvette Chambers <nyc@holomorphy.com> William Lee Irwin III <wli@holomorphy.com>
317317
Nathan Chancellor <nathan@kernel.org> <natechancellor@gmail.com>
318+
Neil Armstrong <neil.armstrong@linaro.org> <narmstrong@baylibre.com>
318319
Nguyen Anh Quynh <aquynh@gmail.com>
319320
Nicholas Piggin <npiggin@gmail.com> <npiggen@suse.de>
320321
Nicholas Piggin <npiggin@gmail.com> <npiggin@kernel.dk>

‎Documentation/admin-guide/kernel-parameters.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,8 @@
321321
force_enable - Force enable the IOMMU on platforms known
322322
to be buggy with IOMMU enabled. Use this
323323
option with care.
324+
pgtbl_v1 - Use v1 page table for DMA-API (Default).
325+
pgtbl_v2 - Use v2 page table for DMA-API.
324326

325327
amd_iommu_dump= [HW,X86-64]
326328
Enable AMD IOMMU driver option to dump the ACPI table

‎Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.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: Amlogic Meson Firmware registers Interface
99

1010
maintainers:
11-
- Neil Armstrong <narmstrong@baylibre.com>
11+
- Neil Armstrong <neil.armstrong@linaro.org>
1212

1313
description: |
1414
The Meson SoCs have a register bank with status and data shared with the

‎Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.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: Amlogic specific extensions to the Synopsys Designware HDMI Controller
99

1010
maintainers:
11-
- Neil Armstrong <narmstrong@baylibre.com>
11+
- Neil Armstrong <neil.armstrong@linaro.org>
1212

1313
allOf:
1414
- $ref: /schemas/sound/name-prefix.yaml#

‎Documentation/devicetree/bindings/display/amlogic,meson-vpu.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: Amlogic Meson Display Controller
99

1010
maintainers:
11-
- Neil Armstrong <narmstrong@baylibre.com>
11+
- Neil Armstrong <neil.armstrong@linaro.org>
1212

1313
description: |
1414
The Amlogic Meson Display controller is composed of several components

‎Documentation/devicetree/bindings/display/bridge/analogix,anx7814.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: Analogix ANX7814 SlimPort (Full-HD Transmitter)
88

99
maintainers:
1010
- Andrzej Hajda <andrzej.hajda@intel.com>
11-
- Neil Armstrong <narmstrong@baylibre.com>
11+
- Neil Armstrong <neil.armstrong@linaro.org>
1212
- Robert Foss <robert.foss@linaro.org>
1313

1414
properties:

‎Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ title: ITE it66121 HDMI bridge Device Tree Bindings
88

99
maintainers:
1010
- Phong LE <ple@baylibre.com>
11-
- Neil Armstrong <narmstrong@baylibre.com>
11+
- Neil Armstrong <neil.armstrong@linaro.org>
1212

1313
description: |
1414
The IT66121 is a high-performance and low-power single channel HDMI

‎Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Solomon Goldentek Display GKTW70SDAE4SE 7" WVGA LVDS Display Panel
88

99
maintainers:
10-
- Neil Armstrong <narmstrong@baylibre.com>
10+
- Neil Armstrong <neil.armstrong@linaro.org>
1111
- Thierry Reding <thierry.reding@gmail.com>
1212

1313
allOf:

‎Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ Example:
3434
Use specific request line passing from dma
3535
For example, MMC request line is 5
3636

37-
sdhci: sdhci@98e00000 {
38-
compatible = "moxa,moxart-sdhci";
37+
mmc: mmc@98e00000 {
38+
compatible = "moxa,moxart-mmc";
3939
reg = <0x98e00000 0x5C>;
4040
interrupts = <5 0>;
4141
clocks = <&clk_apb>;

‎Documentation/devicetree/bindings/hwmon/moortec,mr75203.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ required:
4848
- compatible
4949
- reg
5050
- reg-names
51-
- intel,vm-map
5251
- clocks
5352
- resets
5453
- "#thermal-sensor-cells"

‎Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.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: Amlogic Meson I2C Controller
99

1010
maintainers:
11-
- Neil Armstrong <narmstrong@baylibre.com>
11+
- Neil Armstrong <neil.armstrong@linaro.org>
1212
- Beniamino Galvani <b.galvani@gmail.com>
1313

1414
allOf:

‎Documentation/devicetree/bindings/i2c/renesas,riic.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ properties:
6060
power-domains:
6161
maxItems: 1
6262

63+
resets:
64+
maxItems: 1
65+
6366
required:
6467
- compatible
6568
- reg

‎Documentation/devicetree/bindings/interconnect/fsl,imx8m-noc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Generic i.MX bus frequency device
88

99
maintainers:
10-
- Leonard Crestez <leonard.crestez@nxp.com>
10+
- Peng Fan <peng.fan@nxp.com>
1111

1212
description: |
1313
The i.MX SoC family has multiple buses for which clock frequency (and

‎Documentation/devicetree/bindings/interrupt-controller/apple,aic.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ properties:
9696
Documentation/devicetree/bindings/arm/cpus.yaml).
9797

9898
required:
99-
- fiq-index
99+
- apple,fiq-index
100100
- cpus
101101

102102
required:

‎Documentation/devicetree/bindings/iommu/arm,smmu-v3.yaml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,11 @@ properties:
3939
any others.
4040
- minItems: 1
4141
items:
42-
- enum:
43-
- eventq # Event Queue not empty
44-
- gerror # Global Error activated
45-
- const: gerror
46-
- enum:
47-
- cmdq-sync # CMD_SYNC complete
48-
- priq # PRI Queue not empty
49-
- enum:
50-
- cmdq-sync
51-
- priq
42+
enum:
43+
- eventq # Event Queue not empty
44+
- gerror # Global Error activated
45+
- cmdq-sync # CMD_SYNC complete
46+
- priq # PRI Queue not empty
5247

5348
'#iommu-cells':
5449
const: 1

‎Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ properties:
7373
- mediatek,mt2701-m4u # generation one
7474
- mediatek,mt2712-m4u # generation two
7575
- mediatek,mt6779-m4u # generation two
76+
- mediatek,mt6795-m4u # generation two
7677
- mediatek,mt8167-m4u # generation two
7778
- mediatek,mt8173-m4u # generation two
7879
- mediatek,mt8183-m4u # generation two
@@ -124,6 +125,7 @@ properties:
124125
dt-binding/memory/mt2701-larb-port.h for mt2701 and mt7623,
125126
dt-binding/memory/mt2712-larb-port.h for mt2712,
126127
dt-binding/memory/mt6779-larb-port.h for mt6779,
128+
dt-binding/memory/mt6795-larb-port.h for mt6795,
127129
dt-binding/memory/mt8167-larb-port.h for mt8167,
128130
dt-binding/memory/mt8173-larb-port.h for mt8173,
129131
dt-binding/memory/mt8183-larb-port.h for mt8183,
@@ -148,6 +150,7 @@ allOf:
148150
enum:
149151
- mediatek,mt2701-m4u
150152
- mediatek,mt2712-m4u
153+
- mediatek,mt6795-m4u
151154
- mediatek,mt8173-m4u
152155
- mediatek,mt8186-iommu-mm
153156
- mediatek,mt8192-m4u
@@ -177,6 +180,7 @@ allOf:
177180
contains:
178181
enum:
179182
- mediatek,mt2712-m4u
183+
- mediatek,mt6795-m4u
180184
- mediatek,mt8173-m4u
181185

182186
then:

‎Documentation/devicetree/bindings/mailbox/amlogic,meson-gxbb-mhu.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: Amlogic Meson Message-Handling-Unit Controller
99

1010
maintainers:
11-
- Neil Armstrong <narmstrong@baylibre.com>
11+
- Neil Armstrong <neil.armstrong@linaro.org>
1212

1313
description: |
1414
The Amlogic's Meson SoCs Message-Handling-Unit (MHU) is a mailbox controller

‎Documentation/devicetree/bindings/media/amlogic,axg-ge2d.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: Amlogic GE2D Acceleration Unit
99

1010
maintainers:
11-
- Neil Armstrong <narmstrong@baylibre.com>
11+
- Neil Armstrong <neil.armstrong@linaro.org>
1212

1313
properties:
1414
compatible:

‎Documentation/devicetree/bindings/media/amlogic,gx-vdec.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: Amlogic Video Decoder
99

1010
maintainers:
11-
- Neil Armstrong <narmstrong@baylibre.com>
11+
- Neil Armstrong <neil.armstrong@linaro.org>
1212
- Maxime Jourdan <mjourdan@baylibre.com>
1313

1414
description: |

‎Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.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: Amlogic Meson AO-CEC Controller
99

1010
maintainers:
11-
- Neil Armstrong <narmstrong@baylibre.com>
11+
- Neil Armstrong <neil.armstrong@linaro.org>
1212

1313
description: |
1414
The Amlogic Meson AO-CEC module is present is Amlogic SoCs and its purpose is

‎Documentation/devicetree/bindings/memory-controllers/fsl/imx8m-ddrc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: i.MX8M DDR Controller
88

99
maintainers:
10-
- Leonard Crestez <leonard.crestez@nxp.com>
10+
- Peng Fan <peng.fan@nxp.com>
1111

1212
description:
1313
The DDRC block is integrated in i.MX8M for interfacing with DDR based

‎Documentation/devicetree/bindings/mfd/khadas,mcu.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Khadas on-board Microcontroller Device Tree Bindings
88

99
maintainers:
10-
- Neil Armstrong <narmstrong@baylibre.com>
10+
- Neil Armstrong <neil.armstrong@linaro.org>
1111

1212
description: |
1313
Khadas embeds a microcontroller on their VIM and Edge boards adding some

‎Documentation/devicetree/bindings/net/amlogic,meson-dwmac.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: Amlogic Meson DWMAC Ethernet controller
99

1010
maintainers:
11-
- Neil Armstrong <narmstrong@baylibre.com>
11+
- Neil Armstrong <neil.armstrong@linaro.org>
1212
- Martin Blumenstingl <martin.blumenstingl@googlemail.com>
1313

1414
# We need a select here so we don't match all nodes with 'snps,dwmac'

‎Documentation/devicetree/bindings/opp/opp-v2-kryo-cpu.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ properties:
4040
patternProperties:
4141
'^opp-?[0-9]+$':
4242
type: object
43+
additionalProperties: false
4344

4445
properties:
4546
opp-hz: true

‎Documentation/devicetree/bindings/opp/opp-v2-qcom-level.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ properties:
1919
patternProperties:
2020
'^opp-?[0-9]+$':
2121
type: object
22+
additionalProperties: false
2223

2324
properties:
2425
opp-level: true

‎Documentation/devicetree/bindings/phy/amlogic,axg-mipi-dphy.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: Amlogic AXG MIPI D-PHY
99

1010
maintainers:
11-
- Neil Armstrong <narmstrong@baylibre.com>
11+
- Neil Armstrong <neil.armstrong@linaro.org>
1212

1313
properties:
1414
compatible:

‎Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.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: Amlogic G12A USB2 PHY
99

1010
maintainers:
11-
- Neil Armstrong <narmstrong@baylibre.com>
11+
- Neil Armstrong <neil.armstrong@linaro.org>
1212

1313
properties:
1414
compatible:

‎Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.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: Amlogic G12A USB3 + PCIE Combo PHY
99

1010
maintainers:
11-
- Neil Armstrong <narmstrong@baylibre.com>
11+
- Neil Armstrong <neil.armstrong@linaro.org>
1212

1313
properties:
1414
compatible:

‎Documentation/devicetree/bindings/pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ title: Qualcomm Technologies, Inc. Low Power Audio SubSystem (LPASS)
88
Low Power Island (LPI) TLMM block
99

1010
maintainers:
11-
- Srinivasa Rao Mandadapu <srivasam@codeaurora.org>
1211
- Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
1312

1413
description: |

‎Documentation/devicetree/bindings/pinctrl/qcom,sc7280-pinctrl.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Technologies, Inc. SC7280 TLMM block
88

99
maintainers:
10-
- Rajendra Nayak <rnayak@codeaurora.org>
10+
- Bjorn Andersson <andersson@kernel.org>
1111

1212
description: |
1313
This binding describes the Top Level Mode Multiplexer block found in the

‎Documentation/devicetree/bindings/power/amlogic,meson-ee-pwrc.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: Amlogic Meson Everything-Else Power Domains
99

1010
maintainers:
11-
- Neil Armstrong <narmstrong@baylibre.com>
11+
- Neil Armstrong <neil.armstrong@linaro.org>
1212

1313
description: |+
1414
The Everything-Else Power Domains node should be the child of a syscon

‎Documentation/devicetree/bindings/power/qcom,rpmpd.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm RPM/RPMh Power domains
88

99
maintainers:
10-
- Rajendra Nayak <rnayak@codeaurora.org>
10+
- Bjorn Andersson <andersson@kernel.org>
1111

1212
description:
1313
For RPM/RPMh Power domains, we communicate a performance state to RPM/RPMh

‎Documentation/devicetree/bindings/regulator/qcom,spmi-regulator.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ patternProperties:
3535
description: List of regulators and its properties
3636
type: object
3737
$ref: regulator.yaml#
38+
unevaluatedProperties: false
3839

3940
properties:
4041
qcom,ocp-max-retries:
@@ -100,8 +101,6 @@ patternProperties:
100101
SAW controlled gang leader. Will be configured as SAW regulator.
101102
type: boolean
102103

103-
unevaluatedProperties: false
104-
105104
required:
106105
- compatible
107106

‎Documentation/devicetree/bindings/reset/amlogic,meson-reset.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: Amlogic Meson SoC Reset Controller
99

1010
maintainers:
11-
- Neil Armstrong <narmstrong@baylibre.com>
11+
- Neil Armstrong <neil.armstrong@linaro.org>
1212

1313
properties:
1414
compatible:

0 commit comments

Comments
 (0)