Commit c35675f3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 6ae52c65 971d33cb

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -1525,8 +1525,10 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
L:	linux-mediatek@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm/boot/dts/mt6*

F:	arch/arm/boot/dts/mt7*

F:	arch/arm/boot/dts/mt8*

F:	arch/arm/mach-mediatek/

F:	arch/arm64/boot/dts/mediatek/

N:	mtk

K:	mediatek
@@ -3009,6 +3011,13 @@ S: Maintained 
F:	drivers/iio/light/cm*

F:	Documentation/devicetree/bindings/i2c/trivial-admin-guide/devices.rst



CAVIUM THUNDERX2 ARM64 SOC

M:	Jayachandran C <jnair@caviumnetworks.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm64/boot/dts/cavium/thunder-99xx*

F:	Documentation/devicetree/bindings/arm/cavium-thunder2.txt



CAVIUM I2C DRIVER

M:	Jan Glauber <jglauber@cavium.com>

M:	David Daney <david.daney@cavium.com>

arch/arm64/Kconfig.platforms

+7 −0
Original line number Diff line number Diff line
@@ -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

arch/arm64/configs/defconfig

+3 −0
Original line number Diff line number Diff line
@@ -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

CRA Git | Maintained and supported by SUSTech CRA and CCSE