aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds2017-05-09 12:04:17 -0500
committerLinus Torvalds2017-05-09 12:04:17 -0500
commit0ff4c01b279a590a2826ade9321ad8c7ca5a1b6c (patch)
treed2d280cbfa92f087921ba2eae30944765b806b14
parent0160e00ae8e987be8822745fb166aa76451c9bcc (diff)
parent900a9020af7a023f9b64c919fddf8a7486108962 (diff)
downloadkernel-0ff4c01b279a590a2826ade9321ad8c7ca5a1b6c.tar.gz
kernel-0ff4c01b279a590a2826ade9321ad8c7ca5a1b6c.tar.xz
kernel-0ff4c01b279a590a2826ade9321ad8c7ca5a1b6c.zip
Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC 64-bit changes from Olof Johansson: "Changes to platform code for 64-bit ARM platforms. Most of these are small changes to the one defconfig we use on arm64 (no per-platform configs there), to enable new drivers. There are also a few other changes. Broadcom sold off their 'Vulcan' design to Cavium, where it is now called ThunderX2. While we normally don't rename stuff based on marketing's whims, it seemed appropriate to bring in renames on a few things such as MAINTAINERS, etc" * tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: arm64: sunxi: always enable reset controller arm64: defconfig: enable the Safexcel crypto engine as a module arm64: configs: enable SDHCI driver for Xenon MAINTAINERS: Broadcom Vulcan is now Cavium ThunderX2 arm64: defconfig: add Allwinner USB PHY arm64: defconfig: enable MVPP2 arm64: defconfig: Enable video, DRM and LPASS drivers for Exynos5433 and Exynos7 arm64: exynos: Enable Exynos PMU and PM domains drivers arm64: only select PINCTRL for Allwinner platforms arm64: set CONFIG_MMC_BCM2835=y in defconfig arm64: defconfig: enable I2C_PXA arm64: defconfig: enable MVNETA ARM64: defconfig: enable the leds-pwm driver and default-on trigger arm64: defconfig: Enable SH Mobile I2C controller
-rw-r--r--MAINTAINERS9
-rw-r--r--arch/arm64/Kconfig.platforms5
-rw-r--r--arch/arm64/configs/defconfig21
3 files changed, 26 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 41590d3a665a..f42daf74f541 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2867,13 +2867,6 @@ L: netdev@vger.kernel.org
2867S: Supported 2867S: Supported
2868F: drivers/net/ethernet/broadcom/bcmsysport.* 2868F: drivers/net/ethernet/broadcom/bcmsysport.*
2869 2869
2870BROADCOM VULCAN ARM64 SOC
2871M: Jayachandran C. <c.jayachandran@gmail.com>
2872M: bcm-kernel-feedback-list@broadcom.com
2873L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
2874S: Maintained
2875F: arch/arm64/boot/dts/broadcom/vulcan*
2876
2877BROADCOM NETXTREME-E ROCE DRIVER 2870BROADCOM NETXTREME-E ROCE DRIVER
2878M: Selvin Xavier <selvin.xavier@broadcom.com> 2871M: Selvin Xavier <selvin.xavier@broadcom.com>
2879M: Devesh Sharma <devesh.sharma@broadcom.com> 2872M: Devesh Sharma <devesh.sharma@broadcom.com>
@@ -3067,7 +3060,7 @@ CAVIUM THUNDERX2 ARM64 SOC
3067M: Jayachandran C <jnair@caviumnetworks.com> 3060M: Jayachandran C <jnair@caviumnetworks.com>
3068L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 3061L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
3069S: Maintained 3062S: Maintained
3070F: arch/arm64/boot/dts/cavium/thunder-99xx* 3063F: arch/arm64/boot/dts/cavium/thunder2-99xx*
3071F: Documentation/devicetree/bindings/arm/cavium-thunder2.txt 3064F: Documentation/devicetree/bindings/arm/cavium-thunder2.txt
3072 3065
3073CAVIUM I2C DRIVER 3066CAVIUM I2C DRIVER
diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 129cc5ae4091..4afcffcb46cb 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -2,9 +2,10 @@ menu "Platform selection"
2 2
3config ARCH_SUNXI 3config ARCH_SUNXI
4 bool "Allwinner sunxi 64-bit SoC Family" 4 bool "Allwinner sunxi 64-bit SoC Family"
5 select ARCH_HAS_RESET_CONTROLLER
5 select GENERIC_IRQ_CHIP 6 select GENERIC_IRQ_CHIP
6 select PINCTRL 7 select PINCTRL
7 select PINCTRL_SUN50I_A64 8 select RESET_CONTROLLER
8 help 9 help
9 This enables support for Allwinner sunxi based SoCs like the A64. 10 This enables support for Allwinner sunxi based SoCs like the A64.
10 11
@@ -54,6 +55,8 @@ config ARCH_BRCMSTB
54config ARCH_EXYNOS 55config ARCH_EXYNOS
55 bool "ARMv8 based Samsung Exynos SoC family" 56 bool "ARMv8 based Samsung Exynos SoC family"
56 select COMMON_CLK_SAMSUNG 57 select COMMON_CLK_SAMSUNG
58 select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS
59 select EXYNOS_PMU
57 select HAVE_S3C2410_WATCHDOG if WATCHDOG 60 select HAVE_S3C2410_WATCHDOG if WATCHDOG
58 select HAVE_S3C_RTC if RTC_CLASS 61 select HAVE_S3C_RTC if RTC_CLASS
59 select PINCTRL 62 select PINCTRL
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 927ee18bbdf2..ce072859e3b2 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -186,6 +186,8 @@ CONFIG_HNS_ENET=y
186CONFIG_E1000E=y 186CONFIG_E1000E=y
187CONFIG_IGB=y 187CONFIG_IGB=y
188CONFIG_IGBVF=y 188CONFIG_IGBVF=y
189CONFIG_MVPP2=y
190CONFIG_MVNETA=y
189CONFIG_SKY2=y 191CONFIG_SKY2=y
190CONFIG_RAVB=y 192CONFIG_RAVB=y
191CONFIG_SMC91X=y 193CONFIG_SMC91X=y
@@ -250,8 +252,10 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=y
250CONFIG_I2C_IMX=y 252CONFIG_I2C_IMX=y
251CONFIG_I2C_MESON=y 253CONFIG_I2C_MESON=y
252CONFIG_I2C_MV64XXX=y 254CONFIG_I2C_MV64XXX=y
255CONFIG_I2C_PXA=y
253CONFIG_I2C_QUP=y 256CONFIG_I2C_QUP=y
254CONFIG_I2C_RK3X=y 257CONFIG_I2C_RK3X=y
258CONFIG_I2C_SH_MOBILE=y
255CONFIG_I2C_TEGRA=y 259CONFIG_I2C_TEGRA=y
256CONFIG_I2C_UNIPHIER_F=y 260CONFIG_I2C_UNIPHIER_F=y
257CONFIG_I2C_RCAR=y 261CONFIG_I2C_RCAR=y
@@ -300,6 +304,7 @@ CONFIG_RENESAS_WDT=y
300CONFIG_S3C2410_WATCHDOG=y 304CONFIG_S3C2410_WATCHDOG=y
301CONFIG_MESON_GXBB_WATCHDOG=m 305CONFIG_MESON_GXBB_WATCHDOG=m
302CONFIG_MESON_WATCHDOG=m 306CONFIG_MESON_WATCHDOG=m
307CONFIG_MFD_EXYNOS_LPASS=m
303CONFIG_MFD_MAX77620=y 308CONFIG_MFD_MAX77620=y
304CONFIG_MFD_RK808=y 309CONFIG_MFD_RK808=y
305CONFIG_MFD_SPMI_PMIC=y 310CONFIG_MFD_SPMI_PMIC=y
@@ -325,10 +330,20 @@ CONFIG_MEDIA_CONTROLLER=y
325CONFIG_VIDEO_V4L2_SUBDEV_API=y 330CONFIG_VIDEO_V4L2_SUBDEV_API=y
326# CONFIG_DVB_NET is not set 331# CONFIG_DVB_NET is not set
327CONFIG_V4L_MEM2MEM_DRIVERS=y 332CONFIG_V4L_MEM2MEM_DRIVERS=y
333CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
334CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
335CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
328CONFIG_VIDEO_RENESAS_FCP=m 336CONFIG_VIDEO_RENESAS_FCP=m
329CONFIG_VIDEO_RENESAS_VSP1=m 337CONFIG_VIDEO_RENESAS_VSP1=m
330CONFIG_DRM=m 338CONFIG_DRM=m
331CONFIG_DRM_NOUVEAU=m 339CONFIG_DRM_NOUVEAU=m
340CONFIG_DRM_EXYNOS=m
341CONFIG_DRM_EXYNOS5433_DECON=y
342CONFIG_DRM_EXYNOS7_DECON=y
343CONFIG_DRM_EXYNOS_DSI=y
344# CONFIG_DRM_EXYNOS_DP is not set
345CONFIG_DRM_EXYNOS_HDMI=y
346CONFIG_DRM_EXYNOS_MIC=y
332CONFIG_DRM_RCAR_DU=m 347CONFIG_DRM_RCAR_DU=m
333CONFIG_DRM_RCAR_HDMI=y 348CONFIG_DRM_RCAR_HDMI=y
334CONFIG_DRM_RCAR_LVDS=y 349CONFIG_DRM_RCAR_LVDS=y
@@ -399,11 +414,15 @@ CONFIG_MMC_DW_EXYNOS=y
399CONFIG_MMC_DW_K3=y 414CONFIG_MMC_DW_K3=y
400CONFIG_MMC_DW_ROCKCHIP=y 415CONFIG_MMC_DW_ROCKCHIP=y
401CONFIG_MMC_SUNXI=y 416CONFIG_MMC_SUNXI=y
417CONFIG_MMC_SDHCI_XENON=y
418CONFIG_MMC_BCM2835=y
402CONFIG_NEW_LEDS=y 419CONFIG_NEW_LEDS=y
403CONFIG_LEDS_CLASS=y 420CONFIG_LEDS_CLASS=y
404CONFIG_LEDS_GPIO=y 421CONFIG_LEDS_GPIO=y
422CONFIG_LEDS_PWM=y
405CONFIG_LEDS_SYSCON=y 423CONFIG_LEDS_SYSCON=y
406CONFIG_LEDS_TRIGGERS=y 424CONFIG_LEDS_TRIGGERS=y
425CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
407CONFIG_LEDS_TRIGGER_HEARTBEAT=y 426CONFIG_LEDS_TRIGGER_HEARTBEAT=y
408CONFIG_LEDS_TRIGGER_CPU=y 427CONFIG_LEDS_TRIGGER_CPU=y
409CONFIG_RTC_CLASS=y 428CONFIG_RTC_CLASS=y
@@ -470,6 +489,7 @@ CONFIG_PHY_RCAR_GEN3_USB2=y
470CONFIG_PHY_HI6220_USB=y 489CONFIG_PHY_HI6220_USB=y
471CONFIG_PHY_ROCKCHIP_INNO_USB2=y 490CONFIG_PHY_ROCKCHIP_INNO_USB2=y
472CONFIG_PHY_ROCKCHIP_EMMC=y 491CONFIG_PHY_ROCKCHIP_EMMC=y
492CONFIG_PHY_SUN4I_USB=y
473CONFIG_PHY_XGENE=y 493CONFIG_PHY_XGENE=y
474CONFIG_PHY_TEGRA_XUSB=y 494CONFIG_PHY_TEGRA_XUSB=y
475CONFIG_ARM_SCPI_PROTOCOL=y 495CONFIG_ARM_SCPI_PROTOCOL=y
@@ -519,6 +539,7 @@ CONFIG_MEMTEST=y
519CONFIG_SECURITY=y 539CONFIG_SECURITY=y
520CONFIG_CRYPTO_ECHAINIV=y 540CONFIG_CRYPTO_ECHAINIV=y
521CONFIG_CRYPTO_ANSI_CPRNG=y 541CONFIG_CRYPTO_ANSI_CPRNG=y
542CONFIG_CRYPTO_DEV_SAFEXCEL=m
522CONFIG_ARM64_CRYPTO=y 543CONFIG_ARM64_CRYPTO=y
523CONFIG_CRYPTO_SHA1_ARM64_CE=y 544CONFIG_CRYPTO_SHA1_ARM64_CE=y
524CONFIG_CRYPTO_SHA2_ARM64_CE=y 545CONFIG_CRYPTO_SHA2_ARM64_CE=y