Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51cf0d6c authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'samsung-defconfig-4.18' of... 

Merge tag 'samsung-defconfig-4.18' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/defconfig

Samsung defconfig changes for v4.18

1. Enable Samsung S6E63J0X03 DSI panel.

* tag 'samsung-defconfig-4.18' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux

:
  ARM: multi_v7_config: enable S6E63J0X03 panel driver
  ARM: exynos_defconfig: enable S6E63J0X03 panel driver

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 96609676 b0121046

arch/arm/configs/exynos_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ CONFIG_DRM_EXYNOS_DSI=y 
CONFIG_DRM_EXYNOS_HDMI=y

CONFIG_DRM_PANEL_SIMPLE=y

CONFIG_DRM_PANEL_SAMSUNG_LD9040=y

CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=y

CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=y

CONFIG_DRM_NXP_PTN3460=y

CONFIG_DRM_PARADE_PS8622=y

arch/arm/configs/multi_v7_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -643,6 +643,7 @@ CONFIG_DRM_SUN4I=m 
CONFIG_DRM_FSL_DCU=m

CONFIG_DRM_TEGRA=y

CONFIG_DRM_PANEL_SAMSUNG_LD9040=m

CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=m

CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m

CONFIG_DRM_PANEL_SIMPLE=y

CONFIG_DRM_SII9234=m