From 299d2f0238ec75bd13cc8c69a4cd6dbb9e7837be Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 22 Dec 2016 16:24:18 +0100 Subject: [PATCH 1/6] arm64: defconfig: enable XORv2 for Marvell Armada 7K/8K This commit enables the XORv2 DMA driver, which is used on the ARM64 Marvell Armada 7K and 8K platforms. Signed-off-by: Thomas Petazzoni Signed-off-by: Gregory CLEMENT --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 869dded0f09f..eb72a4ace69f 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -409,6 +409,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 From a3e3fa0bfaedc057b484b0a5a043e1657eabafa2 Mon Sep 17 00:00:00 2001 From: Masahiro Yamada Date: Mon, 26 Dec 2016 11:14:53 +0900 Subject: [PATCH 2/6] arm64: defconfig: enable CONFIG_MMC_SDHCI_CADENCE Enable the Cadence SD/SDIO/eMMC controller. This is used on Socionext UniPhier SoC family. Signed-off-by: Masahiro Yamada Signed-off-by: Olof Johansson --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index aa9c04f415c2..fbe250d38623 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -382,6 +382,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 From 44e4e5fb57fbcf80877906b85e4b03920e44f167 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Thu, 26 Jan 2017 15:20:28 +0100 Subject: [PATCH 3/6] MAINTAINERS: Extend ARM/Mediatek SoC support section MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Catch mt7623 and arm64 dts subdirectory. Signed-off-by: Andreas Färber Signed-off-by: Matthias Brugger Signed-off-by: Olof Johansson --- MAINTAINERS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index 5f0420a0da5b..d526a7ae43cf 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1522,8 +1522,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 From 03b6fd5db4a71d9511552f9d95de9b61f47b503e Mon Sep 17 00:00:00 2001 From: Jayachandran C Date: Sun, 5 Feb 2017 00:57:02 +0000 Subject: [PATCH 4/6] arm64: add THUNDER2 processor family Add support for ThunderX2 CN99XX arm64 server processors. Introduce a new arm64 platform config option ARCH_THUNDER2 for these processors. Signed-off-by: Jayachandran C Signed-off-by: Arnd Bergmann --- arch/arm64/Kconfig.platforms | 7 +++++++ 1 file changed, 7 insertions(+) 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 From e40a05dc3f5367956d6105e660f47c3f03c00380 Mon Sep 17 00:00:00 2001 From: Jayachandran C Date: Sun, 5 Feb 2017 00:57:06 +0000 Subject: [PATCH 5/6] arm64: add ARCH_THUNDER2 to defconfig This will allow the default kernel build to boot on Cavium ThunderX2 CN99XX processors. Signed-off-by: Jayachandran C Signed-off-by: Arnd Bergmann --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index fbe250d38623..4c1a3455cb7b 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 From 971d33cb422b3109fe3df034440debc3f4fe8423 Mon Sep 17 00:00:00 2001 From: Jayachandran C Date: Sun, 5 Feb 2017 00:57:03 +0000 Subject: [PATCH 6/6] MAINTAINERS: Add Cavium ThunderX2 entry Add maintainer information for Cavium ThunderX2 ARM64 processor family. Signed-off-by: Jayachandran C Signed-off-by: Arnd Bergmann --- MAINTAINERS | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/MAINTAINERS b/MAINTAINERS index d526a7ae43cf..bdf874665cf6 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2980,6 +2980,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 +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 M: David Daney