diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-07-14 13:39:27 (GMT) |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-07-14 13:39:27 (GMT) |
| commit | a185c8639fe5888fadcba78b430a412e4324198f (patch) | |
| tree | 5b803cba2a19cb84772142e8f01e78f092c2cd14 /arch/arm/boot/dts/Makefile | |
| parent | 2869576d0f531757f0dc6897f5f6578b3ad7c6c1 (diff) | |
| parent | 85afd20e4bccc39f4eae01cb50e435ca45aef912 (diff) | |
| download | linux-a185c8639fe5888fadcba78b430a412e4324198f.tar.xz | |
Merge tag 'tegra-for-4.8-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt
Merge "ARM: tegra: Device tree changes for v4.8-rc1" from Thierry Reding:
Some cleanups to existing device tree sources and add Toradex Apalis TK1
support.
* tag 'tegra-for-4.8-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
ARM: tegra: Initial support for Apalis TK1
ARM: tegra: Remove commas from unit addresses on Tegra124
ARM: tegra: Import latest Jetson TK1 spreadsheet
ARM: tegra: Add spaces around = in properties
ARM: tegra: Fix a couple of DTC warnings
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 3cc5f08..b25cc6a 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -816,6 +816,7 @@ dtb-$(CONFIG_ARCH_TEGRA_114_SOC) += \ tegra114-roth.dtb \ tegra114-tn7.dtb dtb-$(CONFIG_ARCH_TEGRA_124_SOC) += \ + tegra124-apalis-eval.dtb \ tegra124-jetson-tk1.dtb \ tegra124-nyan-big.dtb \ tegra124-nyan-blaze.dtb \ |