diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-10-17 16:02:36 -0700 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-10-17 16:02:51 -0700 |
| commit | ec902c620b31de13fa5afb2803af175793a7273d (patch) | |
| tree | 007c9eaec708898154167fe39e8cc1be2451d772 /arch/arm/boot/dts/Makefile | |
| parent | 048e5a786afd9c76f4300f263ec264319407aefd (diff) | |
| parent | c71d39090eae67c324a870f3c0d26347db504705 (diff) | |
| download | talos-op-linux-ec902c620b31de13fa5afb2803af175793a7273d.tar.gz talos-op-linux-ec902c620b31de13fa5afb2803af175793a7273d.zip | |
Merge branch 'tegra/dt' into next/dt
From Stephen Warren:
* tegra/dt:
ARM: tegra: Use symbolic names for gr3d clocks
ARM: tegra: Mark Tegra30 display controller compatible with Tegra20
ARM: tegra: add GPIO controller to tegra124.dtsi
ARM: tegra: enable LP1 suspend mode for Venice2
ARM: tegra: enable Tegra RTC as default for Tegra124
ARM: tegra: add Venice2 board support
ARM: tegra: Add initial device tree for Tegra124
ARM: tegra: add vcc supply for nct1008 to Cardhu
ARM: tegra: add DT entry for nct1008 to Dalmore
ARM: tegra: use dt-binding header for key code
ARM: tegra: add palmas pincontrol to Dalmore device tree
Signed-off-by: Kevin Hilman <khilman@linaro.org>
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 56c7d82e5b8d..e1f8d9840a48 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -261,7 +261,8 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ tegra30-beaver.dtb \ tegra30-cardhu-a02.dtb \ tegra30-cardhu-a04.dtb \ - tegra114-dalmore.dtb + tegra114-dalmore.dtb \ + tegra124-venice2.dtb dtb-$(CONFIG_ARCH_VERSATILE) += versatile-ab.dtb \ versatile-pb.dtb dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb |
