[PATCH 1/2] mfd: arizona: Add MICVDD to mapped regulators for wm8997

[PATCH 1/2] mfd: arizona: Add MICVDD to mapped regulators for wm8997

[Charles Keepax]

The previous update adding MICVDD to the regulator mappings:

mfd: arizona: Add MICVDD to mapped regulators

Only added the mapping for wm5102 and wm5110 but wm8997 also has a
MICVDD supply that needs to be mapped back to the main Arizona device.

Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
 drivers/mfd/arizona-core.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index e9c3563..e0d415e 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -613,6 +613,7 @@ static const struct mfd_cell wm5110_devs[] = {
 };
 
 static const char *wm8997_supplies[] = {
+	"MICVDD",
 	"DBVDD2",
 	"CPVDD",
 	"SPKVDD",
-- 
1.7.2.5

[PATCH 2/2] mfd: arizona: Map MICVDD from extcon device to the Arizona core

[Charles Keepax]

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: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
---
 drivers/mfd/arizona-core.c |   20 ++++++++++++++++----
 1 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
index e0d415e..cf3689f 100644
--- a/drivers/mfd/arizona-core.c
+++ b/drivers/mfd/arizona-core.c
@@ -578,17 +578,21 @@ static const struct mfd_cell early_devs[] = {
 };
 
 static const char *wm5102_supplies[] = {
+	"MICVDD",
 	"DBVDD2",
 	"DBVDD3",
 	"CPVDD",
 	"SPKVDDL",
 	"SPKVDDR",
-	"MICVDD",
 };
 
 static const struct mfd_cell wm5102_devs[] = {
 	{ .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-haptics" },
 	{ .name = "arizona-pwm" },
@@ -601,7 +605,11 @@ static const struct mfd_cell wm5102_devs[] = {
 
 static const struct mfd_cell wm5110_devs[] = {
 	{ .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-haptics" },
 	{ .name = "arizona-pwm" },
@@ -621,7 +629,11 @@ static const char *wm8997_supplies[] = {
 
 static const struct mfd_cell wm8997_devs[] = {
 	{ .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-haptics" },
 	{ .name = "arizona-pwm" },
-- 
1.7.2.5

Re: [PATCH 1/2] mfd: arizona: Add MICVDD to mapped regulators for wm8997

[Lee Jones]

On Fri, 25 Jul 2014, Charles Keepax wrote:

> The previous update adding MICVDD to the regulator mappings:
> 
> mfd: arizona: Add MICVDD to mapped regulators
> 
> Only added the mapping for wm5102 and wm5110 but wm8997 also has a
> MICVDD supply that needs to be mapped back to the main Arizona device.
> 
> Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
>  drivers/mfd/arizona-core.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)

Applied, thanks.

> diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
> index e9c3563..e0d415e 100644
> --- a/drivers/mfd/arizona-core.c
> +++ b/drivers/mfd/arizona-core.c
> @@ -613,6 +613,7 @@ static const struct mfd_cell wm5110_devs[] = {
>  };
>  
>  static const char *wm8997_supplies[] = {
> +	"MICVDD",
>  	"DBVDD2",
>  	"CPVDD",
>  	"SPKVDD",

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

Re: [PATCH 2/2] mfd: arizona: Map MICVDD from extcon device to the Arizona core

[Lee Jones]

On Fri, 25 Jul 2014, Charles Keepax wrote:

> 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: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>
> ---
>  drivers/mfd/arizona-core.c |   20 ++++++++++++++++----
>  1 files changed, 16 insertions(+), 4 deletions(-)

Applied, thanks.

> diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c
> index e0d415e..cf3689f 100644
> --- a/drivers/mfd/arizona-core.c
> +++ b/drivers/mfd/arizona-core.c
> @@ -578,17 +578,21 @@ static const struct mfd_cell early_devs[] = {
>  };
>  
>  static const char *wm5102_supplies[] = {
> +	"MICVDD",
>  	"DBVDD2",
>  	"DBVDD3",
>  	"CPVDD",
>  	"SPKVDDL",
>  	"SPKVDDR",
> -	"MICVDD",
>  };
>  
>  static const struct mfd_cell wm5102_devs[] = {
>  	{ .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-haptics" },
>  	{ .name = "arizona-pwm" },
> @@ -601,7 +605,11 @@ static const struct mfd_cell wm5102_devs[] = {
>  
>  static const struct mfd_cell wm5110_devs[] = {
>  	{ .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-haptics" },
>  	{ .name = "arizona-pwm" },
> @@ -621,7 +629,11 @@ static const char *wm8997_supplies[] = {
>  
>  static const struct mfd_cell wm8997_devs[] = {
>  	{ .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-haptics" },
>  	{ .name = "arizona-pwm" },

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