Commit dd726fcb authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-soc64-4.12' of... 

Merge tag 'samsung-soc64-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/arm64

Samsung ARM64 update for v4.12:
1. Exynos power management drivers support now ARMv8 SoC - Exynos5433 - so
   select them in ARCH_EXYNOS.
2. Enable few Exynos drivers for supported ARMv8 SoCs.

* tag 'samsung-soc64-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  arm64: defconfig: Enable video, DRM and LPASS drivers for Exynos5433 and Exynos7
  arm64: exynos: Enable Exynos PMU and PM domains drivers

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 309ed7e6 0edf1798

arch/arm64/Kconfig.platforms

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

+11 −0
Original line number Diff line number Diff line
@@ -303,6 +303,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
@@ -328,10 +329,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

CRA Git | Maintained and supported by SUSTech CRA and CCSE