projects/linux·commit 3245cb65

Merge tag 'devicetree-fixes-for-6.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

3245cb65 · Linus Torvalds <[email protected]> · 2022-09-14 10:22:39 +01:00

Pull devicetree fixes from Rob Herring:

 - Update some stale binding maintainer emails

 - Fix property name error in apple,aic binding

 - Add missing param to of_dma_configure_id() stub

 - Fix an off-by-one error in unflatten_dt_nodes()

* tag 'devicetree-fixes-for-6.0-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: pinctrl: qcom: drop non-working codeaurora.org emails
  dt-bindings: power: qcom,rpmpd: drop non-working codeaurora.org emails
  dt-bindings: apple,aic: Fix required item "apple,fiq-index" in affinity description
  dt-bindings: interconnect: fsl,imx8m-noc: drop Leonard Crestez
  of/device: Fix up of_dma_configure_id() stub
  MAINTAINERS: Update email of Neil Armstrong
  of: fdt: fix off-by-one error in unflatten_dt_nodes()
Commit
3245cb65fd91cd514801bf91f5a3066d562f0ac4
Parents
d1221cea · de11663b

Merge commit. Changes below are compared with the first parent: d1221cea.

Changes

34 files changed · +44 −43

FileStatusAddDelContent
.mailmapmodified+1−0View file
Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yamlmodified+1−1View file
Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yamlmodified+1−1View file
Documentation/devicetree/bindings/display/amlogic,meson-vpu.yamlmodified+1−1View file
Documentation/devicetree/bindings/display/bridge/analogix,anx7814.yamlmodified+1−1View file
Documentation/devicetree/bindings/display/bridge/ite,it66121.yamlmodified+1−1View file
Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.yamlmodified+1−1View file
Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.yamlmodified+1−1View file
Documentation/devicetree/bindings/interconnect/fsl,imx8m-noc.yamlmodified+1−1View file
Documentation/devicetree/bindings/interrupt-controller/apple,aic.yamlmodified+1−1View file
Documentation/devicetree/bindings/mailbox/amlogic,meson-gxbb-mhu.yamlmodified+1−1View file
Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yamlmodified+1−1View file
Documentation/devicetree/bindings/media/amlogic,gx-vdec.yamlmodified+1−1View file
Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yamlmodified+1−1View file
Documentation/devicetree/bindings/mfd/khadas,mcu.yamlmodified+1−1View file
Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yamlmodified+1−1View file
Documentation/devicetree/bindings/phy/amlogic,axg-mipi-dphy.yamlmodified+1−1View file
Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yamlmodified+1−1View file
Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yamlmodified+1−1View file
Documentation/devicetree/bindings/pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yamlmodified+0−1View file
Documentation/devicetree/bindings/pinctrl/qcom,sc7280-pinctrl.yamlmodified+1−1View file
Documentation/devicetree/bindings/power/amlogic,meson-ee-pwrc.yamlmodified+1−1View file
Documentation/devicetree/bindings/power/qcom,rpmpd.yamlmodified+1−1View file
Documentation/devicetree/bindings/reset/amlogic,meson-reset.yamlmodified+1−1View file
Documentation/devicetree/bindings/rng/amlogic,meson-rng.yamlmodified+1−1View file
Documentation/devicetree/bindings/serial/amlogic,meson-uart.yamlmodified+1−1View file
Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.yamlmodified+1−1View file
Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yamlmodified+1−1View file
Documentation/devicetree/bindings/spi/amlogic,meson6-spifc.yamlmodified+1−1View file
Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yamlmodified+1−1View file
Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yamlmodified+1−1View file
MAINTAINERSmodified+10−10View file
drivers/of/fdt.cmodified+1−1View file
include/linux/of_device.hmodified+3−2View file

.mailmap

View file
diff --git a/.mailmap b/.mailmap
index 8ded2e7..d175777 100644
--- a/.mailmap
+++ b/.mailmap
@@ -315,6 +315,7 @@ Morten Welinder <[email protected]>
Mythri P K <[email protected]>
Nadia Yvette Chambers <[email protected]> William Lee Irwin III <[email protected]>
Nathan Chancellor <[email protected]> <[email protected]>
Nguyen Anh Quynh <[email protected]>

Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml

View file
diff --git a/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml b/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml
index 6cc7452..1748f16 100644
--- a/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml
+++ b/Documentation/devicetree/bindings/arm/amlogic/amlogic,meson-gx-ao-secure.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Amlogic Meson Firmware registers Interface
maintainers:
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
description: |
The Meson SoCs have a register bank with status and data shared with the

Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml

View file
diff --git a/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml b/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml
index 2e208d2..7cdffdb 100644
--- a/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml
+++ b/Documentation/devicetree/bindings/display/amlogic,meson-dw-hdmi.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Amlogic specific extensions to the Synopsys Designware HDMI Controller
maintainers:
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
allOf:
- $ref: /schemas/sound/name-prefix.yaml#

Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml

View file
diff --git a/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml b/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml
index 047fd69..6655a93 100644
--- a/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml
+++ b/Documentation/devicetree/bindings/display/amlogic,meson-vpu.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Amlogic Meson Display Controller
maintainers:
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
description: |
The Amlogic Meson Display controller is composed of several components

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

View file
diff --git a/Documentation/devicetree/bindings/display/bridge/analogix,anx7814.yaml b/Documentation/devicetree/bindings/display/bridge/analogix,anx7814.yaml
index bce96b5..4a5e5d9 100644
--- a/Documentation/devicetree/bindings/display/bridge/analogix,anx7814.yaml
+++ b/Documentation/devicetree/bindings/display/bridge/analogix,anx7814.yaml
@@ -8,7 +8,7 @@ title: Analogix ANX7814 SlimPort (Full-HD Transmitter)
maintainers:
- Andrzej Hajda <[email protected]>
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
- Robert Foss <[email protected]>
properties:

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

View file
diff --git a/Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml b/Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml
index c6e81f5..1b2185b 100644
--- a/Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml
+++ b/Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml
@@ -8,7 +8,7 @@ title: ITE it66121 HDMI bridge Device Tree Bindings
maintainers:
- Phong LE <[email protected]>
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
description: |
The IT66121 is a high-performance and low-power single channel HDMI

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

View file
diff --git a/Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.yaml b/Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.yaml
index 44e02de..2e75e37 100644
--- a/Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.yaml
+++ b/Documentation/devicetree/bindings/display/panel/sgd,gktw70sdae4se.yaml
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Solomon Goldentek Display GKTW70SDAE4SE 7" WVGA LVDS Display Panel
maintainers:
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
- Thierry Reding <[email protected]>
allOf:

Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.yaml

View file
diff --git a/Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.yaml b/Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.yaml
index 6ecb027..199a354 100644
--- a/Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.yaml
+++ b/Documentation/devicetree/bindings/i2c/amlogic,meson6-i2c.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Amlogic Meson I2C Controller
maintainers:
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
- Beniamino Galvani <[email protected]>
allOf:

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

View file
diff --git a/Documentation/devicetree/bindings/interconnect/fsl,imx8m-noc.yaml b/Documentation/devicetree/bindings/interconnect/fsl,imx8m-noc.yaml
index 09c8948..fa4f768 100644
--- a/Documentation/devicetree/bindings/interconnect/fsl,imx8m-noc.yaml
+++ b/Documentation/devicetree/bindings/interconnect/fsl,imx8m-noc.yaml
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Generic i.MX bus frequency device
maintainers:
- - Leonard Crestez <[email protected]>
+ - Peng Fan <[email protected]>
description: |
The i.MX SoC family has multiple buses for which clock frequency (and

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

View file
diff --git a/Documentation/devicetree/bindings/interrupt-controller/apple,aic.yaml b/Documentation/devicetree/bindings/interrupt-controller/apple,aic.yaml
index 85c85b6..e18107e 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/apple,aic.yaml
+++ b/Documentation/devicetree/bindings/interrupt-controller/apple,aic.yaml
@@ -96,7 +96,7 @@ properties:
Documentation/devicetree/bindings/arm/cpus.yaml).
required:
- - fiq-index
+ - apple,fiq-index
- cpus
required:

Documentation/devicetree/bindings/mailbox/amlogic,meson-gxbb-mhu.yaml

View file
diff --git a/Documentation/devicetree/bindings/mailbox/amlogic,meson-gxbb-mhu.yaml b/Documentation/devicetree/bindings/mailbox/amlogic,meson-gxbb-mhu.yaml
index ea06976..dfd26b9 100644
--- a/Documentation/devicetree/bindings/mailbox/amlogic,meson-gxbb-mhu.yaml
+++ b/Documentation/devicetree/bindings/mailbox/amlogic,meson-gxbb-mhu.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Amlogic Meson Message-Handling-Unit Controller
maintainers:
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
description: |
The Amlogic's Meson SoCs Message-Handling-Unit (MHU) is a mailbox controller

Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml

View file
diff --git a/Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml b/Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml
index bee93bd..e551be5 100644
--- a/Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml
+++ b/Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Amlogic GE2D Acceleration Unit
maintainers:
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
properties:
compatible:

Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml

View file
diff --git a/Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml b/Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml
index 5044c4b..b827eda 100644
--- a/Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml
+++ b/Documentation/devicetree/bindings/media/amlogic,gx-vdec.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Amlogic Video Decoder
maintainers:
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
- Maxime Jourdan <[email protected]>
description: |

Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml

View file
diff --git a/Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml b/Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml
index d93aea6..8d844f4 100644
--- a/Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml
+++ b/Documentation/devicetree/bindings/media/amlogic,meson-gx-ao-cec.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Amlogic Meson AO-CEC Controller
maintainers:
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
description: |
The Amlogic Meson AO-CEC module is present is Amlogic SoCs and its purpose is

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

View file
diff --git a/Documentation/devicetree/bindings/mfd/khadas,mcu.yaml b/Documentation/devicetree/bindings/mfd/khadas,mcu.yaml
index a3b976f..5750cc0 100644
--- a/Documentation/devicetree/bindings/mfd/khadas,mcu.yaml
+++ b/Documentation/devicetree/bindings/mfd/khadas,mcu.yaml
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Khadas on-board Microcontroller Device Tree Bindings
maintainers:
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
description: |
Khadas embeds a microcontroller on their VIM and Edge boards adding some

Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml

View file
diff --git a/Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml b/Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml
index 608e1d6..ddd5a07 100644
--- a/Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml
+++ b/Documentation/devicetree/bindings/net/amlogic,meson-dwmac.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Amlogic Meson DWMAC Ethernet controller
maintainers:
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
- Martin Blumenstingl <[email protected]>
# We need a select here so we don't match all nodes with 'snps,dwmac'

Documentation/devicetree/bindings/phy/amlogic,axg-mipi-dphy.yaml

View file
diff --git a/Documentation/devicetree/bindings/phy/amlogic,axg-mipi-dphy.yaml b/Documentation/devicetree/bindings/phy/amlogic,axg-mipi-dphy.yaml
index be485f5..5eddaed 100644
--- a/Documentation/devicetree/bindings/phy/amlogic,axg-mipi-dphy.yaml
+++ b/Documentation/devicetree/bindings/phy/amlogic,axg-mipi-dphy.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Amlogic AXG MIPI D-PHY
maintainers:
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
properties:
compatible:

Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yaml

View file
diff --git a/Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yaml b/Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yaml
index 399ebde..f3a5fba 100644
--- a/Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb2-phy.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Amlogic G12A USB2 PHY
maintainers:
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
properties:
compatible:

Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml

View file
diff --git a/Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml b/Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml
index 453c083..868b4e6 100644
--- a/Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml
+++ b/Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Amlogic G12A USB3 + PCIE Combo PHY
maintainers:
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
properties:
compatible:

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

View file
diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml
index 33d1d37..624e14f 100644
--- a/Documentation/devicetree/bindings/pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml
+++ b/Documentation/devicetree/bindings/pinctrl/qcom,sc7280-lpass-lpi-pinctrl.yaml
@@ -8,7 +8,6 @@ title: Qualcomm Technologies, Inc. Low Power Audio SubSystem (LPASS)
Low Power Island (LPI) TLMM block
maintainers:
- - Srinivasa Rao Mandadapu <[email protected]>
- Srinivas Kandagatla <[email protected]>
description: |

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

View file
diff --git a/Documentation/devicetree/bindings/pinctrl/qcom,sc7280-pinctrl.yaml b/Documentation/devicetree/bindings/pinctrl/qcom,sc7280-pinctrl.yaml
index 2d22816..2bd60c4 100644
--- a/Documentation/devicetree/bindings/pinctrl/qcom,sc7280-pinctrl.yaml
+++ b/Documentation/devicetree/bindings/pinctrl/qcom,sc7280-pinctrl.yaml
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Technologies, Inc. SC7280 TLMM block
maintainers:
- - Rajendra Nayak <[email protected]>
+ - Bjorn Andersson <[email protected]>
description: |
This binding describes the Top Level Mode Multiplexer block found in the

Documentation/devicetree/bindings/power/amlogic,meson-ee-pwrc.yaml

View file
diff --git a/Documentation/devicetree/bindings/power/amlogic,meson-ee-pwrc.yaml b/Documentation/devicetree/bindings/power/amlogic,meson-ee-pwrc.yaml
index 5390e98..43a9322 100644
--- a/Documentation/devicetree/bindings/power/amlogic,meson-ee-pwrc.yaml
+++ b/Documentation/devicetree/bindings/power/amlogic,meson-ee-pwrc.yaml
@@ -8,7 +8,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Amlogic Meson Everything-Else Power Domains
maintainers:
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
description: |+
The Everything-Else Power Domains node should be the child of a syscon

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

View file
diff --git a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml
index 0ccca49..3934a2b 100644
--- a/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml
+++ b/Documentation/devicetree/bindings/power/qcom,rpmpd.yaml
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm RPM/RPMh Power domains
maintainers:
- - Rajendra Nayak <[email protected]>
+ - Bjorn Andersson <[email protected]>
description:
For RPM/RPMh Power domains, we communicate a performance state to RPM/RPMh

Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml

View file
diff --git a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
index 494a454..98db2aa 100644
--- a/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
+++ b/Documentation/devicetree/bindings/reset/amlogic,meson-reset.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Amlogic Meson SoC Reset Controller
maintainers:
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
properties:
compatible:

Documentation/devicetree/bindings/rng/amlogic,meson-rng.yaml

View file
diff --git a/Documentation/devicetree/bindings/rng/amlogic,meson-rng.yaml b/Documentation/devicetree/bindings/rng/amlogic,meson-rng.yaml
index 444be32..09c6c90 100644
--- a/Documentation/devicetree/bindings/rng/amlogic,meson-rng.yaml
+++ b/Documentation/devicetree/bindings/rng/amlogic,meson-rng.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Amlogic Meson Random number generator
maintainers:
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
properties:
compatible:

Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml

View file
diff --git a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml
index 72e8868..7822705 100644
--- a/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml
+++ b/Documentation/devicetree/bindings/serial/amlogic,meson-uart.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Amlogic Meson SoC UART Serial Interface
maintainers:
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
description: |
The Amlogic Meson SoC UART Serial Interface is present on a large range

Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.yaml

View file
diff --git a/Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.yaml b/Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.yaml
index 17db87c..c3c5990 100644
--- a/Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.yaml
+++ b/Documentation/devicetree/bindings/soc/amlogic/amlogic,canvas.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Amlogic Canvas Video Lookup Table
maintainers:
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
- Maxime Jourdan <[email protected]>
description: |

Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml

View file
diff --git a/Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml b/Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml
index 50de0da..0c10f76 100644
--- a/Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml
+++ b/Documentation/devicetree/bindings/spi/amlogic,meson-gx-spicc.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Amlogic Meson SPI Communication Controller
maintainers:
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
allOf:
- $ref: "spi-controller.yaml#"

Documentation/devicetree/bindings/spi/amlogic,meson6-spifc.yaml

View file
diff --git a/Documentation/devicetree/bindings/spi/amlogic,meson6-spifc.yaml b/Documentation/devicetree/bindings/spi/amlogic,meson6-spifc.yaml
index 8a9d526..ac3b2ec 100644
--- a/Documentation/devicetree/bindings/spi/amlogic,meson6-spifc.yaml
+++ b/Documentation/devicetree/bindings/spi/amlogic,meson6-spifc.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Amlogic Meson SPI Flash Controller
maintainers:
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
allOf:
- $ref: "spi-controller.yaml#"

Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml

View file
diff --git a/Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml b/Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml
index e349fa5..daf2a85 100644
--- a/Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml
+++ b/Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Amlogic Meson G12A DWC3 USB SoC Controller Glue
maintainers:
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
description: |
The Amlogic G12A embeds a DWC3 USB IP Core configured for USB2 and USB3

Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml

View file
diff --git a/Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml b/Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml
index c7459cf..497d604 100644
--- a/Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml
@@ -8,7 +8,7 @@ $schema: "http://devicetree.org/meta-schemas/core.yaml#"
title: Meson GXBB SoCs Watchdog timer
maintainers:
- - Neil Armstrong <[email protected]>
+ - Neil Armstrong <[email protected]>
allOf:
- $ref: watchdog.yaml#

MAINTAINERS

View file
diff --git a/MAINTAINERS b/MAINTAINERS
index 936490d..d2114f9 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1803,7 +1803,7 @@ N: sun[x456789]i
N: sun50i
ARM/Amlogic Meson SoC CLOCK FRAMEWORK
-M: Neil Armstrong <[email protected]>
+M: Neil Armstrong <[email protected]>
M: Jerome Brunet <[email protected]>
S: Maintained
@@ -1828,7 +1828,7 @@ F: Documentation/devicetree/bindings/sound/amlogic*
F: sound/soc/meson/
ARM/Amlogic Meson SoC support
-M: Neil Armstrong <[email protected]>
+M: Neil Armstrong <[email protected]>
M: Kevin Hilman <[email protected]>
R: Jerome Brunet <[email protected]>
R: Martin Blumenstingl <[email protected]>
@@ -2531,7 +2531,7 @@ W: http://www.digriz.org.uk/ts78xx/kernel
F: arch/arm/mach-orion5x/ts78xx-*
ARM/OXNAS platform support
-M: Neil Armstrong <[email protected]>
+M: Neil Armstrong <[email protected]>
L: [email protected] (moderated for non-subscribers)
L: [email protected] (moderated for non-subscribers)
S: Maintained
@@ -6792,7 +6792,7 @@ F: Documentation/devicetree/bindings/display/allwinner*
F: drivers/gpu/drm/sun4i/
DRM DRIVERS FOR AMLOGIC SOCS
-M: Neil Armstrong <[email protected]>
+M: Neil Armstrong <[email protected]>
S: Supported
@@ -6814,7 +6814,7 @@ F: drivers/gpu/drm/atmel-hlcdc/
DRM DRIVERS FOR BRIDGE CHIPS
M: Andrzej Hajda <[email protected]>
-M: Neil Armstrong <[email protected]>
+M: Neil Armstrong <[email protected]>
M: Robert Foss <[email protected]>
R: Laurent Pinchart <[email protected]>
R: Jonas Karlman <[email protected]>
@@ -10828,7 +10828,7 @@ F: drivers/media/tuners/it913x*
ITE IT66121 HDMI BRIDGE DRIVER
M: Phong LE <[email protected]>
-M: Neil Armstrong <[email protected]>
+M: Neil Armstrong <[email protected]>
S: Maintained
T: git git://anongit.freedesktop.org/drm/drm-misc
F: Documentation/devicetree/bindings/display/bridge/ite,it66121.yaml
@@ -11347,7 +11347,7 @@ F: kernel/debug/
F: kernel/module/kdb.c
KHADAS MCU MFD DRIVER
-M: Neil Armstrong <[email protected]>
+M: Neil Armstrong <[email protected]>
S: Maintained
F: Documentation/devicetree/bindings/mfd/khadas,mcu.yaml
@@ -13218,7 +13218,7 @@ S: Maintained
F: drivers/watchdog/menz69_wdt.c
MESON AO CEC DRIVER FOR AMLOGIC SOCS
-M: Neil Armstrong <[email protected]>
+M: Neil Armstrong <[email protected]>
S: Supported
@@ -13229,7 +13229,7 @@ F: drivers/media/cec/platform/meson/ao-cec-g12a.c
F: drivers/media/cec/platform/meson/ao-cec.c
MESON GE2D DRIVER FOR AMLOGIC SOCS
-M: Neil Armstrong <[email protected]>
+M: Neil Armstrong <[email protected]>
S: Supported
@@ -13245,7 +13245,7 @@ F: Documentation/devicetree/bindings/mtd/amlogic,meson-nand.txt
F: drivers/mtd/nand/raw/meson_*
MESON VIDEO DECODER DRIVER FOR AMLOGIC SOCS
-M: Neil Armstrong <[email protected]>
+M: Neil Armstrong <[email protected]>
S: Supported

drivers/of/fdt.c

View file
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index 7bc9292..1c573e7 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -314,7 +314,7 @@ static int unflatten_dt_nodes(const void *blob,
for (offset = 0;
offset >= 0 && depth >= initial_depth;
offset = fdt_next_node(blob, offset, &depth)) {
- if (WARN_ON_ONCE(depth >= FDT_MAX_DEPTH))
+ if (WARN_ON_ONCE(depth >= FDT_MAX_DEPTH - 1))
continue;
if (!IS_ENABLED(CONFIG_OF_KOBJ) &&

include/linux/of_device.h

View file
diff --git a/include/linux/of_device.h b/include/linux/of_device.h
index 1d7992a..1a803e4 100644
--- a/include/linux/of_device.h
+++ b/include/linux/of_device.h
@@ -101,8 +101,9 @@ static inline struct device_node *of_cpu_device_node_get(int cpu)
}
static inline int of_dma_configure_id(struct device *dev,
- struct device_node *np,
- bool force_dma)
+ struct device_node *np,
+ bool force_dma,
+ const u32 *id)
{
return 0;
}