summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/Makefile
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2015-12-10 19:46:46 +0300
committerArnd Bergmann <arnd@arndb.de>2015-12-10 19:46:46 +0300
commit6da06083f491fb5c33e23e71d01ba097dfd99f59 (patch)
tree906ae73be22ab9dfe3476624f6d4fcc41efa688e /arch/arm/boot/dts/Makefile
parentc72c7a00a8d1a0436ab743274ddb9f1783d491ae (diff)
parentd537543b3948bc3bc9dede248fa455493e055457 (diff)
downloadlinux-6da06083f491fb5c33e23e71d01ba097dfd99f59.tar.xz
Merge tag 'renesas-dt-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
Merge "Renesas ARM Based SoC DT Updates for v4.5" from Simon Horman: * henninger: Remove as it is now replaced by silk * koelsch: Move SPI partitions to subnode * porter: Add CAN0 and HS-USB support * r8a7793/gose: Add QSPI, PFC support * r8a7793: Add GPIO, DMAC, theral, IPMMU support * r8a7794/alt: Add DU support * r8a7794: Disable all IPMMU nodes by default * r8a779[0134]: Use Use SoC specific binding for rcar-dmac * r8a779[01], r8a73a4, r8a7740, sh73a0: replace gpio-key, wakeup with wakeup-source property * r8a779[14]: Correct "gpio-ranges" properties * r8a779[14]: Remove bogus imp_clk node * silk: Add SDHI1 support * tag 'renesas-dt-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (29 commits) ARM: shmobile: alt: add VIN0, ADV7180 DT support ARM: shmobile: alt: add I2C1 DT support ARM: shmobile: alt: Add pfc pins to DT ARM: shmobile: r8a7794: Use SoC specific binding for rcar-dmac nodes ARM: shmobile: r8a7793: Use SoC specific binding for rcar-dmac nodes ARM: shmobile: r8a7791: Use SoC specific binding for rcar-dmac nodes ARM: shmobile: r8a7790: Use SoC specific binding for rcar-dmac nodes ARM: shmobile: r8a7793: Add GPIO nodes to device tree ARM: shmobile: r8a7794: alt: Enable VGA port ARM: shmobile: r8a7794: Add DU node to device tree ARM: shmobile: r8a7794: Add DU0 clock ARM: shmobile: gose: Add QSPI device to DT ARM: shmobile: r8a7793: Add QSPI device to DT ARM: shmobile: r8a7793: Add DMAC devices to DT ARM: shmobile: koelsch: Move SPI FLASH partitions to subnode ARM: shmobile: gose: Configure PFC in DT ARM: shmobile: r8a7793: Add PFC to DT ARM: shmobile: r8a7793: Add thermal device to DT ARM: shmobile: henninger: remove board DT ARM: shmobile: porter: add CAN0 DT support ...
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
-rw-r--r--arch/arm/boot/dts/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 30bbc3746130..6584aa72493c 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -547,7 +547,6 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \
r8a7778-bockw.dtb \
r8a7779-marzen.dtb \
r8a7790-lager.dtb \
- r8a7791-henninger.dtb \
r8a7791-koelsch.dtb \
r8a7791-porter.dtb \
r8a7793-gose.dtb \