From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Dec 2019 20:09:47 +0000 (-0800)
Subject: Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=eb275167d18684e07ee43bdc0e09a18326540461;p=linux.git

Merge tag 'armsoc-dt' of git://git./linux/kernel/git/soc/soc

Pull ARM Device-tree updates from Olof Johansson:
 "As always, the bulk of updates.  Some of the news this cycle:

  New SoC descriptions:
   - Broadcom BCM2711
   - Amlogic Meson A1 and G12
   - Freescale S32V234
   - Marvell Armada AP807/AP807-quad and CP115
   - Realtek RTD1293 and RTD1296
   - Rockchip RK3308

  New boards and platforms:
   - Allwinner: NanoPi Duo2
   - Amlogic: Ugoos am6
   - Atmel at91: Overkiz Kizbox2/4
   - Broadcom: RPi4, Luxul XWC-2000
   - Marvell: New Espressobin flavor
   - NXP: i.MX8MN LPDDR4 EVK, i.MX8QXP Colibri, S32V234 EVB, Netronix
     E60K02 and Kobo Clara HD, Kontron N6311 and N6411, OPOS6UL and
     OPOS6ULDev
   - Renesas: Salvator-XS
   - Rockchip: Beelink A1 (rk3308), rk3308 eval boards, rk3399-roc-pc"

* tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (653 commits)
  ARM: dts: logicpd-torpedo: Disable USB Host
  arm: dts: mt6323: add keys, power-controller, rtc and codec
  arm64: dts: mt8183: add systimer0 device node
  dt-bindings: mediatek: update bindings for MT8183 systimer
  arm64: dts: rockchip: fix sdmmc detection on boot on rk3328-roc-cc
  arm64: dts: rockchip: Split rk3399-roc-pc for with and without mezzanine board.
  arm64: dts: rockchip: Add Beelink A1
  dt-bindings: ARM: rockchip: Add Beelink A1
  arm64: dts: rockchip: Add RK3328 audio pipelines
  arm64: dts: ti: k3-j721e-common-proc-board: Add USB ports
  arm64: dts: ti: k3-j721e-main: add USB controller nodes
  ARM: dts: aspeed-g6: Add timer description
  ARM: dts: aspeed: ast2600evb: Enable i2c buses
  ARM: dts: at91: add a dts and dtsi file for kizbox2 based boards
  dt-bindings: arm: at91: Document Kizbox2-2 board binding
  arm64: dts: meson-gx: fix i2c compatible
  arm64: dts: meson-gx: cec node should be disabled by default
  arm64: dts: meson-g12b-odroid-n2: add missing amlogic, s922x compatible
  arm64: dts: meson-gxm: fix gpu irq order
  arm64: dts: meson-g12a: fix gpu irq order
  ...
---

eb275167d18684e07ee43bdc0e09a18326540461
diff --cc Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml
index c9bdf10743056,018f3ae4b43c5..36f59b3ade71d
--- a/Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml
+++ b/Documentation/devicetree/bindings/gpu/arm,mali-midgard.yaml
@@@ -29,8 -21,11 +29,12 @@@ properties
        - items:
            - enum:
               - amlogic,meson-gxm-mali
 +             - realtek,rtd1295-mali
            - const: arm,mali-t820
+       - items:
+           - enum:
+              - arm,juno-mali
+           - const: arm,mali-t624
        - items:
            - enum:
               - rockchip,rk3288-mali
@@@ -40,8 -34,16 +44,7 @@@
            - enum:
               - rockchip,rk3399-mali
            - const: arm,mali-t860
 -      - items:
 -          - enum:
 -             - samsung,exynos5250-mali
 -          - const: arm,mali-t604
 -      - items:
 -          - enum:
 -             - samsung,exynos5433-mali
 -          - const: arm,mali-t760
  
-           # "arm,mali-t624"
 -          # "arm,mali-t628"
            # "arm,mali-t830"
            # "arm,mali-t880"