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

Commit 2fadbbf0 authored by Alim Akhtar's avatar Alim Akhtar Committed by Lee Jones
Browse files

mfd: sec-core: Rename MFD and regulator names differently 

Currently S2MPSXX multifunction device is named as *-pmic,
and these MFDs also supports regulator as a one of its MFD cell which
has the same name, because current name is confusing and we want to
sort it out.

We did discussed different approaches about how the MFD and it
cells need to be named here [1].
Based in the discussion this patch rename MFD regulator name as
*-regulator instead of current *-pmic.

This patch also changes the corresponding entries in the regulator driver
to keep git-bisect happy.

[1]-> https://lkml.org/lkml/2015/10/28/417



Suggested-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarAlim Akhtar <alim.akhtar@samsung.com>
Reviewed-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 6223a309

drivers/mfd/sec-core.c

+4 −4
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ static const struct mfd_cell s5m8767_devs[] = { 


static const struct mfd_cell s2mps11_devs[] = {

	{

		.name = "s2mps11-pmic",

		.name = "s2mps11-regulator",

	}, {

		.name = "s2mps14-rtc",

	}, {
@@ -78,7 +78,7 @@ static const struct mfd_cell s2mps11_devs[] = { 
};



static const struct mfd_cell s2mps13_devs[] = {

	{ .name = "s2mps13-pmic", },

	{ .name = "s2mps13-regulator", },

	{ .name = "s2mps13-rtc", },

	{

		.name = "s2mps13-clk",
@@ -88,7 +88,7 @@ static const struct mfd_cell s2mps13_devs[] = { 


static const struct mfd_cell s2mps14_devs[] = {

	{

		.name = "s2mps14-pmic",

		.name = "s2mps14-regulator",

	}, {

		.name = "s2mps14-rtc",

	}, {
@@ -116,7 +116,7 @@ static const struct mfd_cell s2mpa01_devs[] = { 


static const struct mfd_cell s2mpu02_devs[] = {

	{

		.name = "s2mpu02-pmic",

		.name = "s2mpu02-regulator",

	},

};

drivers/regulator/s2mps11.c

+4 −4
Original line number Diff line number Diff line
@@ -1199,11 +1199,11 @@ static int s2mps11_pmic_probe(struct platform_device *pdev) 
}



static const struct platform_device_id s2mps11_pmic_id[] = {

	{ "s2mps11-pmic", S2MPS11X},

	{ "s2mps13-pmic", S2MPS13X},

	{ "s2mps14-pmic", S2MPS14X},

	{ "s2mps11-regulator", S2MPS11X},

	{ "s2mps13-regulator", S2MPS13X},

	{ "s2mps14-regulator", S2MPS14X},

	{ "s2mps15-regulator", S2MPS15X},

	{ "s2mpu02-pmic", S2MPU02},

	{ "s2mpu02-regulator", S2MPU02},

	{ },

};

MODULE_DEVICE_TABLE(platform, s2mps11_pmic_id);