summaryrefslogtreecommitdiffstats
path: root/arch/arm64
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2015-11-24 16:51:59 +0100
committerThierry Reding <treding@nvidia.com>2015-11-24 16:51:59 +0100
commit1d1bac6bbcb771fc685b05d7d32cae6225bb5379 (patch)
tree66b7563976e710878e8ca674d084d58ce0509f9d /arch/arm64
parent00ccc34b3e1432bdb4e1892b1eb56898d82db353 (diff)
parent9544595262f32f0e6dd6e0170e31ca8582c9cbb0 (diff)
downloadop-kernel-dev-1d1bac6bbcb771fc685b05d7d32cae6225bb5379.zip
op-kernel-dev-1d1bac6bbcb771fc685b05d7d32cae6225bb5379.tar.gz
Merge branch 'for-4.5/soc' into for-4.5/dt
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/Kconfig.platforms12
1 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 4043c35..2c04116 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -86,18 +86,6 @@ config ARCH_TEGRA
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_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_SPRD
bool "Spreadtrum SoC platform"
help
OpenPOWER on IntegriCloud