[PATCH v8 0/2] AXP8x3 AC and battery power supply support

[PATCH v8 0/2] AXP8x3 AC and battery power supply support

[Oskari Lemmela]

AXP813 AC power supply support with input current and
voltage limiting support.

AXP803 AC and battery power supply support.

Changes in v8:
* Fixed SOB in "Re-align mfd cell entries" patch
* Send only last two commits which are pending merging

Changes in v7:
* Added re-align patch for mfd cells

Changes in v6:
* Collected tags
* Rebase to master
* Dropped AXP803 compatible patches

Changes in v5:
* Return correct input current limit for values 0x6 and 0x7
* Add specific compatibles for AXP803
* Change commit messages
* Add Vasily Khoruzhick Pinebook DTS patch

Changes in v4:
* Change order of axp20x-gpio in axp20x.c
* Fix indentation and spaces to tabs in axp20x.c

Changes in v3:
* Reorder ac_power_supply DT node
* Rename axp20x_ac_power_set_property function
* Split mfd commit 

Changes in v2:
* Reuse axp813 compatibles for axp803
* Refactor axp20x_ac_power.c

Chen-Yu Tsai (1):
  mfd: axp20x: Re-align mfd cell entries

Oskari Lemmela (1):
  mfd: axp20x: Add supported cells for AXP803

 drivers/mfd/axp20x.c | 121 +++++++++++++++++++++++--------------------
 1 file changed, 65 insertions(+), 56 deletions(-)

-- 
2.17.1

[PATCH v8 1/2] mfd: axp20x: Re-align mfd cell entries

[Oskari Lemmela]

From: Chen-Yu Tsai <wens@csie.org>

In the axp20x driver, the various mfd_cell lists had varying amounts
of indentation, sometimes even within the same list. For the axp288,
there's no alignment at all.

Re-align the right hand side of the assignments with the least amount
of tabs possible. Also collapse the closing bracket and the opening
bracket of the next entry onto the same line for the axp288, to be
consistent with all the other mfd_cell lists.

This patch is whitespace change only. No functionality is modified.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
---
 drivers/mfd/axp20x.c | 107 +++++++++++++++++++++----------------------
 1 file changed, 51 insertions(+), 56 deletions(-)

diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index dfc3cff1d08b..8037b4e01ed6 100644
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -640,9 +640,9 @@ static const struct mfd_cell axp221_cells[] = {
 
 static const struct mfd_cell axp223_cells[] = {
 	{
-		.name			= "axp221-pek",
-		.num_resources		= ARRAY_SIZE(axp22x_pek_resources),
-		.resources		= axp22x_pek_resources,
+		.name		= "axp221-pek",
+		.num_resources	= ARRAY_SIZE(axp22x_pek_resources),
+		.resources	= axp22x_pek_resources,
 	}, {
 		.name		= "axp22x-adc",
 		.of_compatible	= "x-powers,axp221-adc",
@@ -650,7 +650,7 @@ static const struct mfd_cell axp223_cells[] = {
 		.name		= "axp20x-battery-power-supply",
 		.of_compatible	= "x-powers,axp221-battery-power-supply",
 	}, {
-		.name			= "axp20x-regulator",
+		.name		= "axp20x-regulator",
 	}, {
 		.name		= "axp20x-ac-power-supply",
 		.of_compatible	= "x-powers,axp221-ac-power-supply",
@@ -666,9 +666,9 @@ static const struct mfd_cell axp223_cells[] = {
 
 static const struct mfd_cell axp152_cells[] = {
 	{
-		.name			= "axp20x-pek",
-		.num_resources		= ARRAY_SIZE(axp152_pek_resources),
-		.resources		= axp152_pek_resources,
+		.name		= "axp20x-pek",
+		.num_resources	= ARRAY_SIZE(axp152_pek_resources),
+		.resources	= axp152_pek_resources,
 	},
 };
 
@@ -697,84 +697,79 @@ static const struct resource axp288_charger_resources[] = {
 
 static const struct mfd_cell axp288_cells[] = {
 	{
-		.name = "axp288_adc",
-		.num_resources = ARRAY_SIZE(axp288_adc_resources),
-		.resources = axp288_adc_resources,
-	},
-	{
-		.name = "axp288_extcon",
-		.num_resources = ARRAY_SIZE(axp288_extcon_resources),
-		.resources = axp288_extcon_resources,
-	},
-	{
-		.name = "axp288_charger",
-		.num_resources = ARRAY_SIZE(axp288_charger_resources),
-		.resources = axp288_charger_resources,
-	},
-	{
-		.name = "axp288_fuel_gauge",
-		.num_resources = ARRAY_SIZE(axp288_fuel_gauge_resources),
-		.resources = axp288_fuel_gauge_resources,
-	},
-	{
-		.name = "axp221-pek",
-		.num_resources = ARRAY_SIZE(axp288_power_button_resources),
-		.resources = axp288_power_button_resources,
-	},
-	{
-		.name = "axp288_pmic_acpi",
+		.name		= "axp288_adc",
+		.num_resources	= ARRAY_SIZE(axp288_adc_resources),
+		.resources	= axp288_adc_resources,
+	}, {
+		.name		= "axp288_extcon",
+		.num_resources	= ARRAY_SIZE(axp288_extcon_resources),
+		.resources	= axp288_extcon_resources,
+	}, {
+		.name		= "axp288_charger",
+		.num_resources	= ARRAY_SIZE(axp288_charger_resources),
+		.resources	= axp288_charger_resources,
+	}, {
+		.name		= "axp288_fuel_gauge",
+		.num_resources	= ARRAY_SIZE(axp288_fuel_gauge_resources),
+		.resources	= axp288_fuel_gauge_resources,
+	}, {
+		.name		= "axp221-pek",
+		.num_resources	= ARRAY_SIZE(axp288_power_button_resources),
+		.resources	= axp288_power_button_resources,
+	}, {
+		.name		= "axp288_pmic_acpi",
 	},
 };
 
 static const struct mfd_cell axp803_cells[] = {
 	{
-		.name			= "axp221-pek",
-		.num_resources		= ARRAY_SIZE(axp803_pek_resources),
-		.resources		= axp803_pek_resources,
+		.name		= "axp221-pek",
+		.num_resources	= ARRAY_SIZE(axp803_pek_resources),
+		.resources	= axp803_pek_resources,
 	},
-	{	.name			= "axp20x-regulator" },
+	{	.name		= "axp20x-regulator" },
 };
 
 static const struct mfd_cell axp806_self_working_cells[] = {
 	{
-		.name			= "axp221-pek",
-		.num_resources		= ARRAY_SIZE(axp806_pek_resources),
-		.resources		= axp806_pek_resources,
+		.name		= "axp221-pek",
+		.num_resources	= ARRAY_SIZE(axp806_pek_resources),
+		.resources	= axp806_pek_resources,
 	},
-	{	.name			= "axp20x-regulator" },
+	{	.name		= "axp20x-regulator" },
 };
 
 static const struct mfd_cell axp806_cells[] = {
 	{
-		.id			= 2,
-		.name			= "axp20x-regulator",
+		.id		= 2,
+		.name		= "axp20x-regulator",
 	},
 };
 
 static const struct mfd_cell axp809_cells[] = {
 	{
-		.name			= "axp221-pek",
-		.num_resources		= ARRAY_SIZE(axp809_pek_resources),
-		.resources		= axp809_pek_resources,
+		.name		= "axp221-pek",
+		.num_resources	= ARRAY_SIZE(axp809_pek_resources),
+		.resources	= axp809_pek_resources,
 	}, {
-		.id			= 1,
-		.name			= "axp20x-regulator",
+		.id		= 1,
+		.name		= "axp20x-regulator",
 	},
 };
 
 static const struct mfd_cell axp813_cells[] = {
 	{
-		.name			= "axp221-pek",
-		.num_resources		= ARRAY_SIZE(axp803_pek_resources),
-		.resources		= axp803_pek_resources,
+		.name		= "axp221-pek",
+		.num_resources	= ARRAY_SIZE(axp803_pek_resources),
+		.resources	= axp803_pek_resources,
 	}, {
-		.name			= "axp20x-regulator",
+		.name		= "axp20x-regulator",
 	}, {
-		.name			= "axp20x-gpio",
-		.of_compatible		= "x-powers,axp813-gpio",
+		.name		= "axp20x-gpio",
+		.of_compatible	= "x-powers,axp813-gpio",
 	}, {
-		.name			= "axp813-adc",
-		.of_compatible		= "x-powers,axp813-adc",
+		.name		= "axp813-adc",
+		.of_compatible	= "x-powers,axp813-adc",
 	}, {
 		.name		= "axp20x-battery-power-supply",
 		.of_compatible	= "x-powers,axp813-battery-power-supply",
-- 
2.17.1

[PATCH v8 2/2] mfd: axp20x: Add supported cells for AXP803

[Oskari Lemmela]

Parts of the AXP803 are compatible with their counterparts on the AXP813.
These include the GPIO, ADC, AC and battery power supplies.

Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Tested-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 drivers/mfd/axp20x.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index 8037b4e01ed6..f8e0fa97bb31 100644
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -726,6 +726,20 @@ static const struct mfd_cell axp803_cells[] = {
 		.name		= "axp221-pek",
 		.num_resources	= ARRAY_SIZE(axp803_pek_resources),
 		.resources	= axp803_pek_resources,
+	}, {
+		.name		= "axp20x-gpio",
+		.of_compatible	= "x-powers,axp813-gpio",
+	}, {
+		.name		= "axp813-adc",
+		.of_compatible	= "x-powers,axp813-adc",
+	}, {
+		.name		= "axp20x-battery-power-supply",
+		.of_compatible	= "x-powers,axp813-battery-power-supply",
+	}, {
+		.name		= "axp20x-ac-power-supply",
+		.of_compatible	= "x-powers,axp813-ac-power-supply",
+		.num_resources	= ARRAY_SIZE(axp20x_ac_power_supply_resources),
+		.resources	= axp20x_ac_power_supply_resources,
 	},
 	{	.name		= "axp20x-regulator" },
 };
-- 
2.17.1

Re: [PATCH v8 1/2] mfd: axp20x: Re-align mfd cell entries

[Lee Jones]

On Sat, 08 Dec 2018, Oskari Lemmela wrote:

> From: Chen-Yu Tsai <wens@csie.org>
> 
> In the axp20x driver, the various mfd_cell lists had varying amounts
> of indentation, sometimes even within the same list. For the axp288,
> there's no alignment at all.
> 
> Re-align the right hand side of the assignments with the least amount
> of tabs possible. Also collapse the closing bracket and the opening
> bracket of the next entry onto the same line for the axp288, to be
> consistent with all the other mfd_cell lists.
> 
> This patch is whitespace change only. No functionality is modified.
> 
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
> ---
>  drivers/mfd/axp20x.c | 107 +++++++++++++++++++++----------------------
>  1 file changed, 51 insertions(+), 56 deletions(-)

Applied, thanks.

-- 
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH v8 2/2] mfd: axp20x: Add supported cells for AXP803

[Lee Jones]

On Sat, 08 Dec 2018, Oskari Lemmela wrote:

> Parts of the AXP803 are compatible with their counterparts on the AXP813.
> These include the GPIO, ADC, AC and battery power supplies.
> 
> Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
> Reviewed-by: Chen-Yu Tsai <wens@csie.org>
> Tested-by: Vasily Khoruzhick <anarsoul@gmail.com>
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> ---
>  drivers/mfd/axp20x.c | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)

Applied, thanks.

-- 
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH v8 2/2] mfd: axp20x: Add supported cells for AXP803

[Lee Jones]

On Sat, 08 Dec 2018, Oskari Lemmela wrote:

> Parts of the AXP803 are compatible with their counterparts on the AXP813.
> These include the GPIO, ADC, AC and battery power supplies.
> 
> Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
> Reviewed-by: Chen-Yu Tsai <wens@csie.org>
> Tested-by: Vasily Khoruzhick <anarsoul@gmail.com>
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>

I'm happy to fix this, but ...

Can you explain these tags for me please?

Specifically the last one.

Why does Chen-Yu Tsai have an SoB there?

> ---
>  drivers/mfd/axp20x.c | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)
> 
> diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
> index 8037b4e01ed6..f8e0fa97bb31 100644
> --- a/drivers/mfd/axp20x.c
> +++ b/drivers/mfd/axp20x.c
> @@ -726,6 +726,20 @@ static const struct mfd_cell axp803_cells[] = {
>  		.name		= "axp221-pek",
>  		.num_resources	= ARRAY_SIZE(axp803_pek_resources),
>  		.resources	= axp803_pek_resources,
> +	}, {
> +		.name		= "axp20x-gpio",
> +		.of_compatible	= "x-powers,axp813-gpio",
> +	}, {
> +		.name		= "axp813-adc",
> +		.of_compatible	= "x-powers,axp813-adc",
> +	}, {
> +		.name		= "axp20x-battery-power-supply",
> +		.of_compatible	= "x-powers,axp813-battery-power-supply",
> +	}, {
> +		.name		= "axp20x-ac-power-supply",
> +		.of_compatible	= "x-powers,axp813-ac-power-supply",
> +		.num_resources	= ARRAY_SIZE(axp20x_ac_power_supply_resources),
> +		.resources	= axp20x_ac_power_supply_resources,
>  	},
>  	{	.name		= "axp20x-regulator" },
>  };

-- 
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH v8 1/2] mfd: axp20x: Re-align mfd cell entries

[Lee Jones]

On Sat, 08 Dec 2018, Oskari Lemmela wrote:

> From: Chen-Yu Tsai <wens@csie.org>
> 
> In the axp20x driver, the various mfd_cell lists had varying amounts
> of indentation, sometimes even within the same list. For the axp288,
> there's no alignment at all.
> 
> Re-align the right hand side of the assignments with the least amount
> of tabs possible. Also collapse the closing bracket and the opening
> bracket of the next entry onto the same line for the axp288, to be
> consistent with all the other mfd_cell lists.
> 
> This patch is whitespace change only. No functionality is modified.
> 
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> Signed-off-by: Oskari Lemmela <oskari@lemmela.net>

Why is Oskari Lemmela's SoB here?

You both authored this alignment patch?

> ---
>  drivers/mfd/axp20x.c | 107 +++++++++++++++++++++----------------------
>  1 file changed, 51 insertions(+), 56 deletions(-)
> 
> diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
> index dfc3cff1d08b..8037b4e01ed6 100644
> --- a/drivers/mfd/axp20x.c
> +++ b/drivers/mfd/axp20x.c
> @@ -640,9 +640,9 @@ static const struct mfd_cell axp221_cells[] = {
>  
>  static const struct mfd_cell axp223_cells[] = {
>  	{
> -		.name			= "axp221-pek",
> -		.num_resources		= ARRAY_SIZE(axp22x_pek_resources),
> -		.resources		= axp22x_pek_resources,
> +		.name		= "axp221-pek",
> +		.num_resources	= ARRAY_SIZE(axp22x_pek_resources),
> +		.resources	= axp22x_pek_resources,
>  	}, {
>  		.name		= "axp22x-adc",
>  		.of_compatible	= "x-powers,axp221-adc",
> @@ -650,7 +650,7 @@ static const struct mfd_cell axp223_cells[] = {
>  		.name		= "axp20x-battery-power-supply",
>  		.of_compatible	= "x-powers,axp221-battery-power-supply",
>  	}, {
> -		.name			= "axp20x-regulator",
> +		.name		= "axp20x-regulator",
>  	}, {
>  		.name		= "axp20x-ac-power-supply",
>  		.of_compatible	= "x-powers,axp221-ac-power-supply",
> @@ -666,9 +666,9 @@ static const struct mfd_cell axp223_cells[] = {
>  
>  static const struct mfd_cell axp152_cells[] = {
>  	{
> -		.name			= "axp20x-pek",
> -		.num_resources		= ARRAY_SIZE(axp152_pek_resources),
> -		.resources		= axp152_pek_resources,
> +		.name		= "axp20x-pek",
> +		.num_resources	= ARRAY_SIZE(axp152_pek_resources),
> +		.resources	= axp152_pek_resources,
>  	},
>  };
>  
> @@ -697,84 +697,79 @@ static const struct resource axp288_charger_resources[] = {
>  
>  static const struct mfd_cell axp288_cells[] = {
>  	{
> -		.name = "axp288_adc",
> -		.num_resources = ARRAY_SIZE(axp288_adc_resources),
> -		.resources = axp288_adc_resources,
> -	},
> -	{
> -		.name = "axp288_extcon",
> -		.num_resources = ARRAY_SIZE(axp288_extcon_resources),
> -		.resources = axp288_extcon_resources,
> -	},
> -	{
> -		.name = "axp288_charger",
> -		.num_resources = ARRAY_SIZE(axp288_charger_resources),
> -		.resources = axp288_charger_resources,
> -	},
> -	{
> -		.name = "axp288_fuel_gauge",
> -		.num_resources = ARRAY_SIZE(axp288_fuel_gauge_resources),
> -		.resources = axp288_fuel_gauge_resources,
> -	},
> -	{
> -		.name = "axp221-pek",
> -		.num_resources = ARRAY_SIZE(axp288_power_button_resources),
> -		.resources = axp288_power_button_resources,
> -	},
> -	{
> -		.name = "axp288_pmic_acpi",
> +		.name		= "axp288_adc",
> +		.num_resources	= ARRAY_SIZE(axp288_adc_resources),
> +		.resources	= axp288_adc_resources,
> +	}, {
> +		.name		= "axp288_extcon",
> +		.num_resources	= ARRAY_SIZE(axp288_extcon_resources),
> +		.resources	= axp288_extcon_resources,
> +	}, {
> +		.name		= "axp288_charger",
> +		.num_resources	= ARRAY_SIZE(axp288_charger_resources),
> +		.resources	= axp288_charger_resources,
> +	}, {
> +		.name		= "axp288_fuel_gauge",
> +		.num_resources	= ARRAY_SIZE(axp288_fuel_gauge_resources),
> +		.resources	= axp288_fuel_gauge_resources,
> +	}, {
> +		.name		= "axp221-pek",
> +		.num_resources	= ARRAY_SIZE(axp288_power_button_resources),
> +		.resources	= axp288_power_button_resources,
> +	}, {
> +		.name		= "axp288_pmic_acpi",
>  	},
>  };
>  
>  static const struct mfd_cell axp803_cells[] = {
>  	{
> -		.name			= "axp221-pek",
> -		.num_resources		= ARRAY_SIZE(axp803_pek_resources),
> -		.resources		= axp803_pek_resources,
> +		.name		= "axp221-pek",
> +		.num_resources	= ARRAY_SIZE(axp803_pek_resources),
> +		.resources	= axp803_pek_resources,
>  	},
> -	{	.name			= "axp20x-regulator" },
> +	{	.name		= "axp20x-regulator" },
>  };
>  
>  static const struct mfd_cell axp806_self_working_cells[] = {
>  	{
> -		.name			= "axp221-pek",
> -		.num_resources		= ARRAY_SIZE(axp806_pek_resources),
> -		.resources		= axp806_pek_resources,
> +		.name		= "axp221-pek",
> +		.num_resources	= ARRAY_SIZE(axp806_pek_resources),
> +		.resources	= axp806_pek_resources,
>  	},
> -	{	.name			= "axp20x-regulator" },
> +	{	.name		= "axp20x-regulator" },
>  };
>  
>  static const struct mfd_cell axp806_cells[] = {
>  	{
> -		.id			= 2,
> -		.name			= "axp20x-regulator",
> +		.id		= 2,
> +		.name		= "axp20x-regulator",
>  	},
>  };
>  
>  static const struct mfd_cell axp809_cells[] = {
>  	{
> -		.name			= "axp221-pek",
> -		.num_resources		= ARRAY_SIZE(axp809_pek_resources),
> -		.resources		= axp809_pek_resources,
> +		.name		= "axp221-pek",
> +		.num_resources	= ARRAY_SIZE(axp809_pek_resources),
> +		.resources	= axp809_pek_resources,
>  	}, {
> -		.id			= 1,
> -		.name			= "axp20x-regulator",
> +		.id		= 1,
> +		.name		= "axp20x-regulator",
>  	},
>  };
>  
>  static const struct mfd_cell axp813_cells[] = {
>  	{
> -		.name			= "axp221-pek",
> -		.num_resources		= ARRAY_SIZE(axp803_pek_resources),
> -		.resources		= axp803_pek_resources,
> +		.name		= "axp221-pek",
> +		.num_resources	= ARRAY_SIZE(axp803_pek_resources),
> +		.resources	= axp803_pek_resources,
>  	}, {
> -		.name			= "axp20x-regulator",
> +		.name		= "axp20x-regulator",
>  	}, {
> -		.name			= "axp20x-gpio",
> -		.of_compatible		= "x-powers,axp813-gpio",
> +		.name		= "axp20x-gpio",
> +		.of_compatible	= "x-powers,axp813-gpio",
>  	}, {
> -		.name			= "axp813-adc",
> -		.of_compatible		= "x-powers,axp813-adc",
> +		.name		= "axp813-adc",
> +		.of_compatible	= "x-powers,axp813-adc",
>  	}, {
>  		.name		= "axp20x-battery-power-supply",
>  		.of_compatible	= "x-powers,axp813-battery-power-supply",

-- 
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH v8 2/2] mfd: axp20x: Add supported cells for AXP803

[Chen-Yu Tsai]

On Mon, Dec 10, 2018 at 2:35 PM Lee Jones <lee.jones@linaro.org> wrote:
>
> On Sat, 08 Dec 2018, Oskari Lemmela wrote:
>
> > Parts of the AXP803 are compatible with their counterparts on the AXP813.
> > These include the GPIO, ADC, AC and battery power supplies.
> >
> > Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
> > Reviewed-by: Chen-Yu Tsai <wens@csie.org>
> > Tested-by: Vasily Khoruzhick <anarsoul@gmail.com>
> > Signed-off-by: Chen-Yu Tsai <wens@csie.org>
>
> I'm happy to fix this, but ...
>
> Can you explain these tags for me please?
>
> Specifically the last one.
>
> Why does Chen-Yu Tsai have an SoB there?

I picked his patch to rebase off the previous one, and reworked the ordering.
I then pushed it onto GitHub [1], but didn't get around to sending it to the
mailing lists. Oskari said on IRC that he would handle it.

I'm not sure what would be appropriate here though? Oskari's first SoB should
be kept, since he's the original author. Maybe he should've added his SoB
again as the final entry? Either way I suppose it would be confusing without
any explanation.

ChenYu

[1] https://github.com/wens/linux/commit/951afe2dc32086174ab07a1a997d748f69bf5bf2
[2] https://freenode.irclog.whitequark.org/linux-sunxi/2018-12-08#23644905;

Re: [PATCH v8 1/2] mfd: axp20x: Re-align mfd cell entries

[Oskari Lemmelä]

Hi Lee,

On 10.12.2018 8.36, Lee Jones wrote:
> On Sat, 08 Dec 2018, Oskari Lemmela wrote:
>
>> From: Chen-Yu Tsai <wens@csie.org>
>>
>> In the axp20x driver, the various mfd_cell lists had varying amounts
>> of indentation, sometimes even within the same list. For the axp288,
>> there's no alignment at all.
>>
>> Re-align the right hand side of the assignments with the least amount
>> of tabs possible. Also collapse the closing bracket and the opening
>> bracket of the next entry onto the same line for the axp288, to be
>> consistent with all the other mfd_cell lists.
>>
>> This patch is whitespace change only. No functionality is modified.
>>
>> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
>> Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
> Why is Oskari Lemmela's SoB here?
>
> You both authored this alignment patch?
I picked up Chen-Yu's patch from
https://github.com/wens/linux/commit/b99cec26bae2835a0374463570ea9ea26b034afa.
I should have mentioned it cover letter.

Chen-Yu is correct author. I'm just sending his patch.

>
>> ---
>>  drivers/mfd/axp20x.c | 107 +++++++++++++++++++++----------------------
>>  1 file changed, 51 insertions(+), 56 deletions(-)
>>
>> diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
>> index dfc3cff1d08b..8037b4e01ed6 100644
>> --- a/drivers/mfd/axp20x.c
>> +++ b/drivers/mfd/axp20x.c
>> @@ -640,9 +640,9 @@ static const struct mfd_cell axp221_cells[] = {
>>  
>>  static const struct mfd_cell axp223_cells[] = {
>>  	{
>> -		.name			= "axp221-pek",
>> -		.num_resources		= ARRAY_SIZE(axp22x_pek_resources),
>> -		.resources		= axp22x_pek_resources,
>> +		.name		= "axp221-pek",
>> +		.num_resources	= ARRAY_SIZE(axp22x_pek_resources),
>> +		.resources	= axp22x_pek_resources,
>>  	}, {
>>  		.name		= "axp22x-adc",
>>  		.of_compatible	= "x-powers,axp221-adc",
>> @@ -650,7 +650,7 @@ static const struct mfd_cell axp223_cells[] = {
>>  		.name		= "axp20x-battery-power-supply",
>>  		.of_compatible	= "x-powers,axp221-battery-power-supply",
>>  	}, {
>> -		.name			= "axp20x-regulator",
>> +		.name		= "axp20x-regulator",
>>  	}, {
>>  		.name		= "axp20x-ac-power-supply",
>>  		.of_compatible	= "x-powers,axp221-ac-power-supply",
>> @@ -666,9 +666,9 @@ static const struct mfd_cell axp223_cells[] = {
>>  
>>  static const struct mfd_cell axp152_cells[] = {
>>  	{
>> -		.name			= "axp20x-pek",
>> -		.num_resources		= ARRAY_SIZE(axp152_pek_resources),
>> -		.resources		= axp152_pek_resources,
>> +		.name		= "axp20x-pek",
>> +		.num_resources	= ARRAY_SIZE(axp152_pek_resources),
>> +		.resources	= axp152_pek_resources,
>>  	},
>>  };
>>  
>> @@ -697,84 +697,79 @@ static const struct resource axp288_charger_resources[] = {
>>  
>>  static const struct mfd_cell axp288_cells[] = {
>>  	{
>> -		.name = "axp288_adc",
>> -		.num_resources = ARRAY_SIZE(axp288_adc_resources),
>> -		.resources = axp288_adc_resources,
>> -	},
>> -	{
>> -		.name = "axp288_extcon",
>> -		.num_resources = ARRAY_SIZE(axp288_extcon_resources),
>> -		.resources = axp288_extcon_resources,
>> -	},
>> -	{
>> -		.name = "axp288_charger",
>> -		.num_resources = ARRAY_SIZE(axp288_charger_resources),
>> -		.resources = axp288_charger_resources,
>> -	},
>> -	{
>> -		.name = "axp288_fuel_gauge",
>> -		.num_resources = ARRAY_SIZE(axp288_fuel_gauge_resources),
>> -		.resources = axp288_fuel_gauge_resources,
>> -	},
>> -	{
>> -		.name = "axp221-pek",
>> -		.num_resources = ARRAY_SIZE(axp288_power_button_resources),
>> -		.resources = axp288_power_button_resources,
>> -	},
>> -	{
>> -		.name = "axp288_pmic_acpi",
>> +		.name		= "axp288_adc",
>> +		.num_resources	= ARRAY_SIZE(axp288_adc_resources),
>> +		.resources	= axp288_adc_resources,
>> +	}, {
>> +		.name		= "axp288_extcon",
>> +		.num_resources	= ARRAY_SIZE(axp288_extcon_resources),
>> +		.resources	= axp288_extcon_resources,
>> +	}, {
>> +		.name		= "axp288_charger",
>> +		.num_resources	= ARRAY_SIZE(axp288_charger_resources),
>> +		.resources	= axp288_charger_resources,
>> +	}, {
>> +		.name		= "axp288_fuel_gauge",
>> +		.num_resources	= ARRAY_SIZE(axp288_fuel_gauge_resources),
>> +		.resources	= axp288_fuel_gauge_resources,
>> +	}, {
>> +		.name		= "axp221-pek",
>> +		.num_resources	= ARRAY_SIZE(axp288_power_button_resources),
>> +		.resources	= axp288_power_button_resources,
>> +	}, {
>> +		.name		= "axp288_pmic_acpi",
>>  	},
>>  };
>>  
>>  static const struct mfd_cell axp803_cells[] = {
>>  	{
>> -		.name			= "axp221-pek",
>> -		.num_resources		= ARRAY_SIZE(axp803_pek_resources),
>> -		.resources		= axp803_pek_resources,
>> +		.name		= "axp221-pek",
>> +		.num_resources	= ARRAY_SIZE(axp803_pek_resources),
>> +		.resources	= axp803_pek_resources,
>>  	},
>> -	{	.name			= "axp20x-regulator" },
>> +	{	.name		= "axp20x-regulator" },
>>  };
>>  
>>  static const struct mfd_cell axp806_self_working_cells[] = {
>>  	{
>> -		.name			= "axp221-pek",
>> -		.num_resources		= ARRAY_SIZE(axp806_pek_resources),
>> -		.resources		= axp806_pek_resources,
>> +		.name		= "axp221-pek",
>> +		.num_resources	= ARRAY_SIZE(axp806_pek_resources),
>> +		.resources	= axp806_pek_resources,
>>  	},
>> -	{	.name			= "axp20x-regulator" },
>> +	{	.name		= "axp20x-regulator" },
>>  };
>>  
>>  static const struct mfd_cell axp806_cells[] = {
>>  	{
>> -		.id			= 2,
>> -		.name			= "axp20x-regulator",
>> +		.id		= 2,
>> +		.name		= "axp20x-regulator",
>>  	},
>>  };
>>  
>>  static const struct mfd_cell axp809_cells[] = {
>>  	{
>> -		.name			= "axp221-pek",
>> -		.num_resources		= ARRAY_SIZE(axp809_pek_resources),
>> -		.resources		= axp809_pek_resources,
>> +		.name		= "axp221-pek",
>> +		.num_resources	= ARRAY_SIZE(axp809_pek_resources),
>> +		.resources	= axp809_pek_resources,
>>  	}, {
>> -		.id			= 1,
>> -		.name			= "axp20x-regulator",
>> +		.id		= 1,
>> +		.name		= "axp20x-regulator",
>>  	},
>>  };
>>  
>>  static const struct mfd_cell axp813_cells[] = {
>>  	{
>> -		.name			= "axp221-pek",
>> -		.num_resources		= ARRAY_SIZE(axp803_pek_resources),
>> -		.resources		= axp803_pek_resources,
>> +		.name		= "axp221-pek",
>> +		.num_resources	= ARRAY_SIZE(axp803_pek_resources),
>> +		.resources	= axp803_pek_resources,
>>  	}, {
>> -		.name			= "axp20x-regulator",
>> +		.name		= "axp20x-regulator",
>>  	}, {
>> -		.name			= "axp20x-gpio",
>> -		.of_compatible		= "x-powers,axp813-gpio",
>> +		.name		= "axp20x-gpio",
>> +		.of_compatible	= "x-powers,axp813-gpio",
>>  	}, {
>> -		.name			= "axp813-adc",
>> -		.of_compatible		= "x-powers,axp813-adc",
>> +		.name		= "axp813-adc",
>> +		.of_compatible	= "x-powers,axp813-adc",
>>  	}, {
>>  		.name		= "axp20x-battery-power-supply",
>>  		.of_compatible	= "x-powers,axp813-battery-power-supply",
Thanks,
Oskari

Re: [PATCH v8 2/2] mfd: axp20x: Add supported cells for AXP803

[Lee Jones]

On Mon, 10 Dec 2018, Chen-Yu Tsai wrote:

> On Mon, Dec 10, 2018 at 2:35 PM Lee Jones <lee.jones@linaro.org> wrote:
> >
> > On Sat, 08 Dec 2018, Oskari Lemmela wrote:
> >
> > > Parts of the AXP803 are compatible with their counterparts on the AXP813.
> > > These include the GPIO, ADC, AC and battery power supplies.
> > >
> > > Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
> > > Reviewed-by: Chen-Yu Tsai <wens@csie.org>
> > > Tested-by: Vasily Khoruzhick <anarsoul@gmail.com>
> > > Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> >
> > I'm happy to fix this, but ...
> >
> > Can you explain these tags for me please?
> >
> > Specifically the last one.
> >
> > Why does Chen-Yu Tsai have an SoB there?
> 
> I picked his patch to rebase off the previous one, and reworked the ordering.
> I then pushed it onto GitHub [1], but didn't get around to sending it to the
> mailing lists. Oskari said on IRC that he would handle it.
> 
> I'm not sure what would be appropriate here though? Oskari's first SoB should
> be kept, since he's the original author. Maybe he should've added his SoB
> again as the final entry? Either way I suppose it would be confusing without
> any explanation.

Yes, I agree, but thanks for taking the time to do so.

Let's leave it as it is.

> [1] https://github.com/wens/linux/commit/951afe2dc32086174ab07a1a997d748f69bf5bf2
> [2] https://freenode.irclog.whitequark.org/linux-sunxi/2018-12-08#23644905;

-- 
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH v8 1/2] mfd: axp20x: Re-align mfd cell entries

[Lee Jones]

On Mon, 10 Dec 2018, Oskari Lemmelä wrote:
> On 10.12.2018 8.36, Lee Jones wrote:
> > On Sat, 08 Dec 2018, Oskari Lemmela wrote:
> >
> >> From: Chen-Yu Tsai <wens@csie.org>
> >>
> >> In the axp20x driver, the various mfd_cell lists had varying amounts
> >> of indentation, sometimes even within the same list. For the axp288,
> >> there's no alignment at all.
> >>
> >> Re-align the right hand side of the assignments with the least amount
> >> of tabs possible. Also collapse the closing bracket and the opening
> >> bracket of the next entry onto the same line for the axp288, to be
> >> consistent with all the other mfd_cell lists.
> >>
> >> This patch is whitespace change only. No functionality is modified.
> >>
> >> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> >> Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
> > Why is Oskari Lemmela's SoB here?
> >
> > You both authored this alignment patch?
> I picked up Chen-Yu's patch from
> https://github.com/wens/linux/commit/b99cec26bae2835a0374463570ea9ea26b034afa.
> I should have mentioned it cover letter.
> 
> Chen-Yu is correct author. I'm just sending his patch.

That's fine.  Thanks for the explanation.

-- 
Lee Jones [李琼斯]
Linaro Services Technical Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog