diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-10-30 10:43:07 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-10-30 10:43:07 +0100 |
| commit | 2a10276cf42536615755a8c4173e593192c5763f (patch) | |
| tree | c377a2961d14f818d6a21345320d282a3c5bbdde /arch/arm | |
| parent | 5068d8710026f7db6ad36201fd650ae2f93144b3 (diff) | |
| parent | a8ca183dc8c4e98980007ed8b8ccc7992cbad4ea (diff) | |
| download | linux-stable-2a10276cf42536615755a8c4173e593192c5763f.tar.gz linux-stable-2a10276cf42536615755a8c4173e593192c5763f.tar.bz2 linux-stable-2a10276cf42536615755a8c4173e593192c5763f.zip | |
Merge tag 'imx-defconfig-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/soc
Pull "i.MX defconfig updates for 4.15" from Shawn Guo:
- Turn on DRM_DW_HDMI_CEC option to get HDMI CEC support.
- Enable MUX_MMIO to get ADV7180 probe on Gateworks GW51xx boards.
* tag 'imx-defconfig-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx_v6_v7_defconfig: Select the CEC driver
ARM: imx_v6_v7_defconfig: Select CONFIG_MUX_MMIO
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 32acac9ab81a..0d4494922561 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -250,6 +250,7 @@ CONFIG_IMX_IPUV3_CORE=y CONFIG_DRM=y CONFIG_DRM_PANEL_SIMPLE=y CONFIG_DRM_DW_HDMI_AHB_AUDIO=m +CONFIG_DRM_DW_HDMI_CEC=y CONFIG_DRM_IMX=y CONFIG_DRM_IMX_PARALLEL_DISPLAY=y CONFIG_DRM_IMX_TVE=y @@ -365,6 +366,7 @@ CONFIG_PWM=y CONFIG_PWM_FSL_FTM=y CONFIG_PWM_IMX=y CONFIG_NVMEM_IMX_OCOTP=y +CONFIG_MUX_MMIO=y CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y |