Update ARM configs:

- Move usb gadget from armv7 to armv70-generic
- Cleanup some old OMAP config changes
- Update a few config options based on a number of ARM defconfigs updated upstream
- Fix up some conflicting or differing options between arm config files

5 files changed, 58 insertions, 60 deletions

diff --git a/config-arm-generic b/config-arm-generic
index 320da296f..c35084902 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -25,6 +25,7 @@ CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
 CONFIG_NR_CPUS=8
 CONFIG_ARM_DMA_USE_IOMMU=y
 CONFIG_DMA_VIRTUAL_CHANNELS=y
+CONFIG_FB_SIMPLE=y
 
 # ARM AMBA generic HW
 CONFIG_ARM_AMBA=y
@@ -89,6 +90,7 @@ CONFIG_MTD_PHYSMAP_OF=m
 # GPIO
 CONFIG_GPIO_DEVRES=y
 CONFIG_GPIO_GENERIC=m
+CONFIG_GPIO_GENERIC_PLATFORM=m
 CONFIG_GPIOLIB=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
@@ -109,6 +111,9 @@ CONFIG_I2C_MUX_PCA9541=m
 CONFIG_SENSORS_IIO_HWMON=m
 CONFIG_IIO_SYSFS_TRIGGER=m
 
+# PHY framework
+CONFIG_GENERIC_PHY=m
+
 # MFD
 CONFIG_MFD_CORE=m
 
diff --git a/config-armv7 b/config-armv7
index f5482c534..4352c8b4f 100644
--- a/config-armv7
+++ b/config-armv7
@@ -4,7 +4,9 @@
 # CONFIG_ARCH_KEYSTONE is not set
 CONFIG_ARCH_MVEBU=y
 CONFIG_ARCH_MXC=y
-CONFIG_ARCH_OMAP2PLUS=y
+# CONFIG_ARCH_OMAP2 is not set
+CONFIG_ARCH_OMAP3=y
+CONFIG_ARCH_OMAP4=y
 CONFIG_ARCH_PICOXCELL=y
 CONFIG_ARCH_ROCKCHIP=y
 CONFIG_ARCH_SOCFPGA=y
@@ -51,38 +53,29 @@ CONFIG_ARMADA_THERMAL=m
 
 # omap 
 CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
-# CONFIG_ARCH_OMAP2 is not set
-CONFIG_ARCH_OMAP3=y
-CONFIG_ARCH_OMAP4=y
 CONFIG_SOC_OMAP5=y
 # CONFIG_SOC_DRA7XX is not set
-# CONFIG_SOC_OMAP2420 is not set
-# CONFIG_SOC_OMAP2430 is not set
 CONFIG_SOC_OMAP3430=y
 CONFIG_SOC_TI81XX=y
-CONFIG_MACH_OMAP_GENERIC=y
-CONFIG_MACH_OMAP3_BEAGLE=y
+CONFIG_MACH_CRANEBOARD=y
 CONFIG_MACH_DEVKIT8000=y
+# CONFIG_MACH_NOKIA_RX51 is not set
+CONFIG_MACH_OMAP_3630SDP=y
+CONFIG_MACH_OMAP_GENERIC=y
 CONFIG_MACH_OMAP_LDP=y
-CONFIG_MACH_OMAP3530_LV_SOM=y
-CONFIG_MACH_OMAP3_TORPEDO=y
-CONFIG_MACH_OVERO=y
+CONFIG_MACH_OMAP3_BEAGLE=y
 # CONFIG_MACH_OMAP3EVM is not set
+CONFIG_MACH_OMAP_3430SDP=y
+CONFIG_MACH_OMAP3530_LV_SOM=y
 # CONFIG_MACH_OMAP3517EVM is not set
-CONFIG_MACH_CRANEBOARD=y
 CONFIG_MACH_OMAP3_PANDORA=y
+CONFIG_MACH_OMAP3_TORPEDO=y
+CONFIG_MACH_OVERO=y
 CONFIG_MACH_TOUCHBOOK=y
-CONFIG_MACH_OMAP_3430SDP=y
-# CONFIG_MACH_NOKIA_N8X0 is not set
-# CONFIG_MACH_NOKIA_RM680 is not set
-# CONFIG_MACH_NOKIA_RX51 is not set
-CONFIG_MACH_OMAP_ZOOM2=y
-CONFIG_MACH_OMAP_ZOOM3=y
 CONFIG_MACH_CM_T35=y
 CONFIG_MACH_CM_T3517=y
 CONFIG_MACH_IGEP0030=y
 CONFIG_MACH_SBC3530=y
-CONFIG_MACH_OMAP_3630SDP=y
 # CONFIG_MACH_TI8168EVM is not set
 # CONFIG_MACH_TI8148EVM is not set
 
@@ -318,8 +311,6 @@ CONFIG_DRM_TILCDC=m
 CONFIG_SPI_DAVINCI=m
 CONFIG_SND_DAVINCI_SOC=m
 CONFIG_REGULATOR_TI_ABB=y
-CONFIG_TI_PRIV_EDMA=y
-CONFIG_TI_EDMA=y
 CONFIG_TI_CPPI41=m
 CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_CHARGER_BQ24190=m
@@ -334,7 +325,7 @@ CONFIG_SUNXI_WATCHDOG=m
 CONFIG_MDIO_SUN4I=m
 CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_SUN4I_EMAC=m
-# CONFIG_EEPROM_SUNXI_SID is not set
+CONFIG_EEPROM_SUNXI_SID=m
 
 # imx 
 CONFIG_MXC_IRQ_PRIOR=y
@@ -568,7 +559,6 @@ CONFIG_DRM_TEGRA=y
 
 CONFIG_CRYPTO_DEV_TEGRA_AES=m
 
-CONFIG_LEDS_RENESAS_TPU=y
 CONFIG_GPIO_PCA953X=m
 
 # OLPC XO
@@ -614,41 +604,6 @@ CONFIG_REGULATOR_MAX8907=m
 CONFIG_REGULATOR_MAX8952=m
 CONFIG_REGULATOR_MAX8973=m
 
-# usb gadget 
-CONFIG_USB_GADGET=m
-CONFIG_USB_GADGET_MUSB_HDRC=m
-CONFIG_USB_MUSB_HDRC=m
-CONFIG_USB_MUSB_DUAL_ROLE=y
-CONFIG_USB_MUSB_DSPS=m
-CONFIG_USB_GPIO_VBUS=m
-# CONFIG_MUSB_PIO_ONLY is not set
-# CONFIG_USB_MUSB_DEBUG is not set
-CONFIG_USB_GADGET_VBUS_DRAW=100
-CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
-# CONFIG_USB_FSL_USB2 is not set
-# CONFIG_USB_FUSB300 is not set
-# CONFIG_USB_RENESAS_USBHS is not set
-# CONFIG_USB_GADGET_DEBUG is not set
-# CONFIG_USB_GADGET_DEBUG_FILES is not set
-# CONFIG_USB_GADGET_DEBUG_FS is not set
-# CONFIG_USB_GADGET_VBUS_DRAW is not set
-# CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS is not set
-# CONFIG_USB_FOTG210_UDC is not set
-# CONFIG_USB_R8A66597 is not set
-# CONFIG_USB_PXA27X is not set
-# CONFIG_USB_MV_UDC is not set
-# CONFIG_USB_MV_U3D is not set
-# CONFIG_USB_M66592 is not set
-# CONFIG_USB_AMD5536UDC is not set
-# CONFIG_USB_NET2272 is not set
-# CONFIG_USB_NET2280 is not set
-# CONFIG_USB_GOKU is not set
-# CONFIG_USB_EG20T is not set
-# CONFIG_USB_DUMMY_HCD is not set
-# CONFIG_USB_ZERO_HNPTEST is not set
-# CONFIG_USB_ETH_RNDIS is not set
-# CONFIG_USB_ETH_EEM is not set
-
 # Needs work/investigation
 # CONFIG_MTD_AFS_PARTS is not set
 # CONFIG_IP_PNP_RARP is not set
diff --git a/config-armv7-generic b/config-armv7-generic
index 980e5ff10..f32e2f7f4 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -167,6 +167,39 @@ CONFIG_AX88796_93CX6=y
 CONFIG_USB_ISP1760_HCD=m
 # CONFIG_USB_EHCI_HCD_ORION is not set
 
+# usb gadget 
+CONFIG_USB_GADGET=m
+CONFIG_USB_GADGET_MUSB_HDRC=m
+CONFIG_USB_MUSB_HDRC=m
+CONFIG_USB_MUSB_DUAL_ROLE=y
+CONFIG_USB_MUSB_DSPS=m
+CONFIG_USB_GPIO_VBUS=m
+# CONFIG_MUSB_PIO_ONLY is not set
+# CONFIG_USB_MUSB_DEBUG is not set
+CONFIG_USB_GADGET_VBUS_DRAW=100
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+# CONFIG_USB_FSL_USB2 is not set
+# CONFIG_USB_FUSB300 is not set
+# CONFIG_USB_RENESAS_USBHS is not set
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+# CONFIG_USB_FOTG210_UDC is not set
+# CONFIG_USB_R8A66597 is not set
+# CONFIG_USB_PXA27X is not set
+# CONFIG_USB_MV_UDC is not set
+# CONFIG_USB_MV_U3D is not set
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_AMD5536UDC is not set
+# CONFIG_USB_NET2272 is not set
+# CONFIG_USB_NET2280 is not set
+# CONFIG_USB_GOKU is not set
+# CONFIG_USB_EG20T is not set
+# CONFIG_USB_DUMMY_HCD is not set
+# CONFIG_USB_ZERO_HNPTEST is not set
+# CONFIG_USB_ETH_RNDIS is not set
+# CONFIG_USB_ETH_EEM is not set
+
 # Multifunction Devices
 CONFIG_MFD_TPS65090=y
 CONFIG_MFD_TPS65217=y
@@ -189,7 +222,6 @@ CONFIG_GENERIC_PINCONF=y
 # CONFIG_PINCTRL_EXYNOS4 is not set
 
 # GPIO
-CONFIG_GPIO_GENERIC_PLATFORM=m
 # CONFIG_GPIO_EM is not set
 CONFIG_GPIO_ADNP=m
 CONFIG_GPIO_MCP23S08=m
@@ -236,6 +268,10 @@ CONFIG_I2C_DESIGNWARE_PLATFORM=m
 CONFIG_CRYPTO_SHA1_ARM=m
 CONFIG_CRYPTO_AES_ARM=m
 
+# DMA
+CONFIG_TI_PRIV_EDMA=y
+CONFIG_TI_EDMA=y
+
 # EDAC
 CONFIG_EDAC=y
 CONFIG_EDAC_MM_EDAC=m
diff --git a/config-armv7-lpae b/config-armv7-lpae
index f107d4d21..21ef6b2ba 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -59,7 +59,6 @@ CONFIG_XEN_GNTDEV=y
 CONFIG_XEN_GRANT_DEV_ALLOC=m
 CONFIG_XEN_WDT=m
 
-CONFIG_MACH_EXYNOS5_DT=y
 CONFIG_SERIAL_SAMSUNG=y
 CONFIG_SERIAL_SAMSUNG_CONSOLE=y
 # CONFIG_SAMSUNG_PM_DEBUG is not set
diff --git a/kernel.spec b/kernel.spec
index bd7da9b89..efe23391b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2238,6 +2238,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Wed Nov 13 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+- Update ARM configs
+
 * Wed Nov 13 2013 Josh Boyer <jwboyer@fedoraproject.org> - 3.13.0-0.rc0.git3.2
 - Enable USER_NS for root-only processes (rhbz 917708)