diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2013-08-23 08:16:21 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2013-08-23 08:16:21 +0100 |
| commit | c2a5d382a8a063910f661f0368e463b780a4c3e2 (patch) | |
| tree | cbfe84538cf5ccd7755d1b9217f5a7ec6fd9e347 /config-armv7 | |
| parent | 11cc8d930482a361579b74144806b68dc288dd75 (diff) | |
| download | kernel-c2a5d382a8a063910f661f0368e463b780a4c3e2.tar.gz kernel-c2a5d382a8a063910f661f0368e463b780a4c3e2.tar.xz kernel-c2a5d382a8a063910f661f0368e463b780a4c3e2.zip | |
Minor ARM config cleanups, Enable some IOMMU drivers on ARM, Enable some i.MX sound drivers
Diffstat (limited to 'config-armv7')
| -rw-r--r-- | config-armv7 | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/config-armv7 b/config-armv7 index b1aae7b86..1b2c1127b 100644 --- a/config-armv7 +++ b/config-armv7 @@ -117,8 +117,10 @@ CONFIG_OMAP_MBOX_FWK=m CONFIG_OMAP_MBOX_KFIFO_SIZE=256 CONFIG_OMAP_DM_TIMER=y CONFIG_OMAP_PM_NOOP=y +CONFIG_DMA_OMAP=y CONFIG_OMAP_IOMMU=y CONFIG_OMAP_IOVMM=m +CONFIG_HWSPINLOCK_OMAP=m CONFIG_OMAP3_EMU=y # CONFIG_OMAP3_SDRC_AC_TIMING is not set CONFIG_ARM_OMAP2PLUS_CPUFREQ=y @@ -183,10 +185,6 @@ CONFIG_RTC_DRV_MAX8907=m # CONFIG_RTC_DRV_TWL92330 is not set CONFIG_RTC_DRV_TWL4030=y CONFIG_RTC_DRV_OMAP=y -# Note needs to be compiled in until we build MMC modular -CONFIG_DMA_OMAP=y -CONFIG_OMAP_IOVMM=m -CONFIG_HWSPINLOCK_OMAP=m CONFIG_SENSORS_TWL4030_MADC=m CONFIG_WL_TI=y @@ -369,14 +367,23 @@ CONFIG_SERIAL_IMX=y CONFIG_SERIAL_IMX_CONSOLE=y CONFIG_I2C_IMX=m CONFIG_SPI_IMX=m +CONFIG_MFD_MC13783=m +CONFIG_MFD_MC13XXX_SPI=m CONFIG_W1_MASTER_MXC=m CONFIG_IMX_WEIM=y CONFIG_IMX2_WDT=m CONFIG_CRYPTO_DEV_SAHARA=m # CONFIG_FB_MX3 is not set CONFIG_SND_IMX_SOC=m -# CONFIG_SND_SOC_IMX_SGTL5000 is not set -# CONFIG_SND_SOC_IMX_WM8962 is not set +CONFIG_SND_SOC_FSL_SSI=m +CONFIG_SND_SOC_FSL_UTILS=m +CONFIG_SND_SOC_IMX_SSI=m +CONFIG_SND_SOC_IMX_AUDMUX=m +CONFIG_SND_SOC_IMX_PCM_FIQ=m +CONFIG_SND_SOC_IMX_PCM_DMA=m +CONFIG_SND_SOC_IMX_SGTL5000=m +CONFIG_SND_SOC_IMX_WM8962=m +CONFIG_SND_SOC_IMX_MC13783=m CONFIG_USB_EHCI_MXC=m CONFIG_USB_IMX21_HCD=m CONFIG_USB_MXS_PHY=m @@ -401,6 +408,11 @@ CONFIG_DRM_IMX_IPUV3=m CONFIG_DRM_IMX_PARALLEL_DISPLAY=m CONFIG_DRM_IMX_TVE=m CONFIG_VIDEO_CODA=m +CONFIG_SENSORS_MC13783_ADC=m +CONFIG_REGULATOR_MC13783=m +CONFIG_REGULATOR_MC13892=m +CONFIG_LEDS_MC13783=m +CONFIG_RTC_DRV_MC13XXX=m CONFIG_INPUT_PWM_BEEPER=m CONFIG_INPUT_88PM80X_ONKEY=m |