Commit 992b133a authored by Bengt Jonsson's avatar Bengt Jonsson Committed by Samuel Ortiz
Browse files

mfd: Spawned db8500 regulators update 



As drivers have progressed and got some more review we have
consequently moved things around:

- Some device drivers have changed name and some were wrong
  from the beginning.
- We removed the dependency from some domains to the VAPE
  domain -  SIA MMDSP, SIA PIPE, SVA MMDSP and SVA PIPE power
  domains are handled outside the framework while ESRAM12
  and ESRAM34 are actually handled inside the PRCMU.

Reviewed-by: default avatarRickard Andersson <rickard.andersson@stericsson.com>
Reviewed-by: default avatarJonas Aberg <jonas.aberg@stericsson.com>
Signed-off-by: default avatarBengt Jonsson <bengt.g.jonsson@stericsson.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent 6b6fae2b

drivers/mfd/db8500-prcmu.c

+15 −10
Original line number Diff line number Diff line
@@ -2687,19 +2687,17 @@ static struct regulator_consumer_supply db8500_vape_consumers[] = { 
	REGULATOR_SUPPLY("vcore", "uart1"),

	REGULATOR_SUPPLY("vcore", "uart2"),

	REGULATOR_SUPPLY("v-ape", "nmk-ske-keypad.0"),

	REGULATOR_SUPPLY("v-hsi", "ste_hsi.0"),

};



static struct regulator_consumer_supply db8500_vsmps2_consumers[] = {

	/* CG2900 and CW1200 power to off-chip peripherals */

	REGULATOR_SUPPLY("gbf_1v8", "cg2900-uart.0"),

	REGULATOR_SUPPLY("wlan_1v8", "cw1200.0"),

	REGULATOR_SUPPLY("musb_1v8", "ab8500-usb.0"),

	/* AV8100 regulator */

	REGULATOR_SUPPLY("hdmi_1v8", "0-0070"),

};



static struct regulator_consumer_supply db8500_b2r2_mcde_consumers[] = {

	REGULATOR_SUPPLY("vsupply", "b2r2.0"),

	REGULATOR_SUPPLY("vsupply", "b2r2_bus"),

	REGULATOR_SUPPLY("vsupply", "mcde"),

};
@@ -2736,6 +2734,7 @@ static struct regulator_consumer_supply db8500_esram12_consumers[] = { 
static struct regulator_consumer_supply db8500_esram34_consumers[] = {

	REGULATOR_SUPPLY("v-esram34", "mcde"),

	REGULATOR_SUPPLY("esram34", "cm_control"),

	REGULATOR_SUPPLY("lcla_esram", "dma40.0"),

};



static struct regulator_init_data db8500_regulators[DB8500_NUM_REGULATORS] = {
@@ -2792,7 +2791,7 @@ static struct regulator_init_data db8500_regulators[DB8500_NUM_REGULATORS] = { 
		},

	},

	[DB8500_REGULATOR_SWITCH_SVAMMDSP] = {

		.supply_regulator = "db8500-vape",

		/* dependency to u8500-vape is handled outside regulator framework */

		.constraints = {

			.name = "db8500-sva-mmdsp",

			.valid_ops_mask = REGULATOR_CHANGE_STATUS,
@@ -2808,7 +2807,7 @@ static struct regulator_init_data db8500_regulators[DB8500_NUM_REGULATORS] = { 
		},

	},

	[DB8500_REGULATOR_SWITCH_SVAPIPE] = {

		.supply_regulator = "db8500-vape",

		/* dependency to u8500-vape is handled outside regulator framework */

		.constraints = {

			.name = "db8500-sva-pipe",

			.valid_ops_mask = REGULATOR_CHANGE_STATUS,
@@ -2817,7 +2816,7 @@ static struct regulator_init_data db8500_regulators[DB8500_NUM_REGULATORS] = { 
		.num_consumer_supplies = ARRAY_SIZE(db8500_svapipe_consumers),

	},

	[DB8500_REGULATOR_SWITCH_SIAMMDSP] = {

		.supply_regulator = "db8500-vape",

		/* dependency to u8500-vape is handled outside regulator framework */

		.constraints = {

			.name = "db8500-sia-mmdsp",

			.valid_ops_mask = REGULATOR_CHANGE_STATUS,
@@ -2832,7 +2831,7 @@ static struct regulator_init_data db8500_regulators[DB8500_NUM_REGULATORS] = { 
		},

	},

	[DB8500_REGULATOR_SWITCH_SIAPIPE] = {

		.supply_regulator = "db8500-vape",

		/* dependency to u8500-vape is handled outside regulator framework */

		.constraints = {

			.name = "db8500-sia-pipe",

			.valid_ops_mask = REGULATOR_CHANGE_STATUS,
@@ -2860,7 +2859,10 @@ static struct regulator_init_data db8500_regulators[DB8500_NUM_REGULATORS] = { 
		.num_consumer_supplies = ARRAY_SIZE(db8500_b2r2_mcde_consumers),

	},

	[DB8500_REGULATOR_SWITCH_ESRAM12] = {

		.supply_regulator = "db8500-vape",

		/*

		 * esram12 is set in retention and supplied by Vsafe when Vape is off,

		 * no need to hold Vape

		 */

		.constraints = {

			.name = "db8500-esram12",

			.valid_ops_mask = REGULATOR_CHANGE_STATUS,
@@ -2875,7 +2877,10 @@ static struct regulator_init_data db8500_regulators[DB8500_NUM_REGULATORS] = { 
		},

	},

	[DB8500_REGULATOR_SWITCH_ESRAM34] = {

		.supply_regulator = "db8500-vape",

		/*

		 * esram34 is set in retention and supplied by Vsafe when Vape is off,

		 * no need to hold Vape

		 */

		.constraints = {

			.name = "db8500-esram34",

			.valid_ops_mask = REGULATOR_CHANGE_STATUS,

CRA Git | Maintained and supported by SUSTech CRA and CCSE