@@ -996,6 +996,14 @@ struct ab8500_regulator_platform_data ab8500_regulator_plat_data = {
.num_ext_regulator = ARRAY_SIZE(ab8500_ext_regulators),
};
+/* External regulators turn off VAUX2 when in use on Snowball. */
+struct ab8500_regulator_platform_data snowball_regulator_plat_data = {
+ .reg_init = ab8500_reg_init,
+ .num_reg_init = ARRAY_SIZE(ab8500_reg_init),
+ .regulator = ab8500_regulators,
+ .num_regulator = ARRAY_SIZE(ab8500_regulators),
+};
+
struct ab8500_regulator_platform_data ab8505_regulator_plat_data = {
.reg_init = ab8505_reg_init,
.num_reg_init = ARRAY_SIZE(ab8505_reg_init),
@@ -16,6 +16,7 @@
extern struct ab8500_regulator_platform_data ab8500_regulator_plat_data;
extern struct ab8500_regulator_platform_data ab8505_regulator_plat_data;
+extern struct ab8500_regulator_platform_data snowball_regulator_plat_data;
extern struct regulator_init_data tps61052_regulator;
extern struct regulator_init_data gpio_en_3v3_regulator;
extern struct regulator_init_data sdi0_reg_init_data;
@@ -615,6 +615,8 @@ static void __init snowball_init_machine(void)
struct device *parent = NULL;
int i;
+ ab8500_platdata.regulator = &snowball_regulator_plat_data;
+
platform_device_register(&db8500_prcmu_device);
sdi0_reg_info.enable_gpio = SNOWBALL_SDMMC_EN_GPIO;
This patch fixes a bug introduced in the v3.10 merge window. Currently the external regulator settings are passed though to the AB8500 regulator driver regards of whether they can or should be used on any ux500 based platform. They are not applicable for the u8505 and when enabled, they turn off AUX2 which adversely affects the eMMC on Snowball. The driver already knows that the external regulator settings are not appropriate for the u8505, however it's more difficult for driver code to distinguish between two different u8500 based platforms. Using the new semantics, we can just not pass the external regulator initialisation values from platform code and the external regulator driver will know not to register them. Signed-off-by: Lee Jones <lee.jones@linaro.org> --- arch/arm/mach-ux500/board-mop500-regulators.c | 8 ++++++++ arch/arm/mach-ux500/board-mop500-regulators.h | 1 + arch/arm/mach-ux500/board-mop500.c | 2 ++ 3 files changed, 11 insertions(+)