diff options
| author | Peter Robinson <pbrobinson@gmail.com> | 2012-10-02 08:20:54 +0100 |
|---|---|---|
| committer | Peter Robinson <pbrobinson@gmail.com> | 2012-10-02 08:22:04 +0100 |
| commit | 386d01e31aa3706035aaf43037d14154009df22a (patch) | |
| tree | 266c00cc2a03515d027fca3d082365e8ae35b60c /config-arm-omap | |
| parent | 0649cffad1851ad77938804a39b60c7e66c9c466 (diff) | |
| download | kernel-386d01e31aa3706035aaf43037d14154009df22a.tar.gz kernel-386d01e31aa3706035aaf43037d14154009df22a.tar.xz kernel-386d01e31aa3706035aaf43037d14154009df22a.zip | |
- Update ARM configs for 3.6 final
- Add highbank SATA driver for stability
- Build in OMAP MMC and DMA drivers to fix borkage for now
Diffstat (limited to 'config-arm-omap')
| -rw-r--r-- | config-arm-omap | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/config-arm-omap b/config-arm-omap index b44a44590..b698e4849 100644 --- a/config-arm-omap +++ b/config-arm-omap @@ -27,6 +27,10 @@ CONFIG_OMAP_PM_NOOP=y CONFIG_OMAP_IOMMU=y CONFIG_OMAP3_EMU=y CONFIG_HWSPINLOCK_OMAP=m +CONFIG_DMA_OMAP=y +# CONFIG_DMADEVICES_VDEBUG is not set + +CONFIG_ARM_OMAP2PLUS_CPUFREQ=y # # TI OMAP2/3/4 Specific Features @@ -36,16 +40,14 @@ CONFIG_ARCH_OMAP2PLUS_TYPICAL=y CONFIG_ARCH_OMAP3=y CONFIG_ARCH_OMAP4=y CONFIG_SOC_OMAP3430=y -# CONFIG_SOC_OMAPTI81XX is not set -# CONFIG_SOC_OMAPAM33XX is not set -# CONFIG_SOC_OMAPTI816X is not set +CONFIG_SOC_TI81XX=y +CONFIG_SOC_AM33XX=y +CONFIG_SOC_OMAPTI816X=y CONFIG_OMAP_PACKAGE_CBB=y CONFIG_OMAP_PACKAGE_CBL=y CONFIG_OMAP_PACKAGE_CBS=y # CONFIG_OMAP4_ERRATA_I688 is not set -CONFIG_ARM_OMAP2PLUS_CPUFREQ=y - # # OMAP Board Type # @@ -146,6 +148,7 @@ CONFIG_PM_OPP=y # OMAP Hardware # CONFIG_WL_TI=y +CONFIG_WLCORE_SDIO=m CONFIG_TI_ST=m CONFIG_GPIOLIB=y CONFIG_MTD_NAND_OMAP2=y @@ -158,6 +161,7 @@ CONFIG_INPUT_TWL4030_PWRBUTTON=m CONFIG_INPUT_TWL4030_VIBRA=m CONFIG_INPUT_TWL6040_VIBRA=m CONFIG_KEYBOARD_OMAP4=m +CONFIG_KEYBOARD_TWL4030=m CONFIG_TOUCHSCREEN_TI_TSCADC=m CONFIG_SERIAL_OMAP=y CONFIG_SERIAL_OMAP_CONSOLE=y @@ -243,7 +247,7 @@ CONFIG_USB_MUSB_HDRC=y # CONFIG_USB_GADGET_OMAP is not set # CONFIG_ISP1301_OMAP is not set -CONFIG_MMC_OMAP=m +CONFIG_MMC_OMAP=y CONFIG_MMC_OMAP_HS=y CONFIG_TWL4030_USB=y CONFIG_TWL6030_USB=y |