diff --git a/config-arm-generic b/config-arm-generic
index 31273b8d8..188337ed8 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -24,8 +24,6 @@ CONFIG_RESET_CONTROLLER=y
 CONFIG_RESET_GPIO=y
 
 CONFIG_RCU_FANOUT_LEAF=16
-# CONFIG_RTC_DRV_SNVS is not set
-# CONFIG_RTC_DRV_HYM8563 is not set
 CONFIG_BACKLIGHT_PWM=m
 CONFIG_INPUT_PWM_BEEPER=m
 CONFIG_ARM_SP805_WATCHDOG=m
@@ -88,7 +86,6 @@ CONFIG_OF_FLATTREE=y
 CONFIG_OF_GPIO=y
 CONFIG_OF_IOMMU=y
 CONFIG_OF_IRQ=y
-CONFIG_OF_MDIO=m
 CONFIG_OF_MTD=y
 CONFIG_OF_NET=y
 CONFIG_OF_PCI_IRQ=m
@@ -100,6 +97,10 @@ CONFIG_PATA_OF_PLATFORM=m
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_THERMAL_OF=y
 
+# CONFIG_OF_MDIO is not set
+# CONFIG_MDIO_BUS_MUX_GPIO is not set
+# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
+
 # External Connectors
 CONFIG_EXTCON=m
 CONFIG_EXTCON_GPIO=m
@@ -129,7 +130,6 @@ CONFIG_GPIO_WATCHDOG=m
 CONFIG_GPIOLIB=y
 CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
 CONFIG_ARCH_REQUIRE_GPIOLIB=y
-CONFIG_MDIO_GPIO=m
 CONFIG_BACKLIGHT_GPIO=m
 CONFIG_POWER_RESET_GPIO=y
 CONFIG_POWER_RESET_GPIO_RESTART=y
diff --git a/config-arm64 b/config-arm64
index 47174cd63..e4775a6cd 100644
--- a/config-arm64
+++ b/config-arm64
@@ -95,12 +95,6 @@ CONFIG_RTC_DRV_XGENE=m
 CONFIG_HW_RANDOM_XGENE=m
 CONFIG_GPIO_XGENE=y
 
-# not arm64
-# CONFIG_GPIO_ADNP is not set
-# CONFIG_GPIO_MCP23S08 is not set
-# CONFIG_MDIO_BUS_MUX_GPIO is not set
-# CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-
 # busted build for various reasons
 #  uses pci_* for some reason to allocate DMA buffers
 # CONFIG_DVB_B2C2_FLEXCOP_USB is not set
diff --git a/config-armv7 b/config-armv7
index e1d37fe5f..652d2248f 100644
--- a/config-armv7
+++ b/config-armv7
@@ -65,6 +65,7 @@ CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m
 CONFIG_USB_EHCI_HCD_ORION=m
 CONFIG_MMC_SDHCI_PXAV3=m
 CONFIG_MVPP2=m
+CONFIG_COMMON_CLK_SI5351=m
 # CONFIG_CACHE_FEROCEON_L2 is not set
 # CONFIG_CACHE_FEROCEON_L2_WRITETHROUGH is not set
 
@@ -185,6 +186,7 @@ CONFIG_INPUT_TWL4030_VIBRA=m
 CONFIG_INPUT_TWL6040_VIBRA=m
 CONFIG_KEYBOARD_OMAP4=m
 CONFIG_KEYBOARD_TWL4030=m
+CONFIG_LEDS_TCA6507=m
 
 # OMAP thermal temp.
 CONFIG_OMAP4_THERMAL=y
@@ -248,9 +250,6 @@ CONFIG_VIDEO_OMAP3=m
 # The ones below are for TI Davinci
 # CONFIG_VIDEO_DM6446_CCDC is not set
 # CONFIG_VIDEO_DM355_CCDC is not set
-# Also enable vivi driver - useful for testing a full kernelspace V4L2 driver
-CONFIG_V4L_TEST_DRIVERS=y
-CONFIG_VIDEO_VIVI=m
 
 CONFIG_SND_OMAP_SOC=m
 CONFIG_SND_SOC_I2C_AND_SPI=m
@@ -266,6 +265,7 @@ CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
 CONFIG_SND_OMAP_SOC_RX51=m
 CONFIG_SND_SOC_TLV320AIC23=m
 CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TPA6130A2=m
 CONFIG_SND_SOC_TWL4030=m
 CONFIG_SND_SOC_TWL6040=m
 CONFIG_SND_SOC_PCM1792A=m
@@ -320,12 +320,15 @@ CONFIG_ARCH_MSM8960=y
 CONFIG_ARCH_MSM8974=y
 CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MSM_CONSOLE=y
+CONFIG_SERIAL_MSM_HS=m
 CONFIG_PINCTRL_APQ8064=m
 CONFIG_PINCTRL_APQ8084=m
 CONFIG_PINCTRL_IPQ8064=m
 CONFIG_PINCTRL_MSM8960=m
+CONFIG_PINCTRL_MSM8X74=m
 CONFIG_COMMON_CLK_QCOM=m
 CONFIG_MFD_QCOM_RPM=m
+CONFIG_MFD_PM8921_CORE=m
 CONFIG_REGULATOR_QCOM_RPM=m
 CONFIG_APQ_GCC_8084=m
 CONFIG_APQ_MMCC_8084=m
@@ -353,6 +356,11 @@ CONFIG_MSM_IOMMU=y
 CONFIG_DRM_MSM=m
 CONFIG_DRM_MSM_FBDEV=y
 CONFIG_USB_EHCI_MSM=m
+CONFIG_MFD_PM8XXX=m
+CONFIG_KEYBOARD_PMIC8XXX=m
+CONFIG_INPUT_PM8XXX_VIBRATOR=m
+CONFIG_INPUT_PMIC8XXX_PWRKEY=m
+CONFIG_RTC_DRV_PM8XXX=m
 # CONFIG_DRM_MSM_REGISTER_LOGGING is not set 
 CONFIG_QCOM_WDT=m
 
@@ -493,6 +501,11 @@ CONFIG_REGULATOR_DA9055=m
 CONFIG_ARCH_EXYNOS4=y
 CONFIG_SOC_EXYNOS4212=y
 CONFIG_SOC_EXYNOS4412=y
+CONFIG_ARM_EXYNOS4210_CPUFREQ=y
+CONFIG_ARM_EXYNOS4X12_CPUFREQ=y
+CONFIG_AK8975=m
+CONFIG_CM36651=m
+CONFIG_KEYBOARD_SAMSUNG=m
 
 # Rockchips
 CONFIG_I2C_RK3X=m
@@ -506,6 +519,8 @@ CONFIG_EMAC_ROCKCHIP=m
 CONFIG_MFD_RK808=m
 CONFIG_COMMON_CLK_RK808=m
 CONFIG_REGULATOR_RK808=m
+CONFIG_RTC_DRV_HYM8563=m
+CONFIG_ROCKCHIP_SARADC=m
 
 # ST Ericsson
 CONFIG_MACH_HREFV60=y
@@ -528,6 +543,8 @@ CONFIG_AHCI_ST=m
 CONFIG_INPUT_AB8500_PONKEY=m
 CONFIG_REGULATOR_AB8500=y
 CONFIG_AB8500_USB=m
+CONFIG_USB_MUSB_UX500=m
+CONFIG_USB_UX500_DMA=y
 CONFIG_RTC_DRV_AB8500=m
 CONFIG_PWM_AB8500=m
 CONFIG_SND_SOC_UX500=m
@@ -597,6 +614,7 @@ CONFIG_SERIAL_UARTLITE_CONSOLE=y
 CONFIG_SERIAL_XILINX_PS_UART=y
 CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
 CONFIG_COMMON_CLK_AXI_CLKGEN=m
+CONFIG_COMMON_CLK_SI570=m
 CONFIG_ARM_ZYNQ_CPUIDLE=y
 CONFIG_LATTICE_ECP3_CONFIG=m
 CONFIG_NET_VENDOR_XILINX=y
@@ -621,6 +639,7 @@ CONFIG_GS_FPGABOOT=m
 CONFIG_USB_GADGET_XILINX=m
 CONFIG_PCIE_XILINX=y
 CONFIG_CADENCE_WATCHDOG=m
+CONFIG_REGULATOR_ISL9305=m
 
 # Multi function devices
 CONFIG_MFD_88PM800=m
diff --git a/config-armv7-generic b/config-armv7-generic
index 0bad51ff9..a4444ccda 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -211,8 +211,6 @@ CONFIG_SOC_EXYNOS5410=y
 CONFIG_SOC_EXYNOS5800=y
 CONFIG_SERIAL_SAMSUNG=y
 CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-CONFIG_ARM_EXYNOS4210_CPUFREQ=y
-CONFIG_ARM_EXYNOS4X12_CPUFREQ=y
 CONFIG_ARM_EXYNOS5250_CPUFREQ=y
 CONFIG_ARM_EXYNOS5440_CPUFREQ=y
 CONFIG_ARM_EXYNOS_CPU_FREQ_BOOST_SW=y
@@ -224,6 +222,7 @@ CONFIG_I2C_S3C2410=m
 CONFIG_SPI_S3C64XX=m
 CONFIG_EXYNOS_THERMAL=m
 CONFIG_EXYNOS_THERMAL_CORE=y
+CONFIG_EXYNOS_ADC=m
 CONFIG_MMC_SDHCI_S3C=m
 CONFIG_MMC_SDHCI_S3C_DMA=y
 CONFIG_MMC_DW_EXYNOS=m
@@ -243,6 +242,9 @@ CONFIG_REGULATOR_S2MPS11=m
 CONFIG_REGULATOR_S5M8767=m
 CONFIG_TCG_TIS_I2C_INFINEON=m
 CONFIG_RTC_DRV_S5M=m
+CONFIG_MFD_WM8994=m
+CONFIG_GPIO_WM8994=m
+CONFIG_REGULATOR_WM8994=m
 # CONFIG_RTC_DRV_S3C is not set
 
 CONFIG_EXYNOS_VIDEO=y
@@ -263,7 +265,14 @@ 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_PHY_EXYNOS_MIPI_VIDEO=m
+CONFIG_PHY_EXYNOS_DP_VIDEO=m
+CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=y
+CONFIG_VIDEO_EXYNOS_FIMC_LITE=m
+CONFIG_VIDEO_EXYNOS4_FIMC_IS=m
+CONFIG_VIDEO_EXYNOS4_ISP_DMA_CAPTURE=y
+CONFIG_VIDEO_S5P_FIMC=m
+CONFIG_VIDEO_S5P_MIPI_CSIS=m
 CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
 CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
 CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
@@ -276,8 +285,6 @@ 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
 # CONFIG_SAMSUNG_PM_DEBUG is not set
 # CONFIG_SAMSUNG_PM_CHECK is not set
@@ -454,14 +461,13 @@ CONFIG_GENERIC_PINCONF=y
 # GPIO
 # CONFIG_GPIO_EM is not set
 CONFIG_GPIO_74X164=m
-CONFIG_GPIO_ADNP=m
-CONFIG_GPIO_MCP23S08=m
 CONFIG_GPIO_MAX7301=m
 CONFIG_GPIO_MC33880=m
 CONFIG_GPIO_TPS65910=y
 CONFIG_GPIO_TPS65912=m
 # CONFIG_GPIO_ZEVIO is not set
 CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_GPIO_REGISTER=y
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
@@ -470,6 +476,7 @@ CONFIG_INPUT_GPIO_BEEPER=m
 CONFIG_INPUT_GPIO_TILT_POLLED=m
 CONFIG_INPUT_MATRIXKMAP=m
 CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
 CONFIG_KEYBOARD_MATRIX=m
 # CONFIG_GPIO_RCAR is not set
 CONFIG_W1_MASTER_GPIO=m
@@ -721,6 +728,7 @@ CONFIG_CHARGER_GPIO=m
 CONFIG_CHARGER_TPS65090=m
 CONFIG_PDA_POWER=m
 CONFIG_GENERIC_ADC_BATTERY=m
+CONFIG_BATTERY_SBS=m
 
 # Sensors
 CONFIG_TMP006=m
@@ -732,6 +740,8 @@ CONFIG_SENSORS_ADCXX=m
 CONFIG_SENSORS_ADS7871=m
 CONFIG_SENSORS_GPIO_FAN=m
 CONFIG_SENSORS_HTU21=m
+CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
 CONFIG_SENSORS_LIS3_SPI=m
 CONFIG_SENSORS_LM70=m
 CONFIG_SENSORS_MAX1111=m
diff --git a/config-generic b/config-generic
index 8027bcc37..2d3f6eaa0 100644
--- a/config-generic
+++ b/config-generic
@@ -2667,10 +2667,8 @@ CONFIG_HID_SENSOR_IIO_TRIGGER=m
 # CONFIG_NAU7802 is not set
 # CONFIG_TI_ADC081C is not set
 # CONFIG_TI_ADC128S052 is not set
-# CONFIG_EXYNOS_ADC is not set
 # CONFIG_VIPERBOARD_ADC is not set
 # CONFIG_VF610_ADC is not set
-# CONFIG_XILINX_XADC is not set
 # CONFIG_INV_MPU6050_IIO is not set
 CONFIG_IIO_ST_GYRO_3AXIS=m
 CONFIG_IIO_ST_MAGN_3AXIS=m
@@ -2896,6 +2894,7 @@ CONFIG_RTC_DRV_DS1742=m
 CONFIG_RTC_DRV_DS1374=m
 # CONFIG_RTC_DRV_EP93XX is not set
 CONFIG_RTC_DRV_FM3130=m
+# CONFIG_RTC_DRV_HYM8563 is not set
 CONFIG_RTC_DRV_ISL1208=m
 CONFIG_RTC_DRV_M41T80=m
 CONFIG_RTC_DRV_M41T80_WDT=y
@@ -2907,6 +2906,7 @@ CONFIG_RTC_DRV_PCF8563=m
 CONFIG_RTC_DRV_PCF8583=m
 CONFIG_RTC_DRV_RS5C372=m
 # CONFIG_RTC_DRV_SA1100 is not set
+# CONFIG_RTC_DRV_SNVS is not set
 # CONFIG_RTC_DRV_TEST is not set
 CONFIG_RTC_DRV_X1205=m
 CONFIG_RTC_DRV_PCF8523=m
@@ -3925,8 +3925,6 @@ CONFIG_USB_PHY=y
 # CONFIG_USB_OTG_FSM is not set
 
 # CONFIG_GENERIC_PHY is not set
-# CONFIG_PHY_EXYNOS_MIPI_VIDEO is not set
-# CONFIG_PHY_EXYNOS_DP_VIDEO is not set
 # CONFIG_PHY_ST_SPEAR1310_MIPHY is not set
 # CONFIG_PHY_ST_SPEAR1340_MIPHY is not set
 # CONFIG_AM335X_PHY_USB is not set
@@ -5148,6 +5146,7 @@ CONFIG_GPIO_SYSFS=y
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
 # CONFIG_GPIO_CS5535 is not set
+# CONFIG_GPIO_ADNP is not set
 # CONFIG_GPIO_ADP5588 is not set
 # CONFIG_GPIO_IT8761E is not set
 # CONFIG SB105x is not set
@@ -5175,6 +5174,7 @@ CONFIG_GPIO_VIPERBOARD=m
 # CONFIG_GPIO_74X164 is not set
 # CONFIG_GPIO_MAX7301 is not set
 # CONFIG_GPIO_MC33880 is not set
+# CONFIG_GPIO_MCP23S08 is not set
 
 # FIXME: Why?
 
diff --git a/config-powerpc-generic b/config-powerpc-generic
index 1c337f92c..ce4da577f 100644
--- a/config-powerpc-generic
+++ b/config-powerpc-generic
@@ -309,7 +309,6 @@ CONFIG_SERIAL_GRLIB_GAISLER_APBUART=m
 
 # CONFIG_PPC_MPC512x is not set
 # CONFIG_RTC_DRV_MPC5121 is not set
-# CONFIG_RTC_DRV_HYM8563 is not set
 
 # CONFIG_MPC512X_DMA is not set
 
@@ -323,8 +322,6 @@ CONFIG_I2C_MPC=m
 # CONFIG_CRYPTO_DEV_FSL_CAAM is not set
 # CONFIG_CRYPTO_SHA1_PPC is not set
 
-# CONFIG_GPIO_MCP23S08 is not set
-
 # CONFIG_CAN_FLEXCAN is not set
 # CONFIG_NET_VENDOR_XILINX is not set
 # CONFIG_PPC_EPAPR_HV_BYTECHAN is not set
@@ -351,9 +348,7 @@ CONFIG_RCU_FANOUT_LEAF=16
 
 CONFIG_PPC_DENORMALISATION=y
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
-# CONFIG_GPIO_ADNP is not set
 # CONFIG_MFD_SYSCON is not set
-# CONFIG_RTC_DRV_SNVS is not set
 # CONFIG_ASYMMETRIC_KEY_TYPE is not set
 
 
diff --git a/config-x86-32-generic b/config-x86-32-generic
index c84fb5f3d..a9cecb806 100644
--- a/config-x86-32-generic
+++ b/config-x86-32-generic
@@ -207,14 +207,10 @@ CONFIG_BACKLIGHT_PWM=m
 # CONFIG_MDIO_BUS_MUX_GPIO is not set
 # CONFIG_MDIO_BUS_MUX_MMIOREG is not set
 # CONFIG_GPIO_SODAVILLE is not set
-# CONFIG_GPIO_ADNP is not set
 # CONFIG_BACKLIGHT_OT200 is not set
-# CONFIG_RTC_DRV_SNVS is not set
-# CONFIG_RTC_DRV_HYM8563 is not set
 
 # CONFIG_MLX5_INFINIBAND is not set
 # CONFIG_PINCTRL_SINGLE is not set
-# CONFIG_PINCTRL_MSM8X74 is not set
 # CONFIG_PINCTRL_BCM281XX is not set
 # CONFIG_PINCTRL_APQ8064 is not set
 # CONFIG_PINCTRL_IPQ8064 is not set
diff --git a/config-x86-generic b/config-x86-generic
index 752752814..2a12307ea 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -378,7 +378,6 @@ CONFIG_LPC_ICH=m
 
 CONFIG_GPIO_ICH=m
 # CONFIG_GPIO_LYNXPOINT is not set
-# CONFIG_GPIO_MCP23S08 is not set
 # CONFIG_GPIO_F7188X is not set
 
 # These should all go away with IC2_ACPI is fixed
diff --git a/kernel.spec b/kernel.spec
index 5f44fdeba..dd8c607fb 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2217,6 +2217,9 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
+* Sun Oct 26 2014 Peter Robinson <pbrobinson@fedoraproject.org>
+- Update ARM config options, some minor cleanups
+
 * Sun Oct 26 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc1.git4.1
 - Linux v3.18-rc1-422-g2cc91884b6b3