From 58e7696e0e3c085804fb6754a7dadf7267d0fa77 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Thu, 26 Jan 2017 09:52:26 +0100 Subject: [PATCH 01/14] arm64: defconfig: Enable SH Mobile I2C controller Enable SH Mobile I2C controller for use on R-Car Gen3 SoCs. Signed-off-by: Simon Horman Acked-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 7c48028ec64a..95aa53112da5 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -251,6 +251,7 @@ CONFIG_I2C_MESON=y CONFIG_I2C_MV64XXX=y CONFIG_I2C_QUP=y CONFIG_I2C_RK3X=y +CONFIG_I2C_SH_MOBILE=y CONFIG_I2C_TEGRA=y CONFIG_I2C_UNIPHIER_F=y CONFIG_I2C_RCAR=y From 95fbe8b08b2d420e4f5a77701f165d6b23827862 Mon Sep 17 00:00:00 2001 From: Martin Blumenstingl Date: Sun, 19 Feb 2017 23:23:25 +0100 Subject: [PATCH 02/14] ARM64: defconfig: enable the leds-pwm driver and default-on trigger This enables the leds-pwm driver to support LEDs which are PWM-powered (and thus dimmable). Additionally we have to enable the "default-on" trigger - this was not required before because the gpio-leds driver has a separate "default-state" property which can be used to enable the LED by default. Signed-off-by: Martin Blumenstingl Signed-off-by: Kevin Hilman --- arch/arm64/configs/defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 7c48028ec64a..c021aefab501 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -401,8 +401,10 @@ CONFIG_MMC_SUNXI=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=y +CONFIG_LEDS_PWM=y CONFIG_LEDS_SYSCON=y CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_CPU=y CONFIG_RTC_CLASS=y From d7ec74f412f5e5c6b964a4b635b1e3f1d72a7b34 Mon Sep 17 00:00:00 2001 From: Gregory CLEMENT Date: Mon, 20 Feb 2017 18:27:17 +0100 Subject: [PATCH 03/14] arm64: defconfig: enable MVNETA Now that the Armada 37xx SoCs support the mvneta driver, enable it by default. It is especially useful when booting on an NFS root. 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 7c48028ec64a..0ebe737d3778 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -185,6 +185,7 @@ CONFIG_HNS_ENET=y CONFIG_E1000E=y CONFIG_IGB=y CONFIG_IGBVF=y +CONFIG_MVNETA=y CONFIG_SKY2=y CONFIG_RAVB=y CONFIG_SMC91X=y From efbd24646abc044f70afc53bd331c7b520f499fd Mon Sep 17 00:00:00 2001 From: Gregory CLEMENT Date: Wed, 22 Feb 2017 18:31:46 +0100 Subject: [PATCH 04/14] arm64: defconfig: enable I2C_PXA Now that the Armada 37xx SoCs support the i2c pxa driver, enable it by default. 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 0ebe737d3778..19ce256f994e 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -250,6 +250,7 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=y CONFIG_I2C_IMX=y CONFIG_I2C_MESON=y CONFIG_I2C_MV64XXX=y +CONFIG_I2C_PXA=y CONFIG_I2C_QUP=y CONFIG_I2C_RK3X=y CONFIG_I2C_TEGRA=y From 3c9d36192802d60fca73c85c7096221371c36be7 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Wed, 8 Mar 2017 10:19:09 +0100 Subject: [PATCH 05/14] arm64: set CONFIG_MMC_BCM2835=y in defconfig We need to enable this controller so that we can switch the SD card's pinmux over to it by default, which will improve storage performance. Read access (dd with 64k blocks on rpi2): CONFIG_MMC_SDHCI_IPROC: 11-12 MB/s CONFIG_MMC_BCM2835: 19-20 MB/s Differences on write access are pretty much in the noise. Signed-off-by: Gerd Hoffmann Reviewed-by: Eric Anholt --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 7c48028ec64a..519a55c825d5 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -398,6 +398,7 @@ CONFIG_MMC_DW_EXYNOS=y CONFIG_MMC_DW_K3=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_SUNXI=y +CONFIG_MMC_BCM2835=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=y From 28ebb7700c650d59d321fd71db119feb7f8dda0a Mon Sep 17 00:00:00 2001 From: Icenowy Zheng Date: Thu, 2 Mar 2017 02:01:08 +0800 Subject: [PATCH 06/14] arm64: only select PINCTRL for Allwinner platforms As the pinctrl driver selecting is refactored in Kconfig file of pinctrl-sunxi, now we can select only PINCTRL for Allwinner platform, and the default value of several pinctrl drivers useful on ARM64 Allwinner SoCs will become Y. This is the situation of 32-bit ARM ARCH_SUNXI option. Drop the select of per-SoC pinctrl choices, but keep selecting PINCTRL. Signed-off-by: Icenowy Zheng Acked-by: Linus Walleij Signed-off-by: Maxime Ripard --- arch/arm64/Kconfig.platforms | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 129cc5ae4091..ff867b8d7810 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -4,7 +4,6 @@ config ARCH_SUNXI bool "Allwinner sunxi 64-bit SoC Family" select GENERIC_IRQ_CHIP select PINCTRL - select PINCTRL_SUN50I_A64 help This enables support for Allwinner sunxi based SoCs like the A64. From caab3df98247b4f0991bf67db2b75d06f97aefdb Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Tue, 14 Mar 2017 19:10:28 +0200 Subject: [PATCH 07/14] arm64: exynos: Enable Exynos PMU and PM domains drivers Enable EXYNOS_PM_DOMAINS because recently Exynos5433 got support for Power Management domains. The Exynos5433 pinctrl driver requires EXYNOS_PMU to get the syscon-regmap for PMU address space. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Bartlomiej Zolnierkiewicz Reviewed-by: Alim Akhtar Reviewed-by: Chanwoo Choi --- arch/arm64/Kconfig.platforms | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 129cc5ae4091..9cdaecd3e583 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -54,6 +54,8 @@ config ARCH_BRCMSTB config ARCH_EXYNOS bool "ARMv8 based Samsung Exynos SoC family" select COMMON_CLK_SAMSUNG + select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS + select EXYNOS_PMU select HAVE_S3C2410_WATCHDOG if WATCHDOG select HAVE_S3C_RTC if RTC_CLASS select PINCTRL From 0edf17984f251e633465e028a0115d57b1b7eb88 Mon Sep 17 00:00:00 2001 From: Krzysztof Kozlowski Date: Tue, 14 Mar 2017 19:10:26 +0200 Subject: [PATCH 08/14] arm64: defconfig: Enable video, DRM and LPASS drivers for Exynos5433 and Exynos7 Enable drivers specific to Exynos5433 and Exynos7: 1. MFD Low Power Audio SubSystem (LPASS), 2. DRM drivers (DECON display, outputs), 3. Drivers for video-related sub-blocks (JPEG, Multi Format Codec, GScaler). Signed-off-by: Krzysztof Kozlowski Reviewed-by: Chanwoo Choi --- arch/arm64/configs/defconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 7c48028ec64a..b43be0d6ef7d 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -299,6 +299,7 @@ CONFIG_RENESAS_WDT=y CONFIG_S3C2410_WATCHDOG=y CONFIG_MESON_GXBB_WATCHDOG=m CONFIG_MESON_WATCHDOG=m +CONFIG_MFD_EXYNOS_LPASS=m CONFIG_MFD_MAX77620=y CONFIG_MFD_RK808=y CONFIG_MFD_SPMI_PMIC=y @@ -324,10 +325,20 @@ CONFIG_MEDIA_CONTROLLER=y CONFIG_VIDEO_V4L2_SUBDEV_API=y # CONFIG_DVB_NET is not set CONFIG_V4L_MEM2MEM_DRIVERS=y +CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m +CONFIG_VIDEO_SAMSUNG_S5P_MFC=m +CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m CONFIG_VIDEO_RENESAS_FCP=m CONFIG_VIDEO_RENESAS_VSP1=m CONFIG_DRM=m CONFIG_DRM_NOUVEAU=m +CONFIG_DRM_EXYNOS=m +CONFIG_DRM_EXYNOS5433_DECON=y +CONFIG_DRM_EXYNOS7_DECON=y +CONFIG_DRM_EXYNOS_DSI=y +# CONFIG_DRM_EXYNOS_DP is not set +CONFIG_DRM_EXYNOS_HDMI=y +CONFIG_DRM_EXYNOS_MIC=y CONFIG_DRM_RCAR_DU=m CONFIG_DRM_RCAR_HDMI=y CONFIG_DRM_RCAR_LVDS=y From 66e56302842e9971426bd7e504c4db4f88cbb037 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Thu, 16 Mar 2017 16:16:28 +0100 Subject: [PATCH 09/14] arm64: defconfig: enable MVPP2 The MVPP2 network driver is used for the ARM64 Marvell Armada 7K and 8K platforms, so enable it in the arm64 defconfig. 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 19ce256f994e..8e27221afded 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -185,6 +185,7 @@ CONFIG_HNS_ENET=y CONFIG_E1000E=y CONFIG_IGB=y CONFIG_IGBVF=y +CONFIG_MVPP2=y CONFIG_MVNETA=y CONFIG_SKY2=y CONFIG_RAVB=y From 565fbac18efef447a6a97325664c77ddcbe82936 Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Fri, 24 Mar 2017 00:20:02 +0000 Subject: [PATCH 10/14] arm64: defconfig: add Allwinner USB PHY The arm64 defconfig covers the Allwinner A64 SoC boards quite well, but USB support is not enabled. Add the PHY config symbol to allow defconfig kernels to use USB. Signed-off-by: Andre Przywara Signed-off-by: Maxime Ripard --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 7c48028ec64a..6179ba6a6561 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -469,6 +469,7 @@ CONFIG_PHY_RCAR_GEN3_USB2=y CONFIG_PHY_HI6220_USB=y CONFIG_PHY_ROCKCHIP_INNO_USB2=y CONFIG_PHY_ROCKCHIP_EMMC=y +CONFIG_PHY_SUN4I_USB=y CONFIG_PHY_XGENE=y CONFIG_PHY_TEGRA_XUSB=y CONFIG_ARM_SCPI_PROTOCOL=y From 0563ff3702d8d2c752bbc169742e15f6f8fc8228 Mon Sep 17 00:00:00 2001 From: Jayachandran C Date: Wed, 15 Mar 2017 20:11:02 +0000 Subject: [PATCH 11/14] MAINTAINERS: Broadcom Vulcan is now Cavium ThunderX2 Now that the dts files are moved to the new location, we can remove the Broadcom Vulcan entry in the MAINTAINERS. Also fix up the Cavium ThunderX2 entry with the correct pattern for the new names. Signed-off-by: Jayachandran C Signed-off-by: Arnd Bergmann --- MAINTAINERS | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index c776906f67a9..81a1f2b9a311 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2838,13 +2838,6 @@ L: netdev@vger.kernel.org S: Supported F: drivers/net/ethernet/broadcom/bcmsysport.* -BROADCOM VULCAN ARM64 SOC -M: Jayachandran C. -M: bcm-kernel-feedback-list@broadcom.com -L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) -S: Maintained -F: arch/arm64/boot/dts/broadcom/vulcan* - BROADCOM NETXTREME-E ROCE DRIVER M: Selvin Xavier M: Devesh Sharma @@ -3030,7 +3023,7 @@ 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: arch/arm64/boot/dts/cavium/thunder2-99xx* F: Documentation/devicetree/bindings/arm/cavium-thunder2.txt CAVIUM I2C DRIVER From a1485f5a91b975f41c5689a9c72d626108779bf7 Mon Sep 17 00:00:00 2001 From: Gregory CLEMENT Date: Thu, 30 Mar 2017 17:23:05 +0200 Subject: [PATCH 12/14] arm64: configs: enable SDHCI driver for Xenon This patch enables the driver for the SDHCI controller found on the Marvell Armada 3700 and 7K/8K ARM64 SoCs. 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 8e27221afded..93b0aab959c0 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -401,6 +401,7 @@ CONFIG_MMC_DW_EXYNOS=y CONFIG_MMC_DW_K3=y CONFIG_MMC_DW_ROCKCHIP=y CONFIG_MMC_SUNXI=y +CONFIG_MMC_SDHCI_XENON=y CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y CONFIG_LEDS_GPIO=y From 10ebb57ffcbf062ff224585fefa274e703fc363d Mon Sep 17 00:00:00 2001 From: Antoine Tenart Date: Wed, 29 Mar 2017 14:44:32 +0200 Subject: [PATCH 13/14] arm64: defconfig: enable the Safexcel crypto engine as a module The Safexcel EIP197 cryptographic engine is used on some Marvell SoCs, such as Armada 7040 and Armada 8040. Enable this driver as a module in the ARM64 defconfig. Signed-off-by: Antoine Tenart 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 93b0aab959c0..77eb1e448dc8 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -522,6 +522,7 @@ CONFIG_MEMTEST=y CONFIG_SECURITY=y CONFIG_CRYPTO_ECHAINIV=y CONFIG_CRYPTO_ANSI_CPRNG=y +CONFIG_CRYPTO_DEV_SAFEXCEL=m CONFIG_ARM64_CRYPTO=y CONFIG_CRYPTO_SHA1_ARM64_CE=y CONFIG_CRYPTO_SHA2_ARM64_CE=y From 900a9020af7a023f9b64c919fddf8a7486108962 Mon Sep 17 00:00:00 2001 From: Arnd Bergmann Date: Tue, 18 Apr 2017 15:55:51 +0200 Subject: [PATCH 14/14] arm64: sunxi: always enable reset controller The sunxi clk driver causes a link error when the reset controller subsystem is disabled: drivers/clk/built-in.o: In function `sun4i_ve_clk_setup': :(.init.text+0xd040): undefined reference to `reset_controller_register' drivers/clk/built-in.o: In function `sun4i_a10_display_init': :(.init.text+0xe5e0): undefined reference to `reset_controller_register' drivers/clk/built-in.o: In function `sunxi_usb_clk_setup': :(.init.text+0x10074): undefined reference to `reset_controller_register' We already force it to be enabled on arm32 and some other arm64 platforms, but not on arm64/sunxi. This adds the respective Kconfig statements to also select it here. Signed-off-by: Arnd Bergmann Acked-by: Maxime Ripard --- arch/arm64/Kconfig.platforms | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index b3a1fb8df925..4afcffcb46cb 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -2,8 +2,10 @@ menu "Platform selection" config ARCH_SUNXI bool "Allwinner sunxi 64-bit SoC Family" + select ARCH_HAS_RESET_CONTROLLER select GENERIC_IRQ_CHIP select PINCTRL + select RESET_CONTROLLER help This enables support for Allwinner sunxi based SoCs like the A64.