- 3.17 ARMv7 updates

- Cleanup some old removed options
- Disable legacy USB OTG (using new configfs equivilents)

9 files changed, 54 insertions, 82 deletions

diff --git a/config-arm-generic b/config-arm-generic
index cd81d766d..7cbaeefec 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -42,6 +42,7 @@ CONFIG_HAVE_PERF_USER_STACK_DUMP=y
 # ARM AMBA generic HW
 CONFIG_ARM_AMBA=y
 CONFIG_ARM_CCI=y
+CONFIG_ARM_CCN=y
 CONFIG_ARM_DMA_USE_IOMMU=y
 CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8
 CONFIG_ARM_GIC=y
@@ -143,8 +144,8 @@ CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_I2C_MUX_PCA9541=m
 CONFIG_I2C_MUX_PCA954x=m
 
-# bus
-# CONFIG_ARM_CCN is not set
+# spi
+CONFIG_SPI_PL022=m
 
 # Sensors
 CONFIG_SENSORS_IIO_HWMON=m
@@ -261,21 +262,7 @@ CONFIG_CMA_AREAS=7
 
 # CONFIG_DEBUG_SET_MODULE_RONX is not set
 
-# spi
-# CONFIG_SPI_ALTERA is not set
-# CONFIG_SPI_BITBANG is not set
-# CONFIG_SPI_GPIO is not set
-# CONFIG_SPI_FSL_SPI is not set
-# CONFIG_SPI_OC_TINY is not set
-# CONFIG_SPI_PL022 is not set
-# CONFIG_SPI_ROCKCHIP is not set
-# CONFIG_SPI_SC18IS602 is not set
-# CONFIG_SPI_XCOMM is not set
-# CONFIG_SPI_XILINX is not set
-# CONFIG_SPI_DESIGNWARE is not set
-# CONFIG_SPI_SPIDEV is not set
-# CONFIG_SPI_TLE62X0 is not set
-# 
 # CONFIG_LATTICE_ECP3_CONFIG is not set
 # CONFIG_BMP085_SPI is not set
 # CONFIG_TI_DAC7512 is not set
+# CONFIG_SPI_ROCKCHIP is not set
diff --git a/config-arm64 b/config-arm64
index 5498c624d..f6c244ef6 100644
--- a/config-arm64
+++ b/config-arm64
@@ -30,7 +30,6 @@ CONFIG_GENERIC_ACL=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
 CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
 CONFIG_GENERIC_CSUM=y
-CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_IO=y
 CONFIG_GENERIC_PCI_IOMAP=y
@@ -85,6 +84,7 @@ CONFIG_CRYPTO_DEV_CCP=y
 CONFIG_CRYPTO_DEV_CCP_DD=m
 CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
 
+CONFIG_I2C_ACPI=y
 
 # APM Xgene
 CONFIG_POWER_RESET_XGENE=y
diff --git a/config-armv7 b/config-armv7
index 3ad36c3d3..375cea04b 100644
--- a/config-armv7
+++ b/config-armv7
@@ -10,7 +10,6 @@ CONFIG_ARCH_OMAP4=y
 CONFIG_ARCH_PICOXCELL=y
 CONFIG_ARCH_QCOM=y
 CONFIG_ARCH_ROCKCHIP=y
-# CONFIG_ARCH_SOCFPGA is not set
 CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_U8500=y
 # CONFIG_ARCH_VIRT is not set
@@ -39,7 +38,7 @@ CONFIG_MV643XX_ETH=m
 CONFIG_PINCTRL_MVEBU=y
 CONFIG_PINCTRL_ARMADA_370=y
 CONFIG_PINCTRL_ARMADA_XP=y
-# CONFIG_ARM_ARMADA_370_XP_CPUIDLE is not set
+# CONFIG_ARM_MVEBU_V7_CPUIDLE is not set
 CONFIG_PINCTRL_DOVE=y
 CONFIG_EDAC_MV64X60=m
 CONFIG_RTC_DRV_S35390A=m
@@ -68,7 +67,6 @@ CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
 CONFIG_USB_EHCI_HCD_ORION=m
 CONFIG_MMC_SDHCI_PXAV3=m
 CONFIG_MVPP2=m
-# CONFIG_ARM_MVEBU_V7_CPUIDLE is not set
 # CONFIG_CACHE_FEROCEON_L2 is not set
 # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
 
@@ -111,13 +109,11 @@ CONFIG_OMAP_PACKAGE_CUS=y
 
 CONFIG_OMAP_MCBSP=y
 CONFIG_OMAP2PLUS_MBOX=m
-CONFIG_OMAP_MBOX_FWK=m
 CONFIG_OMAP_MBOX_KFIFO_SIZE=256
 CONFIG_OMAP_DM_TIMER=y
 CONFIG_OMAP_PM_NOOP=y
 CONFIG_DMA_OMAP=y
 CONFIG_OMAP_IOMMU=y
-CONFIG_OMAP_IOVMM=m
 CONFIG_HWSPINLOCK_OMAP=m
 CONFIG_OMAP3_EMU=y
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
@@ -217,7 +213,6 @@ CONFIG_PWM_TIECAP=m
 CONFIG_PWM_TIEHRPWM=m
 CONFIG_PWM_TWL=m
 CONFIG_PWM_TWL_LED=m
-CONFIG_PWM_ROCKCHIP=m
 
 CONFIG_CRYPTO_DEV_OMAP_SHAM=m
 CONFIG_CRYPTO_DEV_OMAP_AES=m
@@ -305,16 +300,6 @@ CONFIG_RADIO_WL128X=m
 
 CONFIG_OMAP_REMOTEPROC=m
 
-# CONFIG_TIDSPBRIDGE is not set
-# CONFIG_TIDSPBRIDGE_MEMPOOL_SIZE=0x600000
-# CONFIG_TIDSPBRIDGE_DEBUG is not set
-# CONFIG_TIDSPBRIDGE_RECOVERY=y
-# CONFIG_TIDSPBRIDGE_CACHE_LINE_CHECK is not set
-# CONFIG_TIDSPBRIDGE_WDT3=y
-# CONFIG_TIDSPBRIDGE_WDT_TIMEOUT=5
-# CONFIG_TIDSPBRIDGE_NTFY_PWRERR is not set
-# CONFIG_TIDSPBRIDGE_BACKTRACE is not set
-
 # CONFIG_OMAP2_DSS_DEBUGFS is not set
 # CONFIG_OMAP_IOMMU_DEBUG is not set
 # CONFIG_OMAP_MUX_DEBUG is not set
@@ -347,6 +332,7 @@ CONFIG_SND_DAVINCI_SOC_I2S=m
 CONFIG_SND_DAVINCI_SOC_MCASP=m
 CONFIG_SND_DAVINCI_SOC_VCIF=m
 CONFIG_SND_DAVINCI_SOC_GENERIC_EVM=m
+CONFIG_SND_EDMA_SOC=m
 CONFIG_SND_AM33XX_SOC_EVM=m
 CONFIG_REGULATOR_TI_ABB=m
 CONFIG_TI_ADC081C=m
@@ -363,6 +349,16 @@ CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
 CONFIG_PINCTRL_APQ8064=m
 CONFIG_PINCTRL_IPQ8064=m
+CONFIG_PINCTRL_MSM8960=m
+CONFIG_COMMON_CLK_QCOM=m
+CONFIG_APQ_GCC_8084=m
+CONFIG_APQ_MMCC_8084=m
+CONFIG_IPQ_GCC_806X=m
+CONFIG_MSM_GCC_8660=m
+CONFIG_MSM_GCC_8960=m
+CONFIG_MSM_MMCC_8960=m
+CONFIG_MSM_GCC_8974=m
+CONFIG_MSM_MMCC_8974=m
 CONFIG_HW_RANDOM_MSM=m
 CONFIG_I2C_QUP=m
 CONFIG_SPI_QUP=m
@@ -385,18 +381,20 @@ CONFIG_USB_EHCI_MSM=m
 CONFIG_MXC_IRQ_PRIOR=y
 # CONFIG_MXC_DEBUG_BOARD is not set
 CONFIG_SOC_IMX50=y
-# CONFIG_SOC_IMX51 is not set
+CONFIG_SOC_IMX51=y
 CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
 CONFIG_SOC_IMX6SX=y
 # CONFIG_SOC_VF610 is not set
-CONFIG_MACH_IMX51_DT=y
-# CONFIG_MACH_MX51_BABBAGE is not set
 CONFIG_ARM_IMX6Q_CPUFREQ=m
+CONFIG_PCI_IMX6=y
 CONFIG_IMX_THERMAL=m
+CONFIG_IMX_SDMA=m
+CONFIG_IMX_DMA=m
+CONFIG_MXS_DMA=y
+CONFIG_AHCI_IMX=m
 CONFIG_PATA_IMX=m
-CONFIG_PCI_IMX6=y
 CONFIG_USB_EHCI_MXC=m
 CONFIG_USB_CHIPIDEA=m
 CONFIG_USB_CHIPIDEA_UDC=y
@@ -414,10 +412,12 @@ CONFIG_PINCTRL_IMX6SL=y
 CONFIG_I2C_IMX=m
 CONFIG_STMPE_I2C=y
 CONFIG_SPI_IMX=m
+CONFIG_SPI_FSL_QUADSPI=m
 CONFIG_STMPE_SPI=y
 CONFIG_MFD_MC13783=m
 CONFIG_MFD_MC13XXX_SPI=m
 CONFIG_MFD_STMPE=y
+CONFIG_MTD_NAND_GPMI_NAND=m
 CONFIG_W1_MASTER_MXC=m
 CONFIG_IMX_WEIM=y
 CONFIG_IMX2_WDT=m
@@ -428,6 +428,7 @@ CONFIG_RTC_DRV_SNVS=m
 # CONFIG_FB_IMX is not set
 
 CONFIG_SND_IMX_SOC=m
+CONFIG_SND_SOC_FSL_ASRC=m
 CONFIG_SND_SOC_FSL_ESAI=m
 CONFIG_SND_SOC_FSL_SAI=m
 CONFIG_SND_SOC_FSL_SPDIF=m
@@ -443,6 +444,7 @@ CONFIG_SND_SOC_IMX_MC13783=m
 CONFIG_SND_SOC_IMX_SPDIF=m
 CONFIG_SND_SOC_EUKREA_TLV320=m
 CONFIG_SND_SOC_TVL320AIC32X4=m
+CONFIG_SND_SOC_WM8731=m
 
 CONFIG_USB_IMX21_HCD=m
 CONFIG_USB_MXS_PHY=m
@@ -453,10 +455,6 @@ CONFIG_RTC_DRV_IMXDI=m
 CONFIG_RTC_DRV_MXC=m
 # CONFIG_MX3_IPU is not set
 # CONFIG_MX3_IPU_IRQS is not set
-CONFIG_IMX_SDMA=m
-CONFIG_IMX_DMA=m
-CONFIG_AHCI_IMX=m
-# CONFIG_MXS_DMA is not set
 
 CONFIG_PWM_IMX=m
 CONFIG_DRM_IMX=m
@@ -510,6 +508,9 @@ CONFIG_REGULATOR_DA9055=m
 
 # Rockchips
 CONFIG_I2C_RK3X=m
+CONFIG_SPI_ROCKCHIP=m
+CONFIG_SND_SOC_ROCKCHIP=m
+CONFIG_PWM_ROCKCHIP=m
 
 # ST Ericsson
 CONFIG_MACH_HREFV60=y
@@ -596,7 +597,6 @@ CONFIG_PINCTRL_TEGRA30=y
 CONFIG_USB_EHCI_TEGRA=m
 CONFIG_RTC_DRV_TEGRA=m
 CONFIG_CRYPTO_DEV_TEGRA_AES=m
-CONFIG_NOUVEAU_PLATFORM_DRIVER=m
 
 CONFIG_SND_SOC_TEGRA=m
 CONFIG_SND_SOC_TEGRA_ALC5632=m
@@ -642,6 +642,7 @@ CONFIG_DRM_PANEL=y
 CONFIG_DRM_PANEL_SIMPLE=m
 CONFIG_DRM_PANEL_LD9040=m
 CONFIG_DRM_PANEL_S6E8AA0=m
+CONFIG_NOUVEAU_PLATFORM_DRIVER=m
 
 # OLPC XO
 CONFIG_SERIO_OLPC_APSP=m
@@ -658,6 +659,7 @@ CONFIG_LATTICE_ECP3_CONFIG=m
 CONFIG_NET_VENDOR_XILINX=y
 CONFIG_XILINX_EMACLITE=m
 CONFIG_GPIO_XILINX=y
+CONFIG_GPIO_ZYNQ=m
 CONFIG_I2C_XILINX=m
 CONFIG_SPI_XILINX=m
 CONFIG_SPI_CADENCE=m
diff --git a/config-armv7-generic b/config-armv7-generic
index 1650c4ccd..c202e29ae 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -59,18 +59,19 @@ CONFIG_ARCH_VEXPRESS_CORTEX_A5_A9_ERRATA=y
 # CONFIG_ARCH_BCM is not set
 # CONFIG_ARCH_BERLIN is not set
 # CONFIG_ARCH_HI3xxx is not set
+# CONFIG_ARCH_HISI is not set
+# CONFIG_ARCH_MEDIATEK is not set
 # CONFIG_ARCH_MSM_DT is not set
 # CONFIG_ARCH_QCOM is not set
+# CONFIG_ARCH_S5PV210 is not set
 # CONFIG_ARCH_SHMOBILE_MULTI is not set
 # CONFIG_ARCH_SIRF is not set
+# CONFIG_ARCH_SOCFPGA is not set
 # CONFIG_PLAT_SPEAR is not set
 # CONFIG_ARCH_STI is not set
 # CONFIG_ARCH_U8500 is not set
 # CONFIG_ARCH_VEXPRESS_SPC is not set
 # CONFIG_ARCH_WM8850 is not set
-# CONFIG_ARCH_HISI is not set
-# CONFIG_ARCH_MEDIATEK is not set
-# CONFIG_ARCH_S5PV210 is not set
 
 # errata
 # v5/v6
@@ -166,13 +167,11 @@ CONFIG_MACH_SUN5I=y
 CONFIG_MACH_SUN6I=y
 CONFIG_MACH_SUN7I=y
 # CONFIG_MACH_SUN8I is not set
-CONFIG_PINCTRL_SUNXI=y
 CONFIG_SUNXI_WATCHDOG=m
 CONFIG_MDIO_SUN4I=m
 CONFIG_NET_VENDOR_ALLWINNER=y
 CONFIG_SUN4I_EMAC=m
 CONFIG_STMMAC_PLATFORM=y
-CONFIG_DWMAC_SOCFPGA=y
 CONFIG_DWMAC_SUNXI=y
 CONFIG_EEPROM_SUNXI_SID=m
 CONFIG_RTC_DRV_SUNXI=m
@@ -210,6 +209,7 @@ CONFIG_ARM_EXYNOS5250_CPUFREQ=y
 CONFIG_ARM_EXYNOS5440_CPUFREQ=y
 CONFIG_ARM_EXYNOS_CPU_FREQ_BOOST_SW=y
 CONFIG_ARM_EXYNOS_CPUIDLE=y
+# CONFIG_EXYNOS5420_MCPM not set
 
 CONFIG_I2C_EXYNOS5=m
 CONFIG_I2C_S3C2410=m
@@ -253,6 +253,7 @@ CONFIG_DRM_EXYNOS_IOMMU=y
 CONFIG_DRM_EXYNOS_IPP=y
 CONFIG_DRM_EXYNOS_ROTATOR=y
 CONFIG_DRM_EXYNOS_VIDI=y
+CONFIG_PHY_EXYNOS_DP_VIDEO=m
 # CONFIG_FB_S3C is not set
 # CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS is not set
 CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
@@ -266,6 +267,7 @@ CONFIG_SND_SOC_SAMSUNG_SMDK_SPDIF=m
 CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=m
 CONFIG_SND_SOC_SMDK_WM8994_PCM=m
 CONFIG_SND_SOC_SNOW=m
+CONFIG_SND_SOC_ODROIDX2=m
 # CONFIG_GPIO_WM8994 is not set
 # CONFIG_REGULATOR_WM8994 is not set
 # CONFIG_EXYNOS_IOMMU_DEBUG is not set
@@ -304,15 +306,14 @@ CONFIG_GENERIC_CPUFREQ_CPU0=m
 # usb
 CONFIG_USB_OHCI_HCD_PLATFORM=m
 CONFIG_USB_EHCI_HCD_PLATFORM=m
-CONFIG_USB_OTG=y
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 CONFIG_USB_ULPI=y
 CONFIG_AX88796=m
 CONFIG_AX88796_93CX6=y
-CONFIG_USB_ISP1760_HCD=m
 
 # usb gadget 
+CONFIG_USB_OTG=y
 CONFIG_USB_GADGET=m
 CONFIG_USB_GADGET_MUSB_HDRC=m
 CONFIG_USB_GADGET_VBUS_DRAW=100
@@ -321,19 +322,6 @@ CONFIG_USB_MUSB_HDRC=m
 CONFIG_USB_MUSB_DUAL_ROLE=y
 CONFIG_USB_MUSB_DSPS=m
 CONFIG_USB_GPIO_VBUS=m
-CONFIG_USB_G_ACM_MS=m
-CONFIG_USB_G_DBGP=m
-CONFIG_USB_G_DBGP_SERIAL=y
-CONFIG_USB_G_MULTI=m
-CONFIG_USB_G_MULTI_CDC=y
-# CONFIG_USB_G_MULTI_RNDIS is not set
-CONFIG_USB_G_NCM=m
-CONFIG_USB_G_SERIAL=m
-CONFIG_USB_ETH_EEM=y
-# CONFIG_USB_ETH_RNDIS is not set
-CONFIG_USB_CDC_COMPOSITE=m
-CONFIG_USB_GADGET_TARGET=m
-CONFIG_USB_MASS_STORAGE=m
 CONFIG_USB_CONFIGFS=m
 CONFIG_USB_CONFIGFS_ACM=y
 CONFIG_USB_CONFIGFS_ECM=y
@@ -407,7 +395,6 @@ CONFIG_GPIO_MC33880=m
 CONFIG_GPIO_TPS65910=y
 CONFIG_GPIO_TPS65912=m
 # CONFIG_GPIO_ZEVIO is not set
-# CONFIG_GPIO_ZYNQ is not set
 CONFIG_LEDS_GPIO=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
@@ -432,11 +419,9 @@ CONFIG_SPI_BUTTERFLY=m
 CONFIG_SPI_DESIGNWARE=m
 CONFIG_SPI_LM70_LLP=m
 CONFIG_SPI_OC_TINY=m
-CONFIG_SPI_PL022=m
 CONFIG_SPI_SC18IS602=m
 CONFIG_SPI_TLE62X0=m
 CONFIG_SPI_XCOMM=m
-CONFIG_SPI_XILINX=m
 # CONFIG_SPI_FSL_SPI is not set
 # CONFIG_SPI_CADENCE is not set
 
@@ -446,7 +431,6 @@ CONFIG_NFC_NCI_SPI=y
 CONFIG_I2C_DESIGNWARE_CORE=m
 CONFIG_I2C_DESIGNWARE_PLATFORM=m
 CONFIG_I2C_MV64XXX=m
-# CONFIG_I2C_CROS_EC_TUNNEL is not set
 
 # HW crypto and rng
 CONFIG_CRYPTO_SHA1_ARM=m
@@ -494,6 +478,7 @@ CONFIG_MTD_NAND_PLATFORM=m
 CONFIG_MTD_NAND_PXA3xx=m
 CONFIG_MTD_NAND_RICOH=m
 CONFIG_MTD_NAND_TMIO=m
+CONFIG_MTD_SPI_NOR=m
 CONFIG_MTD_SPINAND_MT29F=m
 CONFIG_MTD_SPINAND_ONDIEECC=y
 CONFIG_MTD_SST25L=m
@@ -510,7 +495,6 @@ CONFIG_MMC_DW_PLTFM=m
 CONFIG_MMC_DW_PCI=m
 CONFIG_SPI_DW_MMIO=m
 CONFIG_SPI_DW_PCI=m
-# CONFIG_MMC_DW_SOCFPGA is not set
 # CONFIG_MMC_DW_IDMAC is not set
 # CONFIG_MMC_DW_K3 is not set
 CONFIG_USB_DWC2=y
@@ -579,10 +563,11 @@ CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_WM8903 is not set
 # CONFIG_SND_SOC_WM8962 is not set
 # CONFIG_SND_SOC_TPA6130A2 is not set
+# CONFIG_SND_SOC_FSL_ASRC is not set
+# CONFIG_SND_SOC_FSL_ESAI is not set
 # CONFIG_SND_SOC_FSL_SAI is not set
-# CONFIG_SND_SOC_FSL_SSI is not set
 # CONFIG_SND_SOC_FSL_SPDIF is not set
-# CONFIG_SND_SOC_FSL_ESAI is not set
+# CONFIG_SND_SOC_FSL_SSI is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_ALC5623 is not set
 # CONFIG_SND_SOC_CS42L56 is not set
@@ -591,8 +576,6 @@ CONFIG_SND_SOC_SPDIF=m
 # CONFIG_SND_SOC_TLV320AIC31XX is not set
 # CONFIG_SND_SOC_TAS2552 is not set
 # CONFIG_SND_SOC_CS4265 is not set
-# CONFIG_SND_SOC_ODROIDX2 is not set
-# CONFIG_SND_SOC_FSL_ASRC is not set
 # CONFIG_SND_EDMA_SOC is not set
 # CONFIG_SND_SOC_ROCKCHIP is not set
 
@@ -750,6 +733,7 @@ CONFIG_MFD_CROS_EC=m
 CONFIG_MFD_CROS_EC_I2C=m
 CONFIG_MFD_CROS_EC_SPI=m
 CONFIG_KEYBOARD_CROS_EC=m
+CONFIG_I2C_CROS_EC_TUNNEL=m
 
 # Should be in generic
 CONFIG_BPF_JIT=y
@@ -797,6 +781,8 @@ CONFIG_BPF_JIT=y
 # CONFIG_MMC_TMIO is not set
 # CONFIG_PINCTRL_IMX35 is not set
 # CONFIG_DVB_USB_PCTV452E is not set
+# CONFIG_DWMAC_SOCFPGA is not set
+# CONFIG_MMC_DW_SOCFPGA is not set
 
 # CONFIG_MFD_LP8788 is not set
 # CONFIG_MFD_MAX77693 is not set
diff --git a/config-armv7-lpae b/config-armv7-lpae
index 6f4cb519d..7ad1fce57 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -12,7 +12,6 @@ CONFIG_ARCH_VIRT=y
 # CONFIG_SOC_AM43XX is not set
 # CONFIG_SOC_DRA7XX is not set
 # CONFIG_ARCH_ROCKCHIP is not set
-# CONFIG_ARCH_SOCFPGA is not set
 # CONFIG_ARCH_TEGRA is not set
 # CONFIG_ARCH_ZYNQ is not set
 # CONFIG_ARCH_AXXIA is not set
diff --git a/config-generic b/config-generic
index 8c7e94e1d..c61823b8c 100644
--- a/config-generic
+++ b/config-generic
@@ -1427,7 +1427,6 @@ CONFIG_E1000E=m
 CONFIG_IGB=m
 CONFIG_IGB_HWMON=y
 CONFIG_IGB_DCA=y
-CONFIG_IGB_PTP=y
 CONFIG_IGBVF=m
 CONFIG_IXGB=m
 CONFIG_IXGBEVF=m
@@ -4003,7 +4002,6 @@ CONFIG_USB_CXACRU=m
 # CONFIG_USB_C67X00_HCD is not set
 # CONFIG_USB_CYTHERM is not set
 CONFIG_USB_EMI26=m
-CONFIG_USB_ETH=m
 CONFIG_USB_FTDI_ELAN=m
 CONFIG_USB_FILE_STORAGE=m
 # CONFIG_USB_FILE_STORAGE_TEST is not set
@@ -4042,16 +4040,13 @@ CONFIG_USB_TRANCEVIBRATOR=m
 CONFIG_USB_U132_HCD=m
 CONFIG_USB_UEAGLEATM=m
 CONFIG_USB_XUSBATM=m
-CONFIG_USB_ZERO=m
 
 # CONFIG_USB_DWC2 is not set
-
-CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
-
 # CONFIG_USB_ISP1301 is not set
-
 # CONFIG_USB_OTG is not set
 
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
 #
 # Sonics Silicon Backplane
 #
diff --git a/config-powerpc-generic b/config-powerpc-generic
index 9c0ad6011..b11dcd0c8 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -61,7 +61,6 @@ CONFIG_CAPI_EICON=y
 
 CONFIG_NVRAM=y
 
-# CONFIG_PCMCIA_M8XX is not set
 # CONFIG_SCSI_AHA1542 is not set
 # CONFIG_SCSI_IN2000 is not set
 # CONFIG_SCSI_IPS is not set
diff --git a/config-powerpc32-generic b/config-powerpc32-generic
index 10e02fb7b..aadda4865 100644
--- a/config-powerpc32-generic
+++ b/config-powerpc32-generic
@@ -2,7 +2,6 @@
 CONFIG_PPC32=y
 # CONFIG_PPC64 is not set
 # CONFIG_RTAS_PROC is not set
-# CONFIG_PCMCIA_M8XX is not set
 # CONFIG_HOTPLUG_PCI is not set
 CONFIG_CPU_FREQ_PMAC=y
 CONFIG_PPC_CHRP=y
diff --git a/kernel.spec b/kernel.spec
index f57fc7820..3f3b43a32 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2246,6 +2246,11 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Wed Aug 13 2014 Peter Robinson <pbrobinson@fedoraproject.org>
+- 3.17 ARMv7 updates
+- Cleanup some old removed options
+- Disable legacy USB OTG (using new configfs equivilents)
+
 * Tue Aug 12 2014 Kyle McMartin <kyle@fedoraproject.org> 3.17.0-0.rc0.git4.2
 - tegra-powergate-header-move.patch: deal with armv7hl breakage
 - nouveau_platform-fix.patch: handle nouveau_dev() removal