diff options
| author | Olof Johansson <olof@lixom.net> | 2015-08-11 15:31:53 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-08-11 15:31:53 +0200 |
| commit | 1a08a84cc68e87d541a9b6e00d53243c2de68011 (patch) | |
| tree | 37b4ed35788471168a1fb98b9aab4741f10ba2c4 /arch/arm/boot/dts/Makefile | |
| parent | 1e86355adc6df3e228e7fd053d25e301fe768094 (diff) | |
| parent | 94bdc48d55ca10f90b4a625f0e443197e0013557 (diff) | |
Merge tag 'renesas-dt3-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
Third Round of Renesas ARM Based SoC DT Updates for v4.3
* Add JPU support: r8a7791 and r8a7790 SoCs
* Add MMCIF and PFC support: r8a7794 SoC
* Add initial support for r8a7794/silk
* Add missing "gpio-ranges" to gpio nodes: sh73a0, r8a7740 and r8a73a4 SoCs
* tag 'renesas-dt3-for-v4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: sh73a0 dtsi: Add missing "gpio-ranges" to gpio node
ARM: shmobile: r8a7740 dtsi: Add missing "gpio-ranges" to gpio node
ARM: shmobile: r8a73a4 dtsi: Add missing "gpio-ranges" to gpio node
ARM: shmobile: silk: add eMMC DT support
ARM: shmobile: r8a7794: add MMCIF DT support
ARM: shmobile: silk: add Ether DT support
ARM: shmobile: silk: initial device tree
ARM: shmobile: r8a7794: add PFC DT support
ARM: shmobile: r8a7791: Add JPU device node.
ARM: shmobile: r8a7790: Add JPU device node.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 8363d7db9319..620aeb06c775 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -535,6 +535,7 @@ dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += \ r8a7791-koelsch.dtb \ r8a7793-gose.dtb \ r8a7794-alt.dtb \ + r8a7794-silk.dtb \ sh73a0-kzm9g.dtb dtb-$(CONFIG_ARCH_SOCFPGA) += \ socfpga_arria5_socdk.dtb \ |