diff options
| author | Olof Johansson <olof@lixom.net> | 2014-05-21 15:06:16 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-05-21 15:06:16 -0700 |
| commit | 8b1b57e88e1fa427c01679eaa992bd191b1dfb06 (patch) | |
| tree | 0e11322a7b243b0ef7017083207ef157066e7f21 /arch/arm/boot/dts/Makefile | |
| parent | 072a4fd2b187a93991ca420dcdf8f9b78659e7bd (diff) | |
| parent | 446e9c63161519902a251c3670d2fbb455146475 (diff) | |
Merge tag 'tegra-for-3.16-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/dt
Merge "ARM: tegra: device tree changes for 3.16" from Stephen Warren:
The bulk of Tegra changes for 3.16 are to device trees. Highlights are:
- New board support for:
- Jetson TK1.
- SHIELD.
- Tegra Note 7.
- Colibri T30 module.
- HDMI support on Venice2.
- SD card write-protect GPIOs added to some boards.
- Numerous regulator cleanups.
* tag 'tegra-for-3.16-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
ARM: tegra: initial add of Colibri T30
ARM: tegra: add device tree for SHIELD
ARM: tegra: add SD wp-gpios to Venice2 DT
ARM: tegra: add Tegra Note 7 device tree
ARM: tegra: add SD wp-gpios to Dalmore DT
ARM: tegra: add SD wp-gpios to Jetson TK1 DT
ARM: tegra: use correct audio CODEC on Jetson TK1
ARM: tegra: dalmore - Add DSI power supply
ARM: tegra: dalmore - Add +5V HDMI supply
ARM: tegra: beaver - Add +5V HDMI supply
ARM: tegra: harmony - Add +5V HDMI supply
ARM: tegra: jetson-tk1 - Enable HDMI support
ARM: tegra: venice2 - Enable HDMI
ARM: tegra: Add Tegra124 HDMI support
ARM: tegra: fix Venice2 SD card VQMMC supply
ARM: tegra: make Venice's +3.3V_RUN regulator always on
ARM: tegra: fix Jetson TK1 SD card supply
ARM: tegra: define Jetson TK1 regulators
ARM: tegra: add Jetson TK1 device tree
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/Makefile')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index e3597c58bbc..ff58faa97ff 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -370,7 +370,11 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \ tegra30-beaver.dtb \ tegra30-cardhu-a02.dtb \ tegra30-cardhu-a04.dtb \ + tegra30-colibri-eval-v3.dtb \ tegra114-dalmore.dtb \ + tegra114-roth.dtb \ + tegra114-tn7.dtb \ + tegra124-jetson-tk1.dtb \ tegra124-venice2.dtb dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \ |