diff --git a/config-armv7-generic b/config-armv7-generic
index db6496b2d..ec9a51928 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -193,6 +193,9 @@ CONFIG_MACH_SUN7I=y
 CONFIG_MACH_SUN8I=y
 CONFIG_MACH_SUN9I=y
 CONFIG_SUNXI_CCU=y
+CONFIG_SUN6I_A31_CCU=y
+CONFIG_SUN8I_A23_CCU=y
+CONFIG_SUN8I_A33_CCU=y
 CONFIG_SUN8I_H3_CCU=y
 CONFIG_SUNXI_SRAM=y
 CONFIG_DMA_SUN4I=m
@@ -212,10 +215,10 @@ CONFIG_GPIO_PCF857X=m
 CONFIG_TOUCHSCREEN_SUN4I=m
 CONFIG_MFD_AXP20X=y
 CONFIG_MFD_AXP20X_I2C=y
-CONFIG_MFD_AXP20X_RSB=m
+CONFIG_MFD_AXP20X_RSB=y
 CONFIG_AXP20X_POWER=m
 CONFIG_INPUT_AXP20X_PEK=m
-CONFIG_REGULATOR_AXP20X=m
+CONFIG_REGULATOR_AXP20X=y
 CONFIG_AXP288_FUEL_GAUGE=m
 CONFIG_AXP288_ADC=m
 CONFIG_EXTCON_AXP288=m
@@ -230,14 +233,14 @@ CONFIG_RTC_DRV_SUN6I=m
 CONFIG_MTD_NAND_SUNXI=m
 CONFIG_SERIO_SUN4I_PS2=m
 CONFIG_KEYBOARD_SUN4I_LRADC=m
-CONFIG_PWM_SUN4I=m
+CONFIG_PWM_SUN4I=y
 CONFIG_CAN_SUN4I=m
 CONFIG_USB_MUSB_SUNXI=m
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
 CONFIG_SND_SUN4I_CODEC=m
 CONFIG_SND_SUN4I_SPDIF=m
 CONFIG_SND_SUN4I_I2S=m
-CONFIG_SUNXI_RSB=m
+CONFIG_SUNXI_RSB=y
 CONFIG_NVMEM_SUNXI_SID=m
 
 # Exynos
diff --git a/kernel.spec b/kernel.spec
index c30b057e8..43473c4de 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2158,6 +2158,9 @@ fi
 #
 #
 %changelog
+* Sun Nov 13 2016 Hans de Goede <jwrdegoede@fedoraproject.org>
+- ARM config updates to fix boot issues on Allwinner A23, A31 and A33
+
 * Fri Nov 11 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc4.git4.1
 - Linux v4.9-rc4-107-g015ed94