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: 7994fe55a4
("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>
This commit is contained in:
Родитель
d770e558e2
Коммит
a927ef895e
|
@ -24,6 +24,7 @@
|
|||
#include <linux/ata_platform.h>
|
||||
#include <linux/serial_8250.h>
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/regulator/machine.h>
|
||||
|
||||
#include <asm/mach-types.h>
|
||||
#include <asm/mach/arch.h>
|
||||
|
@ -144,6 +145,8 @@ static void __init capc7117_init(void)
|
|||
|
||||
capc7117_uarts_init();
|
||||
capc7117_ide_init();
|
||||
|
||||
regulator_has_full_constraints();
|
||||
}
|
||||
|
||||
MACHINE_START(CAPC7117,
|
||||
|
|
|
@ -13,6 +13,7 @@
|
|||
#include <linux/syscore_ops.h>
|
||||
#include <linux/irq.h>
|
||||
#include <linux/gpio.h>
|
||||
#include <linux/regulator/machine.h>
|
||||
|
||||
#include <linux/dm9000.h>
|
||||
#include <linux/leds.h>
|
||||
|
@ -466,6 +467,8 @@ static void __init cmx2xx_init(void)
|
|||
cmx2xx_init_ac97();
|
||||
cmx2xx_init_touchscreen();
|
||||
cmx2xx_init_leds();
|
||||
|
||||
regulator_has_full_constraints();
|
||||
}
|
||||
|
||||
static void __init cmx2xx_init_irq(void)
|
||||
|
|
|
@ -835,6 +835,8 @@ static void __init cm_x300_init(void)
|
|||
cm_x300_init_ac97();
|
||||
cm_x300_init_wi2wi();
|
||||
cm_x300_init_bl();
|
||||
|
||||
regulator_has_full_constraints();
|
||||
}
|
||||
|
||||
static void __init cm_x300_fixup(struct tag *tags, char **cmdline)
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
#include <linux/mtd/partitions.h>
|
||||
#include <linux/mtd/physmap.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/regulator/machine.h>
|
||||
#include <linux/ucb1400.h>
|
||||
|
||||
#include <asm/mach/arch.h>
|
||||
|
@ -294,6 +295,8 @@ static void __init colibri_pxa270_init(void)
|
|||
printk(KERN_ERR "Illegal colibri_pxa270_baseboard type %d\n",
|
||||
colibri_pxa270_baseboard);
|
||||
}
|
||||
|
||||
regulator_has_full_constraints();
|
||||
}
|
||||
|
||||
/* The "Income s.r.o. SH-Dmaster PXA270 SBC" board can be booted either
|
||||
|
|
|
@ -1306,6 +1306,8 @@ static void __init em_x270_init(void)
|
|||
em_x270_init_i2c();
|
||||
em_x270_init_camera();
|
||||
em_x270_userspace_consumers_init();
|
||||
|
||||
regulator_has_full_constraints();
|
||||
}
|
||||
|
||||
MACHINE_START(EM_X270, "Compulab EM-X270")
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
#include <linux/dm9000.h>
|
||||
#include <linux/mtd/physmap.h>
|
||||
#include <linux/mtd/partitions.h>
|
||||
#include <linux/regulator/machine.h>
|
||||
#include <linux/i2c/pxa-i2c.h>
|
||||
|
||||
#include <asm/types.h>
|
||||
|
@ -534,6 +535,8 @@ static void __init trizeps4_init(void)
|
|||
|
||||
BCR_writew(trizeps_conxs_bcr);
|
||||
board_backlight_power(1);
|
||||
|
||||
regulator_has_full_constraints();
|
||||
}
|
||||
|
||||
static void __init trizeps4_map_io(void)
|
||||
|
|
|
@ -24,6 +24,7 @@
|
|||
#include <linux/dm9000.h>
|
||||
#include <linux/ucb1400.h>
|
||||
#include <linux/ata_platform.h>
|
||||
#include <linux/regulator/machine.h>
|
||||
#include <linux/regulator/max1586.h>
|
||||
#include <linux/i2c/pxa-i2c.h>
|
||||
|
||||
|
@ -711,6 +712,8 @@ static void __init vpac270_init(void)
|
|||
vpac270_ts_init();
|
||||
vpac270_rtc_init();
|
||||
vpac270_ide_init();
|
||||
|
||||
regulator_has_full_constraints();
|
||||
}
|
||||
|
||||
MACHINE_START(VPAC270, "Voipac PXA270")
|
||||
|
|
|
@ -868,6 +868,8 @@ static void __init zeus_init(void)
|
|||
i2c_register_board_info(0, ARRAY_AND_SIZE(zeus_i2c_devices));
|
||||
pxa2xx_set_spi_info(3, &pxa2xx_spi_ssp3_master_info);
|
||||
spi_register_board_info(zeus_spi_board_info, ARRAY_SIZE(zeus_spi_board_info));
|
||||
|
||||
regulator_has_full_constraints();
|
||||
}
|
||||
|
||||
static struct map_desc zeus_io_desc[] __initdata = {
|
||||
|
|
Загрузка…
Ссылка в новой задаче