summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-pxa/icontrol.c
diff options
context:
space:
mode:
authorRobert Jarzmik <robert.jarzmik@free.fr>2015-07-11 21:33:06 +0200
committerRobert Jarzmik <robert.jarzmik@free.fr>2015-07-16 22:43:59 +0200
commita927ef895e288e79f1bfed221f27d7bfa37e907f (patch)
tree654b102e59bd41424edcd7ab5e4a85c2f0b7c71a /arch/arm/mach-pxa/icontrol.c
parentd770e558e21961ad6cfdf0ff7df0eb5d7d4f0754 (diff)
downloadblackbird-op-linux-a927ef895e288e79f1bfed221f27d7bfa37e907f.tar.gz
blackbird-op-linux-a927ef895e288e79f1bfed221f27d7bfa37e907f.zip
ARM: pxa: fix dm9000 platform data regression
Since dm9000 driver added support for a vcc regulator, platform data based platforms have their ethernet broken, as the regulator claiming returns -EPROBE_DEFER and prevents dm9000 loading. This patch fixes this for all pxa boards using dm9000, by using the specific regulator_has_full_constraints() function. This was discovered and tested on the cm-x300 board. Fixes: 7994fe55a4a2 ("dm9000: Add regulator and reset support to dm9000") Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> Acked-by: Igor Grinberg <grinberg@compulab.co.il>
Diffstat (limited to 'arch/arm/mach-pxa/icontrol.c')
-rw-r--r--arch/arm/mach-pxa/icontrol.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/icontrol.c b/arch/arm/mach-pxa/icontrol.c
index c98511c5abd1..9b0eb0252af6 100644
--- a/arch/arm/mach-pxa/icontrol.c
+++ b/arch/arm/mach-pxa/icontrol.c
@@ -26,6 +26,7 @@
#include <linux/spi/spi.h>
#include <linux/spi/pxa2xx_spi.h>
#include <linux/can/platform/mcp251x.h>
+#include <linux/regulator/machine.h>
#include "generic.h"
@@ -185,6 +186,8 @@ static void __init icontrol_init(void)
mxm_8x10_mmc_init();
icontrol_can_init();
+
+ regulator_has_full_constraints();
}
MACHINE_START(ICONTROL, "iControl/SafeTcam boards using Embedian MXM-8x10 CoM")
OpenPOWER on IntegriCloud