Commit 0ff4c01b 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 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
parents 0160e00a 900a9020

MAINTAINERS

+1 −8
Original line number Diff line number Diff line
@@ -2867,13 +2867,6 @@ L: netdev@vger.kernel.org 
S:	Supported

F:	drivers/net/ethernet/broadcom/bcmsysport.*



BROADCOM VULCAN ARM64 SOC

M:	Jayachandran C. <c.jayachandran@gmail.com>

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 <selvin.xavier@broadcom.com>

M:	Devesh Sharma <devesh.sharma@broadcom.com>
@@ -3067,7 +3060,7 @@ 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:	arch/arm64/boot/dts/cavium/thunder2-99xx*

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



CAVIUM I2C DRIVER

arch/arm64/Kconfig.platforms

+4 −1
Original line number Diff line number Diff line
@@ -2,9 +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 PINCTRL_SUN50I_A64

	select RESET_CONTROLLER

	help

	  This enables support for Allwinner sunxi based SoCs like the A64.
@@ -54,6 +55,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

arch/arm64/configs/defconfig

+21 −0
Original line number Diff line number Diff line
@@ -186,6 +186,8 @@ 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

CONFIG_SMC91X=y
@@ -250,8 +252,10 @@ 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_SH_MOBILE=y

CONFIG_I2C_TEGRA=y

CONFIG_I2C_UNIPHIER_F=y

CONFIG_I2C_RCAR=y
@@ -300,6 +304,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
@@ -325,10 +330,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
@@ -399,11 +414,15 @@ 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_MMC_BCM2835=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
@@ -470,6 +489,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
@@ -519,6 +539,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

CRA Git | Maintained and supported by SUSTech CRA and CCSE