diff --git a/kernel.spec b/kernel.spec
index 7e0f4b86d..f9ceb8127 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -504,6 +504,8 @@ Patch456: arm64-acpi-drop-expert-patch.patch
 
 Patch457: ARM-tegra-usb-no-reset.patch
 
+Patch458: regulator-axp20x-module-alias.patch
+
 Patch463: arm-i.MX6-Utilite-device-dtb.patch
 
 Patch466: input-kill-stupid-messages.patch
@@ -2062,6 +2064,9 @@ fi
 #
 # 
 %changelog
+* Mon Sep 28 2015 Peter Robinson <pbrobinson@fedoraproject.org>
+- Add upstream patch to fix a Allwinner regulator loading as a module
+
 * Thu Sep 24 2015 Josh Boyer <jwboyer@fedoraproject.org>
 - CVE-2015-5257 Null ptr deref in usb whiteheat driver (rhbz 1265607 1265612)
 
diff --git a/regulator-axp20x-module-alias.patch b/regulator-axp20x-module-alias.patch
new file mode 100644
index 000000000..f20c9b3d6
--- /dev/null
+++ b/regulator-axp20x-module-alias.patch
@@ -0,0 +1,26 @@
+From d4ea7d86457a8d0ea40ce77bdeda1fc966cc35ec Mon Sep 17 00:00:00 2001
+From: Ian Campbell <ijc@hellion.org.uk>
+Date: Sat, 1 Aug 2015 18:13:25 +0100
+Subject: regulator: axp20x: Add module alias
+
+This allows the module to be autoloaded.
+
+Together with 07949bf9c63c ("cpufreq: dt: allow driver to boot
+automatically") this is sufficient to allow a modular kernel (such
+as Debian's) to enable cpufreq on a Cubietruck.
+
+Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
+Signed-off-by: Mark Brown <broonie@kernel.org>
+
+diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c
+index 6468291..01bf347 100644
+--- a/drivers/regulator/axp20x-regulator.c
++++ b/drivers/regulator/axp20x-regulator.c
+@@ -405,3 +405,4 @@ module_platform_driver(axp20x_regulator_driver);
+ MODULE_LICENSE("GPL v2");
+ MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
+ MODULE_DESCRIPTION("Regulator Driver for AXP20X PMIC");
++MODULE_ALIAS("platform:axp20x-regulator");
+-- 
+cgit v0.10.2
+