From 88c83ae6707107ae9503048f26afd7b3c761df37 Mon Sep 17 00:00:00 2001 From: Leonard Crestez Date: Mon, 18 Jun 2018 11:15:45 +0300 Subject: [PATCH 1/4] ARM: imx_v6_v7_defconfig: Enable imx6qdl-sabreauto sensors CONFIG_SENSORS_ISL29018 supports isil,il29023 light sensor CONFIG_MMA8452 supports fsl,mma8451 accelerometer CONFIG_MAG3110 for fsl,mag3110 is already enabled Signed-off-by: Leonard Crestez Reviewed-by: Fabio Estevam Signed-off-by: Shawn Guo --- arch/arm/configs/imx_v6_v7_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index f70507ab91ee..a647cbb0e59f 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -374,8 +374,10 @@ CONFIG_STAGING_MEDIA=y CONFIG_VIDEO_IMX_MEDIA=y CONFIG_COMMON_CLK_PWM=y CONFIG_IIO=y +CONFIG_MMA8452=y CONFIG_IMX7D_ADC=y CONFIG_VF610_ADC=y +CONFIG_SENSORS_ISL29018=y CONFIG_MAG3110=y CONFIG_MPL3115=y CONFIG_PWM=y From f13a7fe2826f84fe60d9883a4d697e86e520bdbf Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 12 Jul 2018 12:59:41 +0200 Subject: [PATCH 2/4] ARM: mxs_defconfig: use MXSFB DRM driver Use the the DRM driver for MXSFB LCD controller (used in i.MX23/ i.MX28/i.MX6SX or i.MX7). Remove CONFIG_FB_MXS which will soon be removed. Note that this does not remove CONFIG_FB. CONFIG_FB gets selected implicity by CONFIG_DRM/CONFIG_DRM_KMS_FB_HELPER. Signed-off-by: Stefan Agner Signed-off-by: Shawn Guo --- arch/arm/configs/mxs_defconfig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig index a508eb302e7a..148226e36152 100644 --- a/arch/arm/configs/mxs_defconfig +++ b/arch/arm/configs/mxs_defconfig @@ -94,8 +94,9 @@ CONFIG_STMP3XXX_RTC_WATCHDOG=y CONFIG_MFD_MXS_LRADC=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_FB=y -CONFIG_FB_MXS=y +CONFIG_DRM=y +CONFIG_DRM_MXSFB=y +CONFIG_FB_MODE_HELPERS=y CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_BACKLIGHT_CLASS_DEVICE=y From aaeabc18a086d2b915ceb4eb070b9ad21276d39d Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Thu, 12 Jul 2018 12:59:42 +0200 Subject: [PATCH 3/4] ARM: imx_v6_v7_defconfig: use MXSFB DRM driver Use the the DRM driver for MXSFB LCD controller (used in i.MX23/ i.MX28/i.MX6SX or i.MX7). Remove CONFIG_FB_MXS which will soon be removed. Signed-off-by: Stefan Agner Signed-off-by: Shawn Guo --- arch/arm/configs/imx_v6_v7_defconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index a647cbb0e59f..57d8947792bb 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -266,7 +266,8 @@ CONFIG_DRM_IMX_TVE=y CONFIG_DRM_IMX_LDB=y CONFIG_DRM_IMX_HDMI=y CONFIG_DRM_ETNAVIV=y -CONFIG_FB_MXS=y +CONFIG_DRM_MXSFB=y +CONFIG_FB_MODE_HELPERS=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_L4F00242T03=y CONFIG_LCD_PLATFORM=y From eaed0291c62f7b513ad9483b02efdccd4ae4e9fc Mon Sep 17 00:00:00 2001 From: Robin Gong Date: Fri, 13 Jul 2018 21:08:47 +0800 Subject: [PATCH 4/4] ARM: imx_v6_v7_defconfig: add DMATEST support Add DMATEST support and remove invalid options, such as CONFIG_BT_HCIUART_H4 is default enabled and CONFIG_SND_SOC_IMX_WM8962 is out of date and not appear in any config file. Please refer to Documentation/driver-api/dmaengine/dmatest.rst to test MEMCPY feature of imx-sdma. Signed-off-by: Robin Gong Signed-off-by: Shawn Guo --- arch/arm/configs/imx_v6_v7_defconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 57d8947792bb..8a6ad8428261 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -81,7 +81,6 @@ CONFIG_CAN=y CONFIG_CAN_FLEXCAN=y CONFIG_BT=y CONFIG_BT_HCIUART=y -CONFIG_BT_HCIUART_H4=y CONFIG_BT_HCIUART_LL=y CONFIG_CFG80211=y CONFIG_CFG80211_WEXT=y @@ -283,7 +282,6 @@ CONFIG_SND_SOC_FSL_ASRC=y CONFIG_SND_IMX_SOC=y CONFIG_SND_SOC_PHYCORE_AC97=y CONFIG_SND_SOC_EUKREA_TLV320=y -CONFIG_SND_SOC_IMX_WM8962=y CONFIG_SND_SOC_IMX_ES8328=y CONFIG_SND_SOC_IMX_SGTL5000=y CONFIG_SND_SOC_IMX_SPDIF=y @@ -370,6 +368,7 @@ CONFIG_DMADEVICES=y CONFIG_FSL_EDMA=y CONFIG_IMX_SDMA=y CONFIG_MXS_DMA=y +CONFIG_DMATEST=m CONFIG_STAGING=y CONFIG_STAGING_MEDIA=y CONFIG_VIDEO_IMX_MEDIA=y