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>

diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig
index 1778813..a53e54f 100644 (file)
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@ -374,14 +374,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