Merge tag 'tegra-for-3.20-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/arm64

Merge "arm64: Add initial Tegra support" from Thierry Reding:

This adds support for the Tegra132 SoC, which is essentially a Tegra124
with a dual Denver CPU complex instead of the quad-Cortex-A15. There is
not much here, only the Kconfig entries, but it will allow us to more
easily get subsequent patches in (many of which have already been sent
for review).

* tag 'tegra-for-3.20-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  arm64: Add Tegra132 support
  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>

1 files changed, 28 insertions, 0 deletions

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 15e8e7469ffd..84850c6cab20 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -170,6 +170,34 @@ config ARCH_SEATTLE
         help
           This enables support for AMD Seattle SOC Family
 
+config ARCH_TEGRA
+        bool "NVIDIA Tegra SoC Family"
+        select ARCH_HAS_RESET_CONTROLLER
+        select ARCH_REQUIRE_GPIOLIB
+        select CLKDEV_LOOKUP
+        select CLKSRC_MMIO
+        select CLKSRC_OF
+        select GENERIC_CLOCKEVENTS
+        select HAVE_CLK
+        select HAVE_SMP
+        select PINCTRL
+        select RESET_CONTROLLER
+        help
+          This enables support for the NVIDIA Tegra SoC family.
+
+config ARCH_TEGRA_132_SOC
+        bool "NVIDIA Tegra132 SoC"
+        depends on ARCH_TEGRA
+        select PINCTRL_TEGRA124
+        select USB_ARCH_HAS_EHCI if USB_SUPPORT
+        select USB_ULPI if USB_PHY
+        select USB_ULPI_VIEWPORT if USB_PHY
+        help
+          Enable support for NVIDIA Tegra132 SoC, based on the Denver
+          ARMv8 CPU.  The Tegra132 SoC is similar to the Tegra124 SoC,
+          but contains an NVIDIA Denver CPU complex in place of
+          Tegra124's "4+1" Cortex-A15 CPU complex.
+
 config ARCH_THUNDER
         bool "Cavium Inc. Thunder SoC Family"
         help