Re: [RESEND PATCH v2] mfd: sec-core: Rename MFD and regulator names differently

[Lee Jones]

On Fri, 20 Nov 2015, Alim Akhtar wrote:

> 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: Lee Jones <lee.jones@xxxxxxxxxx>
> Signed-off-by: Alim Akhtar <alim.akhtar@xxxxxxxxxxx>
> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@xxxxxxxxxxx>
> Acked-by: Mark Brown <broonie@xxxxxxxxxx>
> Acked-by: Lee Jones <lee.jones@xxxxxxxxxx>
> ---
> Resending with collected Reviwed-by, Acked-by tags.
> 
>  drivers/mfd/sec-core.c      |    8 ++++----
>  drivers/regulator/s2mps11.c |    8 ++++----
>  2 files changed, 8 insertions(+), 8 deletions(-)

Applied, thanks.

> 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",
>  	},
>  };
>  
> 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/