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/vendor-prefixes.txt | |
| parent | Merge tag 'mvebu-dt-5.1-1' of git://git.infradead.org/linux-mvebu into arm/dt (diff) | |
| parent | arm64: dts: meson: add g12a x96 max board (diff) | |
| download | linux-e7b984912d111c313027399c6da54dce91031fe1.tar.xz linux-e7b984912d111c313027399c6da54dce91031fe1.zip | |
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/vendor-prefixes.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/vendor-prefixes.txt b/Documentation/devicetree/bindings/vendor-prefixes.txt index b91870a1aedf..a81c08b715e5 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -24,6 +24,7 @@ amarula Amarula Solutions amazon Amazon.com, Inc. amcc Applied Micro Circuits Corporation (APM, formally AMCC) amd Advanced Micro Devices (AMD), Inc. +amediatech Shenzhen Amediatech Technology Co., Ltd amlogic Amlogic, Inc. ampire Ampire Co., Ltd. ams AMS AG |