diff options
| author | Olof Johansson <olof@lixom.net> | 2015-07-17 20:37:26 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-07-17 20:37:26 +0300 |
| commit | af3761246c18f8d4b2c5b6b7acb2cfce911b8530 (patch) | |
| tree | bd407b8506af5c7b4f09d710c5ff8f4307694dc4 /arch/arm/boot/dts/Makefile | |
| parent | fb61a92190f630c7090907197557f3f780269561 (diff) | |
| parent | 4863dcd394019b542ac968870cba734d27e992e0 (diff) | |
| download | linux-af3761246c18f8d4b2c5b6b7acb2cfce911b8530.tar.xz | |
Merge tag 'v4.3-rockchip32-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/dt
Merge "Rockchip dts changes for 4.3, part1" from Heiko Stuebner:
This adds the board for the Netxeon R89 used in different TV-boxes and
the initial support for two Chromebooks from the veyron family.
Additionally a non-critical fix for the watchdog irq on rk3288, addition
of the gmac reset line, a ramp delay for the cpu regulator on the firefly
board and cpu affinity for the arm-pmu spi irqs.
* tag 'v4.3-rockchip32-dts1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
ARM: dts: rockchip: add rk3288 arm-pmu irq affinity
dt-bindings: document rk3368 R88 board from Rockchip
ARM: dts: rockchip: add missing device_type = "memory" to boards
ARM: dts: rockchip: add veyron-pinky board
ARM: dts: rockchip: add veyron-jerry board
ARM: dts: rockchip: add shared rk3288-veyron files
ARM: dts: Add sbs-battery dts fragment used by chromebooks
ARM: dts: rockchip: add Netxeon R89 board
dt-bindings: add vendor prefix for Netxeon Technology
ARM: dts: rockchip: fix rk3288 watchdog irq
ARM: dts: rockchip: Add ramp delay for vdd_cpu in firefly board dts
ARM: dts: rockchip: Add STMMAC reset signal in GMAC interface for rk3288
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index af738d31975c..2304076de542 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -495,7 +495,10 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += \ rk3288-evb-act8846.dtb \ rk3288-evb-rk808.dtb \ rk3288-firefly-beta.dtb \ - rk3288-firefly.dtb + rk3288-firefly.dtb \ + rk3288-r89.dtb \ + rk3288-veyron-jerry.dtb \ + rk3288-veyron-pinky.dtb dtb-$(CONFIG_ARCH_S3C24XX) += \ s3c2416-smdk2416.dtb dtb-$(CONFIG_ARCH_S3C64XX) += \ |