diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2019-02-15 16:02:12 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2019-02-15 16:04:21 +0100 |
| commit | e7b984912d111c313027399c6da54dce91031fe1 (patch) | |
| tree | af2940b605c98f7e768c9dc95b5a73e9ed7c6dac /Documentation/devicetree/bindings/arm | |
| parent | 260bcbb319a8e3fb85fb93edb2d5d320412ac7e1 (diff) | |
| parent | d3aa4ce87348b59d7b240ae356559313a8db2f58 (diff) | |
Merge tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt
arm64: dts: Amlogic updates for v5.1
- new board: G12a-based x96 max
- G12a: add peripheral clock controller and clock measure support
- s400: fix SD/eMMC max rate issues
- s400: audio: add sp/dif in support
- GX: support simplefb
* tag 'amlogic-dt64' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
arm64: dts: meson: add g12a x96 max board
dt-bindings: arm: amlogic: add amediatech x96-max bindings
arm64: dts: meson: g12a: add peripheral clock controller
arm64: dts: meson: g12a: add clk measure support
arm64: dts: meson: axg: add clk measure support
arm64: dts: meson: fix g12a buses
arm64: dts: meson-axg: add efuse device
arm64: dts: meson: s400: fix emmc maximum rate
arm64: dts: meson: s400: enable sdr104 on sdio
arm64: dts: meson-gx: add support for simplefb
dt-bindings: meson: add specific simplefb bindings
arm64: dts: meson-gx: Add canvas provider node to the vpu
arm64: dts: meson-axg: s400: add spdifin to the sound card
arm64: dts: meson-axg: s400: add spdif-dir codec
arm64: dts: meson-axg: add spdifin
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'Documentation/devicetree/bindings/arm')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/amlogic.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/amlogic.txt b/Documentation/devicetree/bindings/arm/amlogic.txt index 8dbc259081e4..7f40cb5f490b 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.txt +++ b/Documentation/devicetree/bindings/arm/amlogic.txt @@ -109,6 +109,7 @@ Board compatible values (alphabetically, grouped by SoC): - "amlogic,s400" (Meson axg a113d) - "amlogic,u200" (Meson g12a s905d2) + - "amediatech,x96-max" (Meson g12a s905x2) Amlogic Meson Firmware registers Interface ------------------------------------------ |