diff options
author | Olof Johansson <olof@lixom.net> | 2013-12-26 23:02:19 +0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-12-26 23:02:25 +0400 |
commit | d578759ed8a6babd9c9aecd4211b3aa5a8e4a27b (patch) | |
tree | c56d17ab42d6e919be1cbbeb151ce31a13c7cc83 /arch/arm/mach-tegra/Kconfig | |
parent | 92fa35e93074d025a9fd6b1b65cd00b83beef268 (diff) | |
parent | 7e1161f8af73f0077aa80c1af671d272ed14f37a (diff) | |
download | linux-d578759ed8a6babd9c9aecd4211b3aa5a8e4a27b.tar.xz |
Merge tag 'tegra-for-3.14-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux into next/soc
From Stephen Warren:
ARM: tegra: SoC-specific core code changes
This branch contains various miscellaneous changes to code in the
mach-tegra/ directory. It is baased on v3.13-rc1, and shouldn't conflict
with anything else.
* tag 'tegra-for-3.14-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
ARM: tegra: select PINCTRL_TEGRA124 for Tegra124 SoC
ARM: tegra: use section-sized static mappings for LPAE too
ARM: tegra: don't hard-code DEBUG_LL baud rate
ARM: tegra: fix DEBUG_LL combined with LPAE
ARM: tegra: switch FUSE clock on before usage
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-tegra/Kconfig')
-rw-r--r-- | arch/arm/mach-tegra/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig index 15c09294effa..d1a12a496525 100644 --- a/arch/arm/mach-tegra/Kconfig +++ b/arch/arm/mach-tegra/Kconfig @@ -65,6 +65,7 @@ config ARCH_TEGRA_124_SOC bool "Enable support for Tegra124 family" select ARM_L1_CACHE_SHIFT_6 select HAVE_ARM_ARCH_TIMER + select PINCTRL_TEGRA124 help Support for NVIDIA Tegra T124 processor family, based on the ARM CortexA15MP CPU |