diff --git a/config-arm-generic b/config-arm-generic
index 132308800..e13cc6027 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -21,6 +21,7 @@ CONFIG_CC_STACKPROTECTOR=y
 # CONFIG_BIG_LITTLE is not set
 # CONFIG_ARM_BIG_LITTLE_CPUIDLE is not set
 # CONFIG_IWMMXT is not set
+# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 
 # https://fedoraproject.org/wiki/Features/Checkpoint_Restore
 CONFIG_CHECKPOINT_RESTORE=y
@@ -238,10 +239,10 @@ CONFIG_PHY_ROCKCHIP_EMMC=m
 CONFIG_PHY_ROCKCHIP_DP=m
 CONFIG_ROCKCHIP_MBOX=y
 # CONFIG_ARM_RK3399_DMC_DEVFREQ is not set
-# CONFIG_PHY_ROCKCHIP_INNO_USB2 is not set
-# CONFIG_PHY_ROCKCHIP_PCIE is not set
-# CONFIG_PHY_ROCKCHIP_TYPEC is not set
-# CONFIG_PCIE_ROCKCHIP is not set
+CONFIG_PHY_ROCKCHIP_INNO_USB2=m
+CONFIG_PHY_ROCKCHIP_PCIE=m
+CONFIG_PHY_ROCKCHIP_TYPEC=m
+CONFIG_PCIE_ROCKCHIP=y
 
 # Tegra
 CONFIG_TEGRA_MC=y
@@ -506,7 +507,6 @@ CONFIG_GPIO_DEVRES=y
 CONFIG_GPIO_GENERIC=m
 CONFIG_GPIO_GENERIC_PLATFORM=m
 CONFIG_GPIO_WATCHDOG=m
-CONFIG_GPIOLIB=y
 CONFIG_BACKLIGHT_GPIO=m
 CONFIG_KEYBOARD_GPIO=m
 CONFIG_KEYBOARD_GPIO_POLLED=m
diff --git a/config-arm64 b/config-arm64
index bd2d9aef6..983eafb89 100644
--- a/config-arm64
+++ b/config-arm64
@@ -323,9 +323,7 @@ CONFIG_DEBUG_SECTION_MISMATCH=y
 # CONFIG_VGA_CONSOLE is not set
 
 # CONFIG_HOTPLUG_PCI_SHPC is not set
-
 # CONFIG_FSL_MC_BUS is not set
 # CONFIG_FUJITSU_ES is not set
-# CONFIG_IMX_THERMAL is not set
 # CONFIG_PNP_DEBUG_MESSAGES is not set
 # CONFIG_BCM_PDC_MBOX is not set
diff --git a/config-armv7 b/config-armv7
index 07b8f7acf..298c8d790 100644
--- a/config-armv7
+++ b/config-armv7
@@ -238,7 +238,6 @@ CONFIG_TI_CPSW_ALE=m
 CONFIG_TI_CPTS=y
 CONFIG_TI_EMIF=m
 CONFIG_DRM_TILCDC=m
-# CONFIG_COMMON_CLK_TI_ADPLL is not set
 # We only need this until the BBB dts is actually updated
 CONFIG_DRM_TILCDC_SLAVE_COMPAT=y
 CONFIG_SPI_DAVINCI=m
@@ -399,6 +398,7 @@ CONFIG_STMPE_I2C=y
 CONFIG_SPI_IMX=m
 CONFIG_SPI_FSL_QUADSPI=m
 CONFIG_STMPE_SPI=y
+CONFIG_GPIO_TS4800=m
 CONFIG_MFD_MC13XXX_SPI=m
 CONFIG_MFD_STMPE=y
 CONFIG_MTD_NAND_GPMI_NAND=m
diff --git a/config-armv7-generic b/config-armv7-generic
index c9e4c6ce2..5d1006372 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -351,6 +351,7 @@ CONFIG_CHARGER_MAX8997=m
 CONFIG_LEDS_MAX8997=m
 CONFIG_RTC_DRV_MAX8997=m
 CONFIG_EXTCON_MAX8997=m
+CONFIG_SND_SOC_ARNDALE_RT5631_ALC5631=m
 
 # Tegra
 CONFIG_ARCH_TEGRA_114_SOC=y
@@ -686,13 +687,9 @@ CONFIG_CROS_EC_CHARDEV=m
 CONFIG_CROS_EC_PROTO=y
 CONFIG_PWM_CROS_EC=m
 
-# This newly introduced mess needs to be fixed upstream :-(
 CONFIG_STMMAC_PLATFORM=m
 CONFIG_DWMAC_GENERIC=m
-# CONFIG_DWMAC_LPC18XX is not set
-# CONFIG_DWMAC_MESON is not set
-# CONFIG_DWMAC_SOCFPGA is not set
-# CONFIG_DWMAC_STI is not set
+
 # CONFIG_DWMAC_STM32 is not set
 
 CONFIG_R8188EU=m
@@ -713,8 +710,6 @@ CONFIG_R8188EU=m
 # CONFIG_DRM_IMX is not set
 # CONFIG_DRM_STI is not set
 # CONFIG_DRM_FSL_DCU is not set
-# CONFIG_AHCI_IMX is not set
-# CONFIG_IMX_THERMAL is not set
 # CONFIG_TI_DAC7512 is not set
 
 # Not needed on ARMv7
diff --git a/config-armv7-lpae b/config-armv7-lpae
index e832781e2..a7b24e150 100644
--- a/config-armv7-lpae
+++ b/config-armv7-lpae
@@ -42,6 +42,7 @@ CONFIG_XEN_WDT=m
 
 # TI Keystone
 CONFIG_KEYSTONE_USB_PHY=m
+CONFIG_TI_SYSCON_RESET=m
 CONFIG_USB_DWC3_KEYSTONE=m
 CONFIG_GPIO_DAVINCI=y
 # CONFIG_I2C_DAVINCI is not set
diff --git a/config-generic b/config-generic
index f62ebff70..d64c40bea 100644
--- a/config-generic
+++ b/config-generic
@@ -5729,7 +5729,6 @@ CONFIG_NET_DSA_BCM_SF2=m
 CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
 CONFIG_NET_DSA_QCA8K=m
 
-
 CONFIG_B53=m
 CONFIG_B53_SPI_DRIVER=m
 CONFIG_B53_MDIO_DRIVER=m
@@ -5812,7 +5811,6 @@ CONFIG_USBIP_VUDC=m
 CONFIG_USBIP_VHCI_HC_PORTS=8
 CONFIG_USBIP_VHCI_NR_HCS=1
 # CONFIG_USBIP_DEBUG is not set
-# CONFIG_INTEL_MEI is not set
 # CONFIG_VT6655 is not set
 # CONFIG_IPACK_BUS is not set
 # CONFIG_LUSTRE_FS is not set
@@ -5965,14 +5963,11 @@ CONFIG_GPIO_VIPERBOARD=m
 # CONFIG_GPIO_TPIC2810 is not set
 # CONFIG_GPIO_MPC8XXX is not set
 # CONFIG_GPIO_PISOSR is not set
-# CONFIG_GPIO_TS4800 is not set
 # CONFIG_GPIO_TPS65218 is not set
 # CONFIG_GPIO_104_DIO_48E is not set
 # CONFIG_GPIO_WS16C48 is not set
 # CONFIG_GPIO_TS4900 is not set
 
-# FIXME: Why?
-
 CONFIG_TEST_KSTRTOX=y
 CONFIG_XZ_DEC=y
 CONFIG_XZ_DEC_X86=y
@@ -6026,6 +6021,7 @@ CONFIG_PSTORE_RAM=m
 
 CONFIG_CHROME_PLATFORMS=y
 # CONFIG_CROS_KBD_LED_BACKLIGHT is not set
+# CONFIG_GOOGLE_FIRMWARE is not set
 
 CONFIG_BCMA=m
 CONFIG_BCMA_BLOCKIO=y
@@ -6036,18 +6032,14 @@ CONFIG_BCMA_DRIVER_GMAC_CMN=y
 CONFIG_BCMA_DRIVER_GPIO=y
 # CONFIG_BCMA_DEBUG is not set
 
-# CONFIG_GOOGLE_FIRMWARE is not set
-# CONFIG_INTEL_MID_PTI is not set
 CONFIG_IOMMU_SUPPORT=y
-# CONFIG_IOMMU_IO_PGTABLE_LPAE is not set
-# CONFIG_IOMMU_IO_PGTABLE_LPAE_SELFTEST is not set
 
 # CONFIG_MAILBOX is not set
 # CONFIG_ALTERA_MBOX is not set
 # CONFIG_MAILBOX_TEST is not set
 
-# CONFIG_RESET_CONTROLLER is not set
 # CONFIG_TI_SYSCON_RESET is not set
+
 CONFIG_FMC=m
 CONFIG_FMC_FAKEDEV=m
 CONFIG_FMC_TRIVIAL=m
@@ -6066,7 +6058,6 @@ CONFIG_CPU_IDLE=y
 # CONFIG_CPU_IDLE_GOV_LADDER is not set
 
 # CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
-# CONFIG_ASM9260_TIMER is not set
 
 # CONFIG_HMC_DRV is not set
 
diff --git a/config-x86-generic b/config-x86-generic
index 2f14d8692..fe51ba25d 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -567,9 +567,6 @@ CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
 CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
 CONFIG_SND_SOC_AC97_CODEC=m
 # CONFIG_SND_SOC_TAS571X is not set
-# CONFIG_SND_SUN4I_CODEC is not set
-# CONFIG_SND_SUN4I_SPDIF is not set
-# CONFIG_SND_SUN4I_I2S is not set
 
 CONFIG_INTEL_POWERCLAMP=m
 CONFIG_X86_PKG_TEMP_THERMAL=m
diff --git a/kernel.spec b/kernel.spec
index 6f17ca479..fc6027578 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2154,6 +2154,9 @@ fi
 #
 #
 %changelog
+* Mon Nov  7 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+- Minor ARM config updates
+
 * Mon Nov 07 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc4.git0.1
 - Linux v4.9-rc4