ARM config cleanups and changes for 3.11

8 files changed, 59 insertions, 89 deletions

diff --git a/config-arm-generic b/config-arm-generic
index 58f6fa160..c273ccef2 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -28,11 +28,6 @@ CONFIG_MMC=y
 CONFIG_NFS_FS=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NO_HZ=y
-CONFIG_OF_DEVICE=y
-CONFIG_OF_GPIO=y
-CONFIG_OF_IRQ=y
-# CONFIG_OF_SELFTEST is not set
-CONFIG_OF=y
 CONFIG_PERF_EVENTS=y
 # CONFIG_PID_IN_CONTEXTIDR is not set
 CONFIG_PWM=y
@@ -41,12 +36,40 @@ CONFIG_RCU_FANOUT_LEAF=16
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_AMBA_PL011=y
 
+# Device tree
+CONFIG_OF=y
+CONFIG_OF_ADDRESS=y
+CONFIG_OF_DEVICE=y
+CONFIG_OF_EARLY_FLATTREE=y
+CONFIG_OF_FLATTREE=y
+CONFIG_OF_GPIO=y
+CONFIG_OF_I2C=m
+CONFIG_OF_IRQ=y
+CONFIG_OF_MDIO=m
+CONFIG_OF_MTD=y
+CONFIG_OF_NET=y
+CONFIG_OF_PCI_IRQ=m
+CONFIG_OF_PCI=m
+# CONFIG_OF_SELFTEST is not set
+
+# MTD
 CONFIG_MTD_BLKDEVS=m
 CONFIG_MTD_BLOCK=m
 CONFIG_MTD_CHAR=m
+CONFIG_MTD_CFI=m
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
 CONFIG_MTD_OF_PARTS=m
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_PHYSMAP=m
+CONFIG_MTD_PHYSMAP_OF=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
 CONFIG_OF_MTD=y
 
+# GPIO
+CONFIG_MDIO_GPIO=m
+
 # CONFIG_CRYPTO_TEST is not set
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
 # CONFIG_XEN is not set
diff --git a/config-arm64 b/config-arm64
index 0b4602994..142a64ad3 100644
--- a/config-arm64
+++ b/config-arm64
@@ -331,17 +331,6 @@ CONFIG_NLATTR=y
 CONFIG_NO_BOOTMEM=y
 CONFIG_NO_IOPORT=y
 CONFIG_NR_CPUS=4
-CONFIG_OF_ADDRESS=y
-# CONFIG_OF_DISPLAY_TIMING is not set
-CONFIG_OF_EARLY_FLATTREE=y
-CONFIG_OF_FLATTREE=y
-CONFIG_OF_I2C=m
-CONFIG_OF_MDIO=y
-CONFIG_OF_MTD=y
-CONFIG_OF_NET=y
-# CONFIG_OF_VIDEOMODE is not set
-CONFIG_ORE=m
-CONFIG_P54_LEDS=y
 CONFIG_PADATA=y
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PANIC_ON_OOPS_VALUE=0
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
diff --git a/config-armv7-generic b/config-armv7-generic
index baaf9620e..6720c64bf 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -130,13 +130,7 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_ARM_APPENDED_DTB=y
 CONFIG_PROC_DEVICETREE=y
 CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_OF_PCI=y
-CONFIG_OF_PCI_IRQ=y
 CONFIG_I2C_MUX_PINCTRL=m
-CONFIG_OF_MDIO=m
-
-CONFIG_OF_DISPLAY_TIMING=y
-CONFIG_OF_VIDEOMODE=y
 
 # General vexpress ARM drivers
 CONFIG_ARM_TIMER_SP804=y
@@ -168,7 +162,6 @@ CONFIG_AX88796=m
 CONFIG_AX88796_93CX6=y
 CONFIG_SMC91X=m
 CONFIG_SMC911X=m
-CONFIG_SMSC911X=m
 CONFIG_USB_ISP1760_HCD=m
 # CONFIG_USB_EHCI_HCD_ORION is not set
 
diff --git a/config-armv7-lpae b/config-armv7-lpae
index 0798e2d33..ce10b5384 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -45,12 +45,6 @@ CONFIG_MACH_EXYNOS5_DT=y
 CONFIG_SERIAL_SAMSUNG=y
 CONFIG_SERIAL_SAMSUNG_CONSOLE=y
 CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_S3C_BOOT_ERROR_RESET=y
-CONFIG_S3C_BOOT_UART_FORCE_FIFO=y
-CONFIG_S3C_LOWLEVEL_UART_PORT=0
-CONFIG_S3C_GPIO_SPACE=8
-CONFIG_S3C_ADC=y
-CONFIG_S3C24XX_PWM=y
 # CONFIG_SAMSUNG_PM_DEBUG is not set
 # CONFIG_SAMSUNG_PM_CHECK is not set
 CONFIG_SOC_EXYNOS5250=y
@@ -63,10 +57,8 @@ CONFIG_PCI_EXYNOS=y
 
 CONFIG_ARM_CCI=y
 CONFIG_TCG_TIS_I2C_INFINEON=m
-CONFIG_I2C_S3C2410=m
 CONFIG_PINCTRL_EXYNOS=y
 CONFIG_PINCTRL_EXYNOS5440=y
-CONFIG_S3C2410_WATCHDOG=m
 CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
 CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
 CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
@@ -91,24 +83,16 @@ CONFIG_SND_SOC_SAMSUNG=m
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_S5P=m
 CONFIG_USB_OHCI_EXYNOS=y
-CONFIG_S3C_DEV_HSMMC=y
-CONFIG_MMC_SDHCI_S3C=m
-CONFIG_MMC_SDHCI_S3C_DMA=y
-CONFIG_RTC_DRV_S3C=m
 CONFIG_PWM_SAMSUNG=m
-CONFIG_S3C_BOOT_WATCHDOG=y
 CONFIG_SAMSUNG_GPIO_EXTRA=8
 CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-CONFIG_BATTERY_S3C_ADC=m
-CONFIG_SENSORS_S3C=m
-CONFIG_SENSORS_S3C_RAW=y
-CONFIG_FB_S3C_DEBUG_REGWRITE=y
 CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m
 CONFIG_USB_EHCI_S5P=y
 CONFIG_SAMSUNG_USBPHY=m
 CONFIG_SAMSUNG_USB2PHY=m
 CONFIG_SAMSUNG_USB3PHY=m
 CONFIG_MMC_DW_EXYNOS=m
+CONFIG_RTC_DRV_S3C=m
 
 # Chromebook
 CONFIG_MFD_CROS_EC=m
@@ -123,7 +107,14 @@ CONFIG_REGULATOR_MAX8997=m
 CONFIG_REGULATOR_S5M8767=m
 CONFIG_COMMON_CLK_MAX77686=m
 
+CONFIG_S3C_LOWLEVEL_UART_PORT=1
 # CONFIG_EXYNOS4_SDHCI_CH0_8BIT is not set
 # CONFIG_EXYNOS4_SDHCI_CH2_8BIT is not set
 
 # CONFIG_SGI_IOC4 is not set
+#
+# CONFIG_S3C_BOOT_ERROR_RESET is not set
+# CONFIG_S3C_BOOT_UART_FORCE_FIFO is not set
+# CONFIG_I2C_S3C2410 is not set
+# CONFIG_S3C2410_WATCHDOG is not set
+# CONFIG_MMC_SDHCI_S3C is not set
diff --git a/config-generic b/config-generic
index d35de6c16..5d655c1ad 100644
--- a/config-generic
+++ b/config-generic
@@ -1384,6 +1384,7 @@ CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_PCMCIA_SMC91C92=m
 CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
 CONFIG_SMSC9420=m
 
 CONFIG_NET_VENDOR_STMICRO=y
diff --git a/config-s390x b/config-s390x
index 9460b7154..ab6565634 100644
--- a/config-s390x
+++ b/config-s390x
@@ -272,3 +272,5 @@ CONFIG_HOTPLUG_PCI_S390=m
 # CONFIG_I2C_PARPORT is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
 # CONFIG_I2C_NFORCE2 is not set
+# CONFIG_DW_DMAC is not set
+# CONFIG_DW_DMAC_PCI is not set
diff --git a/kernel.spec b/kernel.spec
index 144f824b3..2d2b8c2e8 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2281,6 +2281,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Thu Jul 11 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+- ARM config cleanups and changes for 3.11
+
 * Wed Jul 10 2013 Kyle McMartin <kyle@redhat.com>
 - Fix crash-driver.patch to properly use page_is_ram.