From: Olof Johansson <olof@lixom.net>
Date: Wed, 21 May 2014 22:06:16 +0000 (-0700)
Subject: Merge tag 'tegra-for-3.16-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra... 
X-Git-Tag: firefly_0821_release~176^2~3465^2~44^2~19
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8b1b57e88e1fa427c01679eaa992bd191b1dfb06;p=firefly-linux-kernel-4.4.55.git

Merge tag 'tegra-for-3.16-dt' of git://git./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>
---

8b1b57e88e1fa427c01679eaa992bd191b1dfb06
diff --cc arch/arm/boot/dts/Makefile
index e3597c58bbc2,c1a257a89d15..ff58faa97ff0
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@@ -370,18 -367,15 +370,22 @@@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-har
  	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 \
 +	ste-hrefprev60-stuib.dtb \
 +	ste-hrefprev60-tvk.dtb \
 +	ste-hrefv60plus-stuib.dtb \
 +	ste-hrefv60plus-tvk.dtb \
 +	ste-ccu8540.dtb \
 +	ste-ccu9540.dtb
  dtb-$(CONFIG_ARCH_VERSATILE) += versatile-ab.dtb \
  	versatile-pb.dtb
 -dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb
  dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2p-ca5s.dtb \
  	vexpress-v2p-ca9.dtb \
  	vexpress-v2p-ca15-tc1.dtb \