diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-20 00:32:53 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-20 00:39:02 +0200 |
| commit | 19748e26f743a8ba75c680f865c584994f090919 (patch) | |
| tree | 11b10bb97ae8dc0bb606e779638640bb3e15bb2d /Documentation/devicetree/bindings/vendor-prefixes.txt | |
| parent | 7d738dbbe2ab871a6374aff6529e941df470c1a0 (diff) | |
| parent | 345b40f1e50759d09144c4aa044d07823d77c283 (diff) | |
| download | linux-19748e26f743a8ba75c680f865c584994f090919.tar.bz2 | |
Merge tag 'v4.15-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/soc
Pull "Rockchip dts32 updates for 4.15 part1" from Heiko Stübner:
One new board the Vyasa from Amarula Solutions using a rk3288
and core lvds node for the newly added driver+binding.
Also bindings + nodes for the Mali-Utgard GPUs found on some
Rockchip socs like rk3036 and rk3188. With the recently revived
Lima project they can even render a red triangle to a png file.
* tag 'v4.15-rockchip-dts32-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: dts: rockchip: Enable thermal on rk3288-vyasa board
ARM: dts: rockchip: fix mali400 ppmmu interrupt names
ARM: dts: rockchip: Enable mali GPU node on rk3288-vyasa
ARM: dts: rockchip: enable gpu on rk3188-radxarock
ARM: dts: rockchip: add gpu nodes on rk3066/rk3188
ARM: dts: rockchip: add rk322x gpu node
ARM: dts: rockchip: enable the gpu on rk3036-kylin boards
ARM: dts: rockchip: add rk3036 gpu node
dt-bindings: gpu: mali-utgard: add optional power-domain reference
dt-bindings: gpu: mali-utgard: add optional supply regulator
dt-bindings: gpu: mali-utgard: Add Rockchip Utgard Malis
ARM: dts: rockchip: enable vops and hdmi output on rk3288-vyasa
ARM: dts: rockchip: Add rk3288 vyasa board
dt-bindings: Add vendor prefix for Amarula Solutions
ARM: dts: rockchip: add LVDS node for rk3288
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 f0a8b265f6ab..8adc0aec423a 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.txt +++ b/Documentation/devicetree/bindings/vendor-prefixes.txt @@ -18,6 +18,7 @@ al Annapurna Labs allwinner Allwinner Technology Co., Ltd. alphascale AlphaScale Integrated Circuits Systems, Inc. altr Altera Corp. +amarula Amarula Solutions amazon Amazon.com, Inc. amcc Applied Micro Circuits Corporation (APM, formally AMCC) amd Advanced Micro Devices (AMD), Inc. |