Skip to content

Commit dd726fc

Browse files
committed
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: Olof Johansson <[email protected]>
2 parents 309ed7e + 0edf179 commit dd726fc

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

arch/arm64/Kconfig.platforms

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ config ARCH_BRCMSTB
5353
config ARCH_EXYNOS
5454
bool "ARMv8 based Samsung Exynos SoC family"
5555
select COMMON_CLK_SAMSUNG
56+
select EXYNOS_PM_DOMAINS if PM_GENERIC_DOMAINS
57+
select EXYNOS_PMU
5658
select HAVE_S3C2410_WATCHDOG if WATCHDOG
5759
select HAVE_S3C_RTC if RTC_CLASS
5860
select PINCTRL

arch/arm64/configs/defconfig

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,7 @@ CONFIG_RENESAS_WDT=y
303303
CONFIG_S3C2410_WATCHDOG=y
304304
CONFIG_MESON_GXBB_WATCHDOG=m
305305
CONFIG_MESON_WATCHDOG=m
306+
CONFIG_MFD_EXYNOS_LPASS=m
306307
CONFIG_MFD_MAX77620=y
307308
CONFIG_MFD_RK808=y
308309
CONFIG_MFD_SPMI_PMIC=y
@@ -328,10 +329,20 @@ CONFIG_MEDIA_CONTROLLER=y
328329
CONFIG_VIDEO_V4L2_SUBDEV_API=y
329330
# CONFIG_DVB_NET is not set
330331
CONFIG_V4L_MEM2MEM_DRIVERS=y
332+
CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
333+
CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
334+
CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
331335
CONFIG_VIDEO_RENESAS_FCP=m
332336
CONFIG_VIDEO_RENESAS_VSP1=m
333337
CONFIG_DRM=m
334338
CONFIG_DRM_NOUVEAU=m
339+
CONFIG_DRM_EXYNOS=m
340+
CONFIG_DRM_EXYNOS5433_DECON=y
341+
CONFIG_DRM_EXYNOS7_DECON=y
342+
CONFIG_DRM_EXYNOS_DSI=y
343+
# CONFIG_DRM_EXYNOS_DP is not set
344+
CONFIG_DRM_EXYNOS_HDMI=y
345+
CONFIG_DRM_EXYNOS_MIC=y
335346
CONFIG_DRM_RCAR_DU=m
336347
CONFIG_DRM_RCAR_HDMI=y
337348
CONFIG_DRM_RCAR_LVDS=y

0 commit comments

Comments
 (0)