Merge tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...

Amlogic ARM64 DT updates for v4.20, round 2
- new SoC support: basic support for G12A family
- new board: Amlogic U200 board, using G12A SoC
- fix SPI bus warnings from new dtc updates

* tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  arm64: dts: meson-g12a: add initial g12a s905d2 SoC DT support
  dt-bindings: arm: amlogic: Add Meson G12A binding
  arm64: dts: meson: Fix erroneous SPI bus warnings

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --combined Documentation/devicetree/bindings/arm/amlogic.txt
index 2c2eee2,cf4bbc7..4498292
--- 1/Documentation/devicetree/bindings/arm/amlogic.txt
--- 2/Documentation/devicetree/bindings/arm/amlogic.txt
+++ b/Documentation/devicetree/bindings/arm/amlogic.txt
@@@ -57,13 -57,16 +57,17 @@@ Boards with the Amlogic Meson AXG A113
    Required root node property:
      compatible: "amlogic,a113d", "amlogic,meson-axg";
  
+ Boards with the Amlogic Meson G12A S905D2 SoC shall have the following properties:
+   Required root node property:
+     compatible: "amlogic,g12a";
+ 
  Board compatible values (alphabetically, grouped by SoC):
  
    - "geniatech,atv1200" (Meson6)
  
    - "minix,neo-x8" (Meson8)
  
 +  - "endless,ec100" (Meson8b)
    - "hardkernel,odroid-c1" (Meson8b)
    - "tronfy,mxq" (Meson8b)
  
@@@ -102,6 -105,8 +106,8 @@@
  
    - "amlogic,s400" (Meson axg a113d)
  
+   - "amlogic,u200" (Meson g12a s905d2)
+ 
  Amlogic Meson Firmware registers Interface
  ------------------------------------------