diff options
| author | Olof Johansson <olof@lixom.net> | 2015-12-22 15:02:08 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-12-22 15:02:08 -0800 |
| commit | 250481d3de1b9ccf8e82d044bde6216e4decc271 (patch) | |
| tree | 9f7c611459f2849ef7bc1b67b6177a2c02ab3855 /arch/arm/boot/dts/Makefile | |
| parent | 84829814d65f24082483791b59c1dc5fa2daf75d (diff) | |
| parent | ca6349a8c51f2e3d6f2acdb36431e7d7328261f7 (diff) | |
| download | linux-stable-250481d3de1b9ccf8e82d044bde6216e4decc271.tar.gz linux-stable-250481d3de1b9ccf8e82d044bde6216e4decc271.tar.bz2 linux-stable-250481d3de1b9ccf8e82d044bde6216e4decc271.zip | |
Merge tag 'at91-4.5-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt
Second batch of DT changes for 4.5:
- addition of sound nodes for sama5d2 and the xplained
- addition of a new patform by Landis+Gyr: VInCo
* tag 'at91-4.5-dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
ARM: at91/dt: sama5d2 Xplained: add pdmic node
ARM: at91/dt: sama5d2: add pdmic node
ARM: at91/dt: Add Support for the L+G VInCo platform
Signed-off-by: Olof Johansson <olof@lixom.net>
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 0d3fb5057c12..d19dc5971019 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -50,7 +50,8 @@ dtb-$(CONFIG_SOC_SAM_V7) += \ sama5d36ek.dtb \ at91-sama5d4_ma5d4evk.dtb \ at91-sama5d4_xplained.dtb \ - at91-sama5d4ek.dtb + at91-sama5d4ek.dtb \ + at91-vinco.dtb dtb-$(CONFIG_ARCH_ATLAS6) += \ atlas6-evb.dtb dtb-$(CONFIG_ARCH_ATLAS7) += \ |