[PATCH 1/2] mfd: sec-core: Rename MFD and regulator names differently

[PATCH 1/2] mfd: sec-core: Rename MFD and regulator names differently

[Alim Akhtar]

Currently S2MPSXX multifunction device is named as *-pmic,
and this MFD also supports regulator as a one of its MFD cell which
has the same name, which is a bit confusing.

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.

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

Suggested-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
---
 drivers/mfd/sec-core.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
index 7c4e7be17f1e..c9802ba9be72 100644
--- a/drivers/mfd/sec-core.c
+++ b/drivers/mfd/sec-core.c
@@ -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",
 	},
 };
 
-- 
1.7.10.4

[PATCH 2/2] regulator: s2mps11: Rename s2mpsxx regulator as *-regulator

[Alim Akhtar]

S2MPSXX regulators are probed with the same name as their parent MFD
device, this is a bit confusing.
As we discussed the same here[1], this patch rename the current regulator
names from *-pmic to *-regulator.

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

Suggested-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
---
 drivers/regulator/s2mps11.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index b2f3a28e720c..3242ffc0cb25 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -1199,11 +1199,11 @@ out:
 }
 
 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);
-- 
1.7.10.4

Re: [PATCH 2/2] regulator: s2mps11: Rename s2mpsxx regulator as *-regulator

[Lee Jones]

On Fri, 30 Oct 2015, Alim Akhtar wrote:

> S2MPSXX regulators are probed with the same name as their parent MFD
> device, this is a bit confusing.
> As we discussed the same here[1], this patch rename the current regulator
> names from *-pmic to *-regulator.
> 
> [1]-> https://lkml.org/lkml/2015/10/28/417
> 
> Suggested-by: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
> ---
>  drivers/regulator/s2mps11.c |    8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

You need to squash these patches together, or you will hurt
bisectability for your platform.

But the code looks good:
  Acked-by: Lee Jones <lee.jones@linaro.org>

> diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
> index b2f3a28e720c..3242ffc0cb25 100644
> --- a/drivers/regulator/s2mps11.c
> +++ b/drivers/regulator/s2mps11.c
> @@ -1199,11 +1199,11 @@ out:
>  }
>  
>  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);

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 1/2] mfd: sec-core: Rename MFD and regulator names differently

[Lee Jones]

On Fri, 30 Oct 2015, Alim Akhtar wrote:

> Currently S2MPSXX multifunction device is named as *-pmic,
> and this MFD also supports regulator as a one of its MFD cell which
> has the same name, which is a bit confusing.
> 
> 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.
> 
> [1]-> https://lkml.org/lkml/2015/10/28/417
> 
> Suggested-by: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
> ---
>  drivers/mfd/sec-core.c |    8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

You need to squash these patches together, or you will hurt
bisectability for your platform.
  
But the code looks good:
  Acked-by: Lee Jones <lee.jones@linaro.org>

> diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
> index 7c4e7be17f1e..c9802ba9be72 100644
> --- a/drivers/mfd/sec-core.c
> +++ b/drivers/mfd/sec-core.c
> @@ -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",
>  	},
>  };
>  

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH 1/2] mfd: sec-core: Rename MFD and regulator names differently

[Krzysztof Kozlowski]

2015-10-30 20:01 GMT+09:00 Alim Akhtar <alim.akhtar@samsung.com>:
> Currently S2MPSXX multifunction device is named as *-pmic,
> and this MFD also supports regulator as a one of its MFD cell which
> has the same name, which is a bit confusing.
>
> 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.
>
> [1]-> https://lkml.org/lkml/2015/10/28/417
>
> Suggested-by: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
> ---
>  drivers/mfd/sec-core.c |    8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)

Two comments from my side:
1. Lee already pointed issue with bisectability. This is a requirement.
2. What is missing in commit is the reason. Answer to question: Why?
The answer is in LKML discussion but it should be provided here - in
commit: because current naming is confusing and we want to sort it
out.

Best regards,
Krzysztof