diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-23 14:53:54 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-23 14:53:54 -0800 |
| commit | 82483ad67e965f6edd61c6c2cdb4ba295cf0af96 (patch) | |
| tree | 22708288cab53cfd07b63a2bd5b11ee8771a8b0e /arch/arm/include | |
| parent | 085dd64e537b06c7b741dac5f0ff3734d27f9a13 (diff) | |
| parent | 3568df3d31d62b4368830cc6aac868cecdefd187 (diff) | |
Merge tag 'tegra-for-3.20-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/soc
Merge "ARM: tegra: Core code changes for v3.20" from Thierry Reding:
This contains a couple of preparatory patches for 64-bit support. A new
feature is implemented in the power-management controller which allows
it to switch off the SoC if it overheats.
* tag 'tegra-for-3.20-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
soc: tegra: Add thermal reset (thermtrip) support to PMC
ARM: tegra: Add PMC thermtrip programming to Jetson TK1 device tree
of: Add descriptions of thermtrip properties to Tegra PMC bindings
soc/tegra: pmc: Add Tegra132 support
soc/tegra: fuse: Add Tegra132 support
soc/tegra: fuse: Constify tegra_fuse_info structures
soc/tegra: Add Tegra132 support
clocksource: Build Tegra timer on 32-bit ARM only
soc/tegra: pmc: restrict compilation of suspend-related support to ARM
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/include')
0 files changed, 0 insertions, 0 deletions