summaryrefslogtreecommitdiffstats
path: root/Documentation/devicetree/bindings
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-11-30 23:22:10 +0100
committerArnd Bergmann <arnd@arndb.de>2016-11-30 23:22:10 +0100
commit09a566514c49b730ac5099549c014180f00be250 (patch)
tree87b4016d276dd3b8a27bf8a0d82d0c8236e5d7b4 /Documentation/devicetree/bindings
parentec5260f26b986e4dd29494adab912cb9e7c32156 (diff)
parentc681ca42bfb74f74ac3187ca5289df25cb67b67f (diff)
downloadblackbird-op-linux-09a566514c49b730ac5099549c014180f00be250.tar.gz
blackbird-op-linux-09a566514c49b730ac5099549c014180f00be250.zip
Merge tag 'amlogic-dt64-2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt64
Pull "Amlogic 64-bit DT updates for v4.10, round 2" from Kevin Hilman: - new SoC support: S912/GXM series (8x A53) - new boards: Nexbox A1 (S912), Nexbox A95X (S905X) - resets for 2nd USB PHY - update SCPI compatible for pre-v1.0 devices * tag 'amlogic-dt64-2-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic: ARM64: dts: meson-gxbb: add SCPI pre-1.0 compatible ARM64: dts: meson-gxl: Add support for Nexbox A95X ARM64: dts: meson-gxm: Add support for the Nexbox A1 ARM64: dts: Add support for Meson GXM ARM64: dts: meson-gxbb: add the USB reset also to the second USB PHY
Diffstat (limited to 'Documentation/devicetree/bindings')
-rw-r--r--Documentation/devicetree/bindings/arm/amlogic.txt8
1 files changed, 8 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/amlogic.txt b/Documentation/devicetree/bindings/arm/amlogic.txt
index fffc17992510..9b2b41ab6817 100644
--- a/Documentation/devicetree/bindings/arm/amlogic.txt
+++ b/Documentation/devicetree/bindings/arm/amlogic.txt
@@ -25,6 +25,10 @@ Boards with the Amlogic Meson GXL S905D SoC shall have the following properties:
Required root node property:
compatible: "amlogic,s905d", "amlogic,meson-gxl";
+Boards with the Amlogic Meson GXM S912 SoC shall have the following properties:
+ Required root node property:
+ compatible: "amlogic,s912", "amlogic,meson-gxm";
+
Board compatible values:
- "geniatech,atv1200" (Meson6)
- "minix,neo-x8" (Meson8)
@@ -39,3 +43,7 @@ Board compatible values:
- "amlogic,p212" (Meson gxl s905x)
- "amlogic,p230" (Meson gxl s905d)
- "amlogic,p231" (Meson gxl s905d)
+ - "amlogic,q200" (Meson gxm s912)
+ - "amlogic,q201" (Meson gxm s912)
+ - "nexbox,a95x" (Meson gxbb or Meson gxl s905x)
+ - "nexbox,a1" (Meson gxm s912)
OpenPOWER on IntegriCloud