Initial ARM config for 3.11

6 files changed, 47 insertions, 33 deletions

diff --git a/config-arm-generic b/config-arm-generic
index e00b2501..58f6fa16 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -1,7 +1,7 @@
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
-CONFIG_ARM_AMBA=y
 CONFIG_ARM_ARCH_TIMER=y
 # CONFIG_ARM_DT_BL_CPUFREQ is not set
+CONFIG_ARM_AMBA=y
 CONFIG_ARM_GIC=y
 # CONFIG_ASYMMETRIC_KEY_TYPE is not set
 CONFIG_BACKLIGHT_PWM=m
@@ -40,7 +40,12 @@ CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_RTC_DRV_SNVS is not set
 CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 CONFIG_SERIAL_AMBA_PL011=y
-CONFIG_SERIO_OLPC_APSP=m
+
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_CHAR=m
+CONFIG_MTD_OF_PARTS=m
+CONFIG_OF_MTD=y
 
 # CONFIG_CRYPTO_TEST is not set
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
diff --git a/config-arm64 b/config-arm64
index efeb8c37..0b460299 100644
--- a/config-arm64
+++ b/config-arm64
@@ -283,10 +283,6 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y
 CONFIG_MOUSE_PS2_SYNAPTICS=y
 CONFIG_MOUSE_PS2_TRACKPOINT=y
 CONFIG_MRP=m
-CONFIG_MTD_BLKDEVS=m
-CONFIG_MTD_BLOCK=m
-CONFIG_MTD_CHAR=m
-CONFIG_MTD_OF_PARTS=m
 CONFIG_MUTEX_SPIN_ON_OWNER=y
 CONFIG_NEED_DMA_MAP_STATE=y
 CONFIG_NEED_SG_DMA_LENGTH=y
diff --git a/config-armv7 b/config-armv7
index 7d9b2d92..2eb9a14d 100644
--- a/config-armv7
+++ b/config-armv7
@@ -2,13 +2,16 @@
 
 # CONFIG_ARCH_BCM is not set
 CONFIG_ARCH_HIGHBANK=y
+# CONFIG_ARCH_KEYSTONE is not set
 CONFIG_ARCH_MVEBU=y
 CONFIG_ARCH_MXC=y
 CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_ARCH_PICOXCELL=y
+CONFIG_ARCH_ROCKCHIP=y
 # CONFIG_ARCH_SIRF is not set
 CONFIG_ARCH_SOCFPGA=y
 # CONFIG_PLAT_SPEAR is not set
+# CONFIG_ARCH_STI is not set
 CONFIG_ARCH_SUNXI=y
 CONFIG_ARCH_TEGRA=y
 # CONFIG_ARCH_U8500 is not set
@@ -52,6 +55,8 @@ CONFIG_MACH_ARMADA_370_XP=y
 CONFIG_MACH_ARMADA_370=y
 CONFIG_MACH_ARMADA_XP=y
 
+CONFIG_MVEBU_DEVBUS=y
+CONFIG_PCI_MVEBU=y
 CONFIG_CACHE_TAUROS2=y
 CONFIG_MV_XOR=y
 CONFIG_CRYPTO_DEV_MV_CESA=m
@@ -86,6 +91,7 @@ CONFIG_SOC_OMAP5=y
 CONFIG_SOC_OMAP3430=y
 CONFIG_SOC_TI81XX=y
 CONFIG_SOC_AM33XX=y
+CONFIG_SOC_AM43XX=y
 CONFIG_MACH_OMAP_GENERIC=y
 CONFIG_MACH_OMAP3_BEAGLE=y
 CONFIG_MACH_DEVKIT8000=y
@@ -123,6 +129,7 @@ CONFIG_OMAP_32K_TIMER_HZ=128
 # CONFIG_OMAP3_L2_AUX_SECURE_SAVE_RESTORE is not set
 
 CONFIG_OMAP_MCBSP=y
+CONFIG_OMAP2PLUS_MBOX=m
 CONFIG_OMAP_MBOX_FWK=m
 CONFIG_OMAP_MBOX_KFIFO_SIZE=256
 CONFIG_OMAP_DM_TIMER=y
@@ -134,6 +141,8 @@ CONFIG_OMAP3_EMU=y
 CONFIG_ARM_OMAP2PLUS_CPUFREQ=y
 
 CONFIG_TI_ST=m
+CONFIG_TI_EDMA=m
+CONFIG_TI_SOC_THERMAL=m
 CONFIG_TI_DAC7512=m
 CONFIG_TI_DAVINCI_EMAC=m
 CONFIG_TI_DAVINCI_MDIO=m
@@ -142,6 +151,7 @@ CONFIG_TI_CPSW=m
 CONFIG_TI_CPTS=y
 CONFIG_TI_EMIF=m
 CONFIG_MFD_TPS65217=m
+CONFIG_REGULATOR_TI_ABB=y
 CONFIG_REGULATOR_TPS65217=m
 CONFIG_BACKLIGHT_TPS65217=m
 
@@ -384,6 +394,7 @@ CONFIG_MACH_IMX51_DT=y
 # CONFIG_MACH_EUKREA_CPUIMX51SD is not set
 CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
+CONFIG_SOC_IMX6SL=y
 CONFIG_PATA_IMX=m
 CONFIG_NET_VENDOR_FREESCALE=y
 CONFIG_FEC=m
@@ -393,10 +404,13 @@ CONFIG_SERIAL_IMX_CONSOLE=y
 CONFIG_I2C_IMX=m
 CONFIG_SPI_IMX=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=m
+CONFIG_SND_SOC_IMX_WM8962=m
 CONFIG_USB_EHCI_MXC=m
 CONFIG_USB_IMX21_HCD=m
 CONFIG_USB_MXS_PHY=m
@@ -414,9 +428,10 @@ CONFIG_PWM_IMX=m
 CONFIG_BACKLIGHT_PWM=m
 CONFIG_DRM_IMX=m
 CONFIG_DRM_IMX_FB_HELPER=m
-CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
 CONFIG_DRM_IMX_IPUV3_CORE=m
 CONFIG_DRM_IMX_IPUV3=m
+CONFIG_DRM_IMX_LDB=m
+CONFIG_DRM_IMX_PARALLEL_DISPLAY=m
 CONFIG_DRM_IMX_TVE=m
 CONFIG_VIDEO_CODA=m
 
@@ -472,6 +487,9 @@ CONFIG_STE_MODEM_RPROC=m
 CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
 # CONFIG_ARCH_TEGRA_114_SOC is not set
+CONFIG_ARM_TEGRA_CPUFREQ=y
+CONFIG_TEGRA20_MC=y
+CONFIG_TEGRA30_MC=y
 
 CONFIG_SERIAL_TEGRA=y
 
@@ -499,13 +517,14 @@ CONFIG_RTC_DRV_TEGRA=y
 
 CONFIG_SND_SOC_TEGRA=m
 CONFIG_SND_SOC_TEGRA_ALC5632=m
+CONFIG_SND_SOC_TEGRA_RT5640=m
+CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
 CONFIG_SND_SOC_TEGRA_WM8753=m
 CONFIG_SND_SOC_TEGRA_WM8903=m
 CONFIG_SND_SOC_TEGRA_WM9712=m
-CONFIG_SND_SOC_TEGRA_TRIMSLICE=m
+CONFIG_SND_SOC_TEGRA20_AC97=m
 CONFIG_SND_SOC_TEGRA30_AHUB=m
 CONFIG_SND_SOC_TEGRA30_I2S=m
-CONFIG_SND_SOC_TEGRA20_AC97=m
 
 # AC100 (PAZ00)
 CONFIG_MFD_NVEC=y
@@ -534,6 +553,9 @@ CONFIG_CRYPTO_DEV_TEGRA_AES=m
 
 CONFIG_LEDS_RENESAS_TPU=y
 
+# OLPC XO
+CONFIG_SERIO_OLPC_APSP=m
+
 # ZYNQ
 CONFIG_LATTICE_ECP3_CONFIG=m
 
@@ -638,24 +660,9 @@ CONFIG_REGULATOR_LP8755=m
 # CONFIG_CRYPTO_DEV_UX500_DEBUG is not set
 # CONFIG_AB8500_DEBUG is not set
 
-# FIX ME
-# CONFIG_ARCH_KEYSTONE is not set
-# CONFIG_SOC_IMX6SL is not set
+# FIXME
 # CONFIG_SOC_VF610 is not set
-# CONFIG_SOC_AM43XX is not set
-# CONFIG_ARCH_ROCKCHIP is not set
-# CONFIG_ARCH_STI is not set
-# CONFIG_PCI_MVEBU is not set
-# CONFIG_ARM_TEGRA_CPUFREQ is not set
-# CONFIG_IMX_WEIM is not set
 # CONFIG_ARM_CCI is not set
-# CONFIG_SERIAL_UARTLITE is not set
 # CONFIG_GPIO_XILINX is not set
-# CONFIG_REGULATOR_TI_ABB is not set
-# CONFIG_SND_SOC_IMX_WM8962 is not set
-# CONFIG_SND_SOC_TEGRA_RT5640 is not set
-# CONFIG_TI_EDMA is not set
-# CONFIG_TI_SOC_THERMAL is not set
-# CONFIG_DRM_IMX_LDB is not set
-# CONFIG_OMAP2PLUS_MBOX is not set
-# CONFIG_CRYPTO_DEV_SAHARA is not set
+# CONFIG_SERIAL_UARTLITE is not set
+
diff --git a/config-armv7-generic b/config-armv7-generic
index 36acf222..baaf9620 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -245,7 +245,6 @@ CONFIG_POWER_RESET_RESTART=y
 CONFIG_ARM_PSCI=y
 
 # MTD
-CONFIG_MTD_OF_PARTS=y
 # CONFIG_MG_DISK is not set
 CONFIG_MTD_DATAFLASH=m
 CONFIG_MTD_DATAFLASH_WRITE_VERIFY=y
@@ -257,13 +256,20 @@ CONFIG_EEPROM_93XX46=m
 
 # MMC/SD
 CONFIG_MMC_SPI=m
+
+# Designware (used by numerous devices)
 CONFIG_MMC_DW=m
 CONFIG_MMC_DW_PLTFM=m
 CONFIG_MMC_DW_PCI=m
 CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_DW_PCI=m
+CONFIG_USB_DWC3=m
 # CONFIG_MMC_DW_EXYNOS is not set
 # CONFIG_MMC_DW_IDMAC is not set
+CONFIG_USB_DWC2=m
+CONFIG_USB_DWC3=m
+# CONFIG_USB_DWC3_DEBUG is not set
+CONFIG_DW_WATCHDOG=m
 
 # Sound
 CONFIG_SND_ARM=y
diff --git a/config-armv7-lpae b/config-armv7-lpae
index 87bbc48b..0798e2d3 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -8,6 +8,8 @@ CONFIG_ARCH_EXYNOS5=y
 # CONFIG_EXYNOS_ATAGS is not set
 
 CONFIG_ARM_LPAE=y
+CONFIG_SYS_SUPPORTS_HUGETLBFS=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
 CONFIG_VIRTIO_CONSOLE=m
 CONFIG_ARM_VIRT_EXT=y
 CONFIG_VIRTUALIZATION=y
@@ -89,8 +91,6 @@ CONFIG_SND_SOC_SAMSUNG=m
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_S5P=m
 CONFIG_USB_OHCI_EXYNOS=y
-CONFIG_USB_DWC3=m
-# CONFIG_USB_DWC3_DEBUG is not set
 CONFIG_S3C_DEV_HSMMC=y
 CONFIG_MMC_SDHCI_S3C=m
 CONFIG_MMC_SDHCI_S3C_DMA=y
@@ -108,9 +108,6 @@ CONFIG_USB_EHCI_S5P=y
 CONFIG_SAMSUNG_USBPHY=m
 CONFIG_SAMSUNG_USB2PHY=m
 CONFIG_SAMSUNG_USB3PHY=m
-CONFIG_MMC_DW=m
-CONFIG_MMC_DW_PLTFM=m
-CONFIG_MMC_DW_PCI=m
 CONFIG_MMC_DW_EXYNOS=m
 
 # Chromebook
diff --git a/kernel.spec b/kernel.spec
index 3d418a67..bb5b3908 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2287,6 +2287,9 @@ fi
 #                 ||----w |
 #                 ||     ||
 %changelog
+* Mon Jul  8 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+- Initial ARM config for 3.11
+
 * Mon Jul 08 2013 Justin M. Forbes <jforbes@redhat.com> - 3.11.0-0.rc0.git2.1
 - Linux v3.10-6005-gd2b4a64
 - Reenable debugging options.