diff options
author | Leonard Crestez <leonard.crestez@nxp.com> | 2018-03-06 19:25:23 +0200 |
---|---|---|
committer | Jason Liu <jason.hui.liu@nxp.com> | 2019-02-12 10:21:34 +0800 |
commit | 74a9e92c15527612b3305ce89d1473894f8d16e4 (patch) | |
tree | 502231802edacb1ea34deadda722bb4eb0ce662e /arch/arm/configs | |
parent | 5ba87517a6edd5433c06e37c24de70ab9c26e6c0 (diff) |
MLK-11318-5: video: mxsfb: porting mxsfb driver to imx_4.1.y branch
Porting mxsfb driver to imx_4.1.y branch.
Signed-off-by: Fancy Fang <chen.fang@freescale.com>
Also added dependency to FB_MXC_SYNC_PANEL to fix imx_v6_v7_deconfig
build during 4.14 rebase. This was initially a small part of
commit fe2905013882 ("MLK-15048-2: video: Add proper config dependencies")
Signed-off-by: Leonard Crestez <leonard.crestez@nxp.com>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/imx_v7_defconfig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/configs/imx_v7_defconfig b/arch/arm/configs/imx_v7_defconfig index 25ed337c88d1..f83498c72e5b 100644 --- a/arch/arm/configs/imx_v7_defconfig +++ b/arch/arm/configs/imx_v7_defconfig @@ -224,6 +224,7 @@ CONFIG_VIDEO_CODA=y CONFIG_RADIO_SI476X=y CONFIG_DRM=y CONFIG_FB_MXS=y +CONFIG_FB_MXC_SYNC_PANEL=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_L4F00242T03=y CONFIG_LCD_PLATFORM=y @@ -298,10 +299,10 @@ CONFIG_RTC_DRV_MXC=y CONFIG_RTC_DRV_SNVS=y CONFIG_DMADEVICES=y CONFIG_FSL_EDMA=y -CONFIG_MXC_PXP_V2=y -CONFIG_MXC_PXP_V3=y CONFIG_IMX_SDMA=y CONFIG_MXS_DMA=y +CONFIG_MXC_PXP_V2=y +CONFIG_MXC_PXP_V3=y CONFIG_DMATEST=m CONFIG_STAGING=y CONFIG_STAGING_MEDIA=y |