From: Danny Nold Date: Fri, 30 Mar 2012 02:28:14 +0000 (-0500) Subject: ENGR00178458 - WM8962 regulator constraint fix to prevent unwanted disable X-Git-Tag: v3.0.35-fsl_4.1.0~1419 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=558cd7bab91408a825f8754927d3cbee3184a976;p=karo-tx-linux.git ENGR00178458 - WM8962 regulator constraint fix to prevent unwanted disable SPKVDD regulator was being disabled whenever EPDC was included in the image, because the EPD PMIC initialization code includes an invocation of regulator_has_full_constraints(). This causes all regulators with zero ref count to be disabled as part of a late_initcall. To prevent this disable (which breaks ethernet and DHCP), set regulator to have boot_on attribute, so that it will not be disabled at end of driver loading sequence. Signed-off-by: Danny Nold --- diff --git a/arch/arm/mach-mx6/board-mx6q_sabresd.c b/arch/arm/mach-mx6/board-mx6q_sabresd.c index 90b222c044a4..27a5a89198c6 100644 --- a/arch/arm/mach-mx6/board-mx6q_sabresd.c +++ b/arch/arm/mach-mx6/board-mx6q_sabresd.c @@ -397,6 +397,11 @@ static struct regulator_consumer_supply sabresd_vwm8962_consumers[] = { }; static struct regulator_init_data sabresd_vwm8962_init = { + .constraints = { + .name = "SPKVDD", + .valid_ops_mask = REGULATOR_CHANGE_STATUS, + .boot_on = 1, + }, .num_consumer_supplies = ARRAY_SIZE(sabresd_vwm8962_consumers), .consumer_supplies = sabresd_vwm8962_consumers, };