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

Commit 32dadef2 authored by Charles Keepax's avatar Charles Keepax Committed by Mark Brown
Browse files

mfd: arizona: Specify supply mappings for Arizona CODECs 



The CODEC power supplies should be looked up on the Arizona device as
they will be created here by device tree also update the only user of
non-device tree bindings.

Signed-off-by: default avatarCharles Keepax <ckeepax@opensource.wolfsonmicro.com>
Acked-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 7fcd4274

arch/arm/mach-s3c64xx/mach-crag6410.c

+0 −12
Original line number Diff line number Diff line
@@ -310,10 +310,6 @@ static struct regulator_consumer_supply wallvdd_consumers[] = { 


	REGULATOR_SUPPLY("SPKVDDL", "spi0.1"),

	REGULATOR_SUPPLY("SPKVDDR", "spi0.1"),

	REGULATOR_SUPPLY("SPKVDDL", "wm5102-codec"),

	REGULATOR_SUPPLY("SPKVDDR", "wm5102-codec"),

	REGULATOR_SUPPLY("SPKVDDL", "wm5110-codec"),

	REGULATOR_SUPPLY("SPKVDDR", "wm5110-codec"),



	REGULATOR_SUPPLY("DC1VDD", "0-0034"),

	REGULATOR_SUPPLY("DC2VDD", "0-0034"),
@@ -653,14 +649,6 @@ static struct regulator_consumer_supply pvdd_1v8_consumers[] = { 
	REGULATOR_SUPPLY("DBVDD3", "spi0.1"),

	REGULATOR_SUPPLY("LDOVDD", "spi0.1"),

	REGULATOR_SUPPLY("CPVDD", "spi0.1"),



	REGULATOR_SUPPLY("DBVDD2", "wm5102-codec"),

	REGULATOR_SUPPLY("DBVDD3", "wm5102-codec"),

	REGULATOR_SUPPLY("CPVDD", "wm5102-codec"),



	REGULATOR_SUPPLY("DBVDD2", "wm5110-codec"),

	REGULATOR_SUPPLY("DBVDD3", "wm5110-codec"),

	REGULATOR_SUPPLY("CPVDD", "wm5110-codec"),

};



static struct regulator_init_data pvdd_1v8 = {

drivers/mfd/arizona-core.c

+29 −3
Original line number Diff line number Diff line
@@ -569,13 +569,25 @@ static struct mfd_cell early_devs[] = { 
	{ .name = "arizona-ldo1" },

};



static const char *wm5102_supplies[] = {

	"DBVDD2",

	"DBVDD3",

	"CPVDD",

	"SPKVDDL",

	"SPKVDDR",

};



static struct mfd_cell wm5102_devs[] = {

	{ .name = "arizona-micsupp" },

	{ .name = "arizona-extcon" },

	{ .name = "arizona-gpio" },

	{ .name = "arizona-haptics" },

	{ .name = "arizona-pwm" },

	{ .name = "wm5102-codec" },

	{

		.name = "wm5102-codec",

		.parent_supplies = wm5102_supplies,

		.num_parent_supplies = ARRAY_SIZE(wm5102_supplies),

	},

};



static struct mfd_cell wm5110_devs[] = {
@@ -584,7 +596,17 @@ static struct mfd_cell wm5110_devs[] = { 
	{ .name = "arizona-gpio" },

	{ .name = "arizona-haptics" },

	{ .name = "arizona-pwm" },

	{ .name = "wm5110-codec" },

	{

		.name = "wm5110-codec",

		.parent_supplies = wm5102_supplies,

		.num_parent_supplies = ARRAY_SIZE(wm5102_supplies),

	},

};



static const char *wm8997_supplies[] = {

	"DBVDD2",

	"CPVDD",

	"SPKVDD",

};



static struct mfd_cell wm8997_devs[] = {
@@ -593,7 +615,11 @@ static struct mfd_cell wm8997_devs[] = { 
	{ .name = "arizona-gpio" },

	{ .name = "arizona-haptics" },

	{ .name = "arizona-pwm" },

	{ .name = "wm8997-codec" },

	{

		.name = "wm8997-codec",

		.parent_supplies = wm8997_supplies,

		.num_parent_supplies = ARRAY_SIZE(wm8997_supplies),

	},

};



int arizona_dev_init(struct arizona *arizona)