Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5fc6c396 authored by Charles Keepax's avatar Charles Keepax Committed by Lee Jones
Browse files

mfd: arizona: Map MICVDD from extcon device to the Arizona core 



The extcon driver should be able to get its regulator against rather
than against the main arizona device, we must add a supply mapping
allowing the regulator to be located. This patch does so.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 996c2d4f

drivers/mfd/arizona-core.c

+16 −4
Original line number Original line Diff line number Diff line
@@ -578,17 +578,21 @@ static const struct mfd_cell early_devs[] = { 
};

};





static const char *wm5102_supplies[] = {

static const char *wm5102_supplies[] = {

	"MICVDD",

	"DBVDD2",

	"DBVDD2",

	"DBVDD3",

	"DBVDD3",

	"CPVDD",

	"CPVDD",

	"SPKVDDL",

	"SPKVDDL",

	"SPKVDDR",

	"SPKVDDR",

	"MICVDD",

};

};





static const struct mfd_cell wm5102_devs[] = {

static const struct mfd_cell wm5102_devs[] = {

	{ .name = "arizona-micsupp" },

	{ .name = "arizona-micsupp" },

	{ .name = "arizona-extcon" },

	{

		.name = "arizona-extcon",

		.parent_supplies = wm5102_supplies,

		.num_parent_supplies = 1, /* We only need MICVDD */

	},

	{ .name = "arizona-gpio" },

	{ .name = "arizona-gpio" },

	{ .name = "arizona-haptics" },

	{ .name = "arizona-haptics" },

	{ .name = "arizona-pwm" },

	{ .name = "arizona-pwm" },
@@ -601,7 +605,11 @@ static const struct mfd_cell wm5102_devs[] = { 




static const struct mfd_cell wm5110_devs[] = {

static const struct mfd_cell wm5110_devs[] = {

	{ .name = "arizona-micsupp" },

	{ .name = "arizona-micsupp" },

	{ .name = "arizona-extcon" },

	{

		.name = "arizona-extcon",

		.parent_supplies = wm5102_supplies,

		.num_parent_supplies = 1, /* We only need MICVDD */

	},

	{ .name = "arizona-gpio" },

	{ .name = "arizona-gpio" },

	{ .name = "arizona-haptics" },

	{ .name = "arizona-haptics" },

	{ .name = "arizona-pwm" },

	{ .name = "arizona-pwm" },
@@ -621,7 +629,11 @@ static const char *wm8997_supplies[] = { 




static const struct mfd_cell wm8997_devs[] = {

static const struct mfd_cell wm8997_devs[] = {

	{ .name = "arizona-micsupp" },

	{ .name = "arizona-micsupp" },

	{ .name = "arizona-extcon" },

	{

		.name = "arizona-extcon",

		.parent_supplies = wm8997_supplies,

		.num_parent_supplies = 1, /* We only need MICVDD */

	},

	{ .name = "arizona-gpio" },

	{ .name = "arizona-gpio" },

	{ .name = "arizona-haptics" },

	{ .name = "arizona-haptics" },

	{ .name = "arizona-pwm" },

	{ .name = "arizona-pwm" },