From d0cc60abb3eb0c471ab355749d49897ab356e16a Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Thu, 29 Oct 2015 12:34:55 -0200 Subject: [PATCH 1/4] ARM: imx_v6_v7_defconfig: Remove CONFIG_SOC_LS1021A imx_v6_v7_defconfig is not suitable for booting LS1021 as it needs LPAE. Remove this option. Signed-off-by: Fabio Estevam Signed-off-by: Shawn Guo --- arch/arm/configs/imx_v6_v7_defconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 4187f69f6630..d83e775a6be7 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -42,7 +42,6 @@ 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_IMX6=y From 02dd3364a41ff4450daaf84b47ea49046f0d1776 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Tue, 3 Nov 2015 14:25:37 -0200 Subject: [PATCH 2/4] ARM: imx_v6_v7_defconfig: Select VF610_ADC The vf610 adc driver is present on Vybrid, MX6SX, MX6UL and MX7D. Select it by default. Signed-off-by: Fabio Estevam Acked-by: Fugang Duan 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 d83e775a6be7..38f25a7e2aa8 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -314,6 +314,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 From ee0e5d637419563733f570975d2f43d0e71ff461 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Mon, 16 Nov 2015 13:20:38 -0200 Subject: [PATCH 3/4] ARM: imx_v6_v7_defconfig: Select HDMI audio support Select CONFIG_DRM_DW_HDMI_AHB_AUDIO so that we have HDMI audio supported by default. Signed-off-by: Fabio Estevam Signed-off-by: Shawn Guo --- arch/arm/configs/imx_v6_v7_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 38f25a7e2aa8..486b02b88eb0 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -223,6 +223,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 From 31e98e0d24cd2537a63e06e235e050a06b175df7 Mon Sep 17 00:00:00 2001 From: Lucas Stach Date: Mon, 30 Nov 2015 18:00:11 +0100 Subject: [PATCH 4/4] ARM: imx_v6_v7_defconfig: enable PCI_MSI This has been stable on i.MX6 for a good while now and there is no reason to keep it disabled, as it allows to allocate non-shared IRQs if several PCIe devices are connected to a single host. Signed-off-by: Lucas Stach Signed-off-by: Shawn Guo --- arch/arm/configs/imx_v6_v7_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig index 486b02b88eb0..2d5253dcc226 100644 --- a/arch/arm/configs/imx_v6_v7_defconfig +++ b/arch/arm/configs/imx_v6_v7_defconfig @@ -44,6 +44,7 @@ CONFIG_SOC_IMX6UL=y CONFIG_SOC_IMX7D=y CONFIG_SOC_VF610=y CONFIG_PCI=y +CONFIG_PCI_MSI=y CONFIG_PCI_IMX6=y CONFIG_SMP=y CONFIG_PREEMPT_VOLUNTARY=y