summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-09-13 17:34:49 +0200
committerArnd Bergmann <arnd@arndb.de>2016-09-13 17:34:49 +0200
commita6023d05001737722a9a06c4c49f4e2cf340fda4 (patch)
tree57d1306ea9f891d8697a31394dc42ade413c35e8 /arch/arm/boot/dts/Makefile
parent29b48f98605d7cdf1ce14ddd372e2155406b02d7 (diff)
parentfa8f4aba72e6d619c003dab60f58ab6c7410e465 (diff)
downloadblackbird-op-linux-a6023d05001737722a9a06c4c49f4e2cf340fda4.tar.gz
blackbird-op-linux-a6023d05001737722a9a06c4c49f4e2cf340fda4.zip
Merge tag 'renesas-dt2-for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
Pull "Second Round of Renesas ARM Based SoC DT Updates for v4.9" from Simon Horman: Fixes (for v4.9): * Correct PWM clock parent on r8a7794 SoC Clean-up: * Remove obsolete vsp1 properties from r8a779[01] SoCs New boards: * Add r8a7792/wheat and r7s72100/rskrza1 boards Enablement: * Enable LEDs, DU, SDHI on r8a7792/blanche board * Enable MMCIF and SDHI on r8a7794/alt board * Add SPI and VSP1 to r8a7792 SoC * Add ethernet to r7s72100 SoC * tag 'renesas-dt2-for-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (26 commits) ARM: dts: wheat: add support for tactile switches ARM: dts: wheat: add QSPI support ARM: dts: r8a7792: add QSPI support ARM: dts: r8a7792: add QSPI clock ARM: dts: wheat: add SDHI0 support ARM: dts: wheat: add CAN support ARM: dts: r8a7794: fix PWM clock parent ARM: dts: rskrza1: add ethernet DT support ARM: dts: r7s72100: add ethernet to device tree ARM: dts: r7s72100: add ethernet clock to device tree ARM: dts: rskrza1: initial device tree ARM: dts: Add RSKRZA1 DT bindings documentation ARM: dts: wheat: add Ethernet support ARM: dts: wheat: initial device tree ARM: dts: document Wheat board ARM: dts: blanche: add support for general purpose LEDs ARM: dts: r8a7792: add VSP1V support ARM: dts: r8a7792: add VSP1V clocks ARM: dts: blanche: add DU support ARM: dts: blanche: add SDHI0 support ...
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r--arch/arm/boot/dts/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 9deb07810043..8eb8cff8c97d 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -652,6 +652,7 @@ dtb-$(CONFIG_ARCH_S5PV210) += \
dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
emev2-kzm9d.dtb \
r7s72100-genmai.dtb \
+ r7s72100-rskrza1.dtb \
r8a73a4-ape6evm.dtb \
r8a7740-armadillo800eva.dtb \
r8a7778-bockw.dtb \
@@ -660,6 +661,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
r8a7791-koelsch.dtb \
r8a7791-porter.dtb \
r8a7792-blanche.dtb \
+ r8a7792-wheat.dtb \
r8a7793-gose.dtb \
r8a7794-alt.dtb \
r8a7794-silk.dtb \
OpenPOWER on IntegriCloud