aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/integrator_defconfig
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2019-02-22 16:09:31 +0100
committerArnd Bergmann <arnd@arndb.de>2019-02-22 22:08:22 +0100
commit1a4aacdeb507da38190e08cec45ef985740e26dc (patch)
treed3a0abd56a5b418608c5a0d1b6847f537c46e31c /arch/arm/configs/integrator_defconfig
parentMerge tag 'samsung-defconfig-5.1' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/defconfig (diff)
downloadlinux-dev-1a4aacdeb507da38190e08cec45ef985740e26dc.tar.xz
linux-dev-1a4aacdeb507da38190e08cec45ef985740e26dc.zip
ARM: defconfig: integrator: Switch to DRM
This switches the ARM Integrator to use the new PL11x DRM driver. We need CMA enabled to get coherent allocations at all times. The dumb VGA DAC bridge is needed for the VGA output on the reference designs, and backlight is needed when using an external display. Signed-off-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/configs/integrator_defconfig')
-rw-r--r--arch/arm/configs/integrator_defconfig9
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/arm/configs/integrator_defconfig b/arch/arm/configs/integrator_defconfig
index 69cb8f1efcea..747550c7af2f 100644
--- a/arch/arm/configs/integrator_defconfig
+++ b/arch/arm/configs/integrator_defconfig
@@ -27,6 +27,7 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y
CONFIG_CPU_FREQ_GOV_USERSPACE=y
CONFIG_CPU_FREQ_GOV_ONDEMAND=y
CONFIG_CPUFREQ_DT=y
+CONFIG_CMA=y
CONFIG_NET=y
CONFIG_PACKET=y
CONFIG_UNIX=y
@@ -53,13 +54,17 @@ CONFIG_E100=y
CONFIG_SMC91X=y
# CONFIG_KEYBOARD_ATKBD is not set
# CONFIG_SERIO_SERPORT is not set
-CONFIG_FB=y
+CONFIG_DRM=y
+CONFIG_DRM_DUMB_VGA_DAC=y
+CONFIG_DRM_PL111=y
CONFIG_FB_MODE_HELPERS=y
-CONFIG_FB_ARMCLCD=y
CONFIG_FB_MATROX=y
CONFIG_FB_MATROX_MILLENIUM=y
CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
# CONFIG_VGA_CONSOLE is not set
+CONFIG_LOGO=y
CONFIG_MMC=y
CONFIG_MMC_ARMMMCI=y
CONFIG_NEW_LEDS=y