diff options
| author | Olof Johansson <olof@lixom.net> | 2015-12-22 15:00:22 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-12-22 15:00:22 -0800 |
| commit | f3afce26de53793dfeab74aabfbf4871ddab08d5 (patch) | |
| tree | 97d62f8b55f7850711cbf7351cb627ea48a3ad19 | |
| parent | 2b8890bac2007c4b1e2b332ba025d68434a9b984 (diff) | |
| parent | 31e98e0d24cd2537a63e06e235e050a06b175df7 (diff) | |
| download | linux-f3afce26de53793dfeab74aabfbf4871ddab08d5.tar.bz2 | |
Merge tag 'imx-defconfig-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/defconfig
The i.MX defconfig updates for 4.5:
- Drop CONFIG_SOC_LS1021A support, as it needs LPAE which is not
available with imx_v6_v7_defconfig.
- Enable VF610_ADC, HDMI audio and PCI_MSI support
* tag 'imx-defconfig-4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: imx_v6_v7_defconfig: enable PCI_MSI
ARM: imx_v6_v7_defconfig: Select HDMI audio support
ARM: imx_v6_v7_defconfig: Select VF610_ADC
ARM: imx_v6_v7_defconfig: Remove CONFIG_SOC_LS1021A
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/configs/imx_v6_v7_defconfig | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 4187f69f6630..2d5253dcc226 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -42,9 +42,9 @@ CONFIG_SOC_IMX6SL=y CONFIG_SOC_IMX6SX=y CONFIG_SOC_IMX6UL=y CONFIG_SOC_IMX7D=y -CONFIG_SOC_LS1021A=y CONFIG_SOC_VF610=y CONFIG_PCI=y +CONFIG_PCI_MSI=y CONFIG_PCI_IMX6=y CONFIG_SMP=y CONFIG_PREEMPT_VOLUNTARY=y @@ -224,6 +224,7 @@ CONFIG_SOC_CAMERA_OV2640=y CONFIG_IMX_IPUV3_CORE=y CONFIG_DRM=y CONFIG_DRM_PANEL_SIMPLE=y +CONFIG_DRM_DW_HDMI_AHB_AUDIO=m CONFIG_DRM_IMX=y CONFIG_DRM_IMX_FB_HELPER=y CONFIG_DRM_IMX_PARALLEL_DISPLAY=y @@ -315,6 +316,8 @@ CONFIG_MXS_DMA=y CONFIG_FSL_EDMA=y CONFIG_STAGING=y # CONFIG_IOMMU_SUPPORT is not set +CONFIG_IIO=y +CONFIG_VF610_ADC=y CONFIG_PWM=y CONFIG_PWM_IMX=y CONFIG_EXT2_FS=y |