diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-23 15:35:57 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-23 15:35:57 -0800 |
| commit | c35675f351b9f13062cfd0fac762615e703af2af (patch) | |
| tree | a7cfee196da26984beb2769fddb47b6b184a5dab /arch | |
| parent | 6ae52c65e01991426e87bb0fb8a2ac9e032db7b1 (diff) | |
| parent | 971d33cb422b3109fe3df034440debc3f4fe8423 (diff) | |
| download | linux-c35675f351b9f13062cfd0fac762615e703af2af.tar.bz2 | |
Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC 64-bit updates from Arnd Bergmann:
"Changes to platform code for 64-bit ARM platforms, only trivial stuff
this time, a few defconfig changes to enable drivers, and a new entry
for the Cavium ThunderX2 platform"
* tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
MAINTAINERS: Add Cavium ThunderX2 entry
arm64: add ARCH_THUNDER2 to defconfig
arm64: add THUNDER2 processor family
MAINTAINERS: Extend ARM/Mediatek SoC support section
arm64: defconfig: enable CONFIG_MMC_SDHCI_CADENCE
arm64: defconfig: enable XORv2 for Marvell Armada 7K/8K
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/Kconfig.platforms | 7 | ||||
| -rw-r--r-- | arch/arm64/configs/defconfig | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 715ef1256838..129cc5ae4091 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -190,6 +190,13 @@ config ARCH_THUNDER help This enables support for Cavium's Thunder Family of SoCs. +config ARCH_THUNDER2 + bool "Cavium ThunderX2 Server Processors" + select GPIOLIB + help + This enables support for Cavium's ThunderX2 CN99XX family of + server processors. + config ARCH_UNIPHIER bool "Socionext UniPhier SoC Family" select ARCH_HAS_RESET_CONTROLLER diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 6fc6f5a2a6e5..8752f578417c 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -53,6 +53,7 @@ CONFIG_ARCH_STRATIX10=y CONFIG_ARCH_TEGRA=y CONFIG_ARCH_SPRD=y CONFIG_ARCH_THUNDER=y +CONFIG_ARCH_THUNDER2=y CONFIG_ARCH_UNIPHIER=y CONFIG_ARCH_VEXPRESS=y CONFIG_ARCH_VULCAN=y @@ -382,6 +383,7 @@ CONFIG_MMC_SDHCI_ACPI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_OF_ARASAN=y CONFIG_MMC_SDHCI_OF_ESDHC=y +CONFIG_MMC_SDHCI_CADENCE=y CONFIG_MMC_SDHCI_TEGRA=y CONFIG_MMC_SDHCI_MSM=y CONFIG_MMC_SPI=y @@ -410,6 +412,7 @@ CONFIG_RTC_DRV_TEGRA=y CONFIG_RTC_DRV_XGENE=y CONFIG_RTC_DRV_S3C=y CONFIG_DMADEVICES=y +CONFIG_MV_XOR_V2=y CONFIG_PL330_DMA=y CONFIG_DMA_BCM2835=m CONFIG_TEGRA20_APB_DMA=y |