ARM config cleanups and changes for 3.11

1 files changed, 17 insertions, 49 deletions

diff --git a/config-armv7 b/config-armv7
index 2eb9a14da..2c5049c26 100644
--- a/config-armv7
+++ b/config-armv7
@@ -141,7 +141,7 @@ CONFIG_OMAP3_EMU=y
 CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
 
 CONFIG_TI_ST=m
-CONFIG_TI_EDMA=m
+CONFIG_TI_EDMA=y
 CONFIG_TI_SOC_THERMAL=m
 CONFIG_TI_DAC7512=m
 CONFIG_TI_DAVINCI_EMAC=m
@@ -166,7 +166,6 @@ CONFIG_OMAP_WATCHDOG=m
 CONFIG_TWL4030_CORE=y
 CONFIG_TWL4030_MADC=m
 CONFIG_TWL4030_POWER=y
-CONFIG_TWL4030_CODEC=y
 CONFIG_TWL4030_WATCHDOG=m
 CONFIG_TWL4030_USB=m
 CONFIG_TWL6030_USB=m
@@ -182,8 +181,8 @@ CONFIG_HDQ_MASTER_OMAP=m
 CONFIG_REGULATOR_TWL4030=y
 CONFIG_BACKLIGHT_PANDORA=m
 CONFIG_OMAP_OCP2SCP=m
-CONFIG_USB_EHCI_HCD_OMAP=y
-CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_EHCI_HCD_OMAP=m
+CONFIG_USB_OHCI_HCD_PLATFORM=m
 CONFIG_USB_OHCI_HCD_OMAP3=y
 CONFIG_USB_MUSB_AM35X=m
 CONFIG_USB_MUSB_OMAP2PLUS=m
@@ -193,14 +192,14 @@ CONFIG_USB_GADGET_MUSB_HDRC=m
 # CONFIG_USB_MUSB_DEBUG is not set
 CONFIG_OMAP_CONTROL_USB=m
 CONFIG_NOP_USB_XCEIV=m
-CONFIG_MMC_OMAP=y
-CONFIG_MMC_OMAP_HS=y
+CONFIG_MMC_OMAP=m
+CONFIG_MMC_OMAP_HS=m
 CONFIG_RTC_DRV_MAX8907=m
 # CONFIG_RTC_DRV_TWL92330 is not set
 CONFIG_RTC_DRV_TWL4030=m
 CONFIG_RTC_DRV_OMAP=m
 # Note needs to be compiled in until we build MMC modular
-CONFIG_DMA_OMAP=y
+CONFIG_DMA_OMAP=m
 CONFIG_OMAP_IOVMM=m
 CONFIG_HWSPINLOCK_OMAP=m
 CONFIG_SENSORS_TWL4030_MADC=m
@@ -216,9 +215,7 @@ CONFIG_WILINK_PLATFORM_DATA=y
 CONFIG_MFD_WL1273_CORE=m
 CONFIG_NFC_WILINK=m
 
-CONFIG_MTD_NAND_OMAP2=y
-CONFIG_MTD_NAND_OMAP_PREFETCH=y
-CONFIG_MTD_NAND_OMAP_PREFETCH_DMA=y
+CONFIG_MTD_NAND_OMAP2=m
 CONFIG_SPI_DAVINCI=m
 CONFIG_SPI_OMAP24XX=m
 CONFIG_MFD_TI_SSP=m
@@ -255,8 +252,6 @@ CONFIG_HW_RANDOM_OMAP=m
 CONFIG_DRM_TILCDC=m
 CONFIG_DRM_OMAP=m
 CONFIG_DRM_OMAP_NUM_CRTCS=2
-CONFIG_OMAP2_VRAM=y
-CONFIG_OMAP2_VRAM_SIZE=0
 CONFIG_OMAP2_VRFB=y
 # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set
 # CONFIG_FB_OMAP_LCD_VGA is not set
@@ -351,40 +346,9 @@ CONFIG_OMAP_REMOTEPROC=m
 
 # Allwinner a1x
 CONFIG_PINCTRL_SUNXI=y
-# CONFIG_SUNXI_RFKILL=y
-# CONFIG_SUNXI_NAND=y
-# CONFIG_SUNXI_DBGREG=m
-# CONFIG_WEMAC_SUN4I=y
-# CONFIG_KEYBOARD_SUN4IKEYPAD=m
-# CONFIG_KEYBOARD_SUN4I_KEYBOARD=m
-# CONFIG_IR_SUN4I=m
-# CONFIG_TOUCHSCREEN_SUN4I_TS=m
-# CONFIG_SUN4I_G2D=y
-# CONFIG_I2C_SUN4I=y
-# CONFIG_DRM_MALI=m
-# CONFIG_MALI=m
-# CONFIG_FB_SUNXI=m
-# CONFIG_FB_SUNXI_UMP=y
-# CONFIG_FB_SUNXI_LCD=m
-# CONFIG_FB_SUNXI_HDMI=m
-# CONFIG_SOUND_SUN4I=y
-# CONFIG_SND_SUN4I_SOC_CODEC=y
-# CONFIG_SND_SUN4I_SOC_HDMIAUDIO=y
-# CONFIG_SND_SUN4I_SOC_SPDIF=m
-# CONFIG_SND_SUN4I_SOC_I2S_INTERFACE=m
-# CONFIG_SND_SOC_I2C_AND_SPI=y
-# CONFIG_USB_SW_SUN4I_HCD=y
-# CONFIG_USB_SW_SUN4I_HCD0=y
-# CONFIG_USB_SW_SUN4I_HCI=y
-# CONFIG_USB_SW_SUN4I_EHCI0=y
-# CONFIG_USB_SW_SUN4I_EHCI1=y
-# CONFIG_USB_SW_SUN4I_OHCI0=y
-# CONFIG_USB_SW_SUN4I_OHCI1=y
-# CONFIG_USB_SW_SUN4I_USB=y
-# CONFIG_USB_SW_SUN4I_USB_MANAGER=y
-# CONFIG_MMC_SUNXI_POWER_CONTROL=y
-# CONFIG_MMC_SUNXI=y
-# CONFIG_RTC_DRV_SUN4I=y
+CONFIG_MDIO_SUN4I=m
+CONFIG_NET_VENDOR_ALLWINNER=y
+CONFIG_SUN4I_EMAC=m
 
 # imx 
 CONFIG_MXC_IRQ_PRIOR=y
@@ -409,8 +373,8 @@ 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=m
-CONFIG_SND_SOC_IMX_WM8962=m
+# CONFIG_SND_SOC_IMX_SGTL5000 is not set
+# CONFIG_SND_SOC_IMX_WM8962 is not set
 CONFIG_USB_EHCI_MXC=m
 CONFIG_USB_IMX21_HCD=m
 CONFIG_USB_MXS_PHY=m
@@ -430,7 +394,7 @@ CONFIG_DRM_IMX=m
 CONFIG_DRM_IMX_FB_HELPER=m
 CONFIG_DRM_IMX_IPUV3_CORE=m
 CONFIG_DRM_IMX_IPUV3=m
-CONFIG_DRM_IMX_LDB=m
+# CONFIG_DRM_IMX_LDB is not set
 CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
 CONFIG_DRM_IMX_TVE=m
 CONFIG_VIDEO_CODA=m
@@ -482,6 +446,9 @@ CONFIG_AB8500_BM=y
 CONFIG_AB8500_GPADC=y
 CONFIG_SENSORS_AB8500=m
 CONFIG_STE_MODEM_RPROC=m
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
 
 # tegra
 CONFIG_ARCH_TEGRA_2x_SOC=y
@@ -558,6 +525,7 @@ CONFIG_SERIO_OLPC_APSP=m
 
 # ZYNQ
 CONFIG_LATTICE_ECP3_CONFIG=m
+# CONFIG_NET_VENDOR_XILINX is not set
 
 # MMC/SD
 CONFIG_MMC_TMIO=m