diff options
| author | Olof Johansson <olof@lixom.net> | 2018-05-14 13:48:26 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-05-14 13:48:26 -0700 |
| commit | 51cf0d6c3affe00211fb132d961585a14631d03b (patch) | |
| tree | 75091c4bd7a5aa0fb393574ef59c53f0b81b1b5d /arch/arm/configs | |
| parent | 96609676a7d3aed728a8859ea96d2fe7eb9f23a5 (diff) | |
| parent | b0121046cacdbc99475871aceb2e9e57995c2ba1 (diff) | |
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: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/exynos_defconfig | 1 | ||||
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/exynos_defconfig b/arch/arm/configs/exynos_defconfig index 629189c62fd1..85b2369d6b20 100644 --- a/arch/arm/configs/exynos_defconfig +++ b/arch/arm/configs/exynos_defconfig @@ -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 diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 1d1006ed30d2..c2093166cf40 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -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 |