summaryrefslogtreecommitdiff
path: root/arch/arm64/configs
diff options
context:
space:
mode:
authorRobert Chiras <robert.chiras@nxp.com>2017-11-21 10:08:07 +0200
committerLeonard Crestez <leonard.crestez@nxp.com>2018-08-24 12:41:33 +0300
commit0718d71a108257283b7f79eb2bd8f3f69c2b0c50 (patch)
treecf98d129c928ed0755fdee5329f104b1a81ee307 /arch/arm64/configs
parent7c8fc6f4c02f4f5c75efa3a529e0dd8e441e1068 (diff)
MLK-16918-18: arm64: configs: enable mxsfb DRM driver
Enable MXSFB DRM driver as built-in in defconfig and disable the FB_MXC driver from fbdev since its compatible string is conflicting with the DRM driver. Signed-off-by: Robert Chiras <robert.chiras@nxp.com>
Diffstat (limited to 'arch/arm64/configs')
-rw-r--r--arch/arm64/configs/defconfig6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 1c536f92d95f..d94a04e17a79 100644
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -376,14 +376,12 @@ CONFIG_DRM_IMX_NWL_DSI=y
CONFIG_DRM_IMX_HDP=y
CONFIG_IMX_HDP_CEC=y
CONFIG_DRM_HISI_KIRIN=m
+CONFIG_DRM_MXSFB=y
CONFIG_FB_IMX64=y
CONFIG_FB_IMX64_DEBUG=y
CONFIG_FB_ARMCLCD=y
-CONFIG_FB_MXS=y
-CONFIG_FB_MXC_MIPI_DSI_NORTHWEST=y
-CONFIG_FB_MXC_TRULY_WVGA_SYNC_PANEL=y
+CONFIG_FB_MXC_DISP_FRAMEWORK=y
CONFIG_FB_MX8_HDMI=y
-CONFIG_FB_MXC_ADV7535=y
CONFIG_BACKLIGHT_GENERIC=m
CONFIG_BACKLIGHT_LP855X=m
CONFIG_LOGO=y