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 /arch/arm/boot/dts/Makefile | |
| parent | 7d738dbbe2ab871a6374aff6529e941df470c1a0 (diff) | |
| parent | 345b40f1e50759d09144c4aa044d07823d77c283 (diff) | |
| download | linux-stable-19748e26f743a8ba75c680f865c584994f090919.tar.gz linux-stable-19748e26f743a8ba75c680f865c584994f090919.tar.bz2 linux-stable-19748e26f743a8ba75c680f865c584994f090919.zip | |
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 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index ef58a49886d7..8fda1255039d 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -771,7 +771,8 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3288-veyron-mickey.dtb \ rk3288-veyron-minnie.dtb \ rk3288-veyron-pinky.dtb \ - rk3288-veyron-speedy.dtb + rk3288-veyron-speedy.dtb \ + rk3288-vyasa.dtb dtb-$(CONFIG_ARCH_S3C24XX) += \ s3c2416-smdk2416.dtb dtb-$(CONFIG_ARCH_S3C64XX) += \ |