diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2018-09-28 12:48:09 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2018-09-28 12:48:34 +0200 |
| commit | 4bef2317b47aaccb6cb3334e11a759a707fa3ce4 (patch) | |
| tree | 37e54209dab23243798d4c63379817d25c9d37ea /Documentation/devicetree/bindings/arm/amlogic.txt | |
| parent | 49919eabc85f10cecbb7360e3f526fcb01e0d511 (diff) | |
| parent | 9c8c52f7cb4f3b604bb9836947dadfbb255f465f (diff) | |
| download | talos-obmc-linux-4bef2317b47aaccb6cb3334e11a759a707fa3ce4.tar.gz talos-obmc-linux-4bef2317b47aaccb6cb3334e11a759a707fa3ce4.zip | |
Merge tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into next/dt
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>
Diffstat (limited to 'Documentation/devicetree/bindings/arm/amlogic.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/amlogic.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/amlogic.txt b/Documentation/devicetree/bindings/arm/amlogic.txt index 2c2eee206736..4498292b833d 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.txt +++ b/Documentation/devicetree/bindings/arm/amlogic.txt @@ -57,6 +57,10 @@ Boards with the Amlogic Meson AXG A113D SoC shall have the following properties: 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) @@ -102,6 +106,8 @@ Board compatible values (alphabetically, grouped by SoC): - "amlogic,s400" (Meson axg a113d) + - "amlogic,u200" (Meson g12a s905d2) + Amlogic Meson Firmware registers Interface ------------------------------------------ |
