Merge branch 'master' into i2c/for-mergewindow

Author: wsakernel

.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]>
+Neil Armstrong <[email protected]> <[email protected]>
 Nguyen Anh Quynh <[email protected]>
 Nicholas Piggin <[email protected]> <[email protected]>
 Nicholas Piggin <[email protected]> <[email protected]>

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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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/dma/moxa,moxart-dma.txt

@@ -34,8 +34,8 @@ Example:
 Use specific request line passing from dma
 For example, MMC request line is 5
 
-	sdhci: sdhci@98e00000 {
-		compatible = "moxa,moxart-sdhci";
+	mmc: mmc@98e00000 {
+		compatible = "moxa,moxart-mmc";
 		reg = <0x98e00000 0x5C>;
 		interrupts = <5 0>;
 		clocks = <&clk_apb>;

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

@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
 title: Generic i.MX bus frequency device
 
 maintainers:
-  - Leonard Crestez <leonard.crestez@nxp.com>
+  - Peng Fan <peng.fan@nxp.com>
 
 description: |
   The i.MX SoC family has multiple buses for which clock frequency (and