linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v6 0/8] AXP8x3 AC and battery power supply support
@ 2018-11-20 17:52 Oskari Lemmela
  2018-11-20 17:52 ` [PATCH v6 1/8] dt-bindings: power: supply: axp20x: add AXP813 AC power DT binding Oskari Lemmela
                   ` (8 more replies)
  0 siblings, 9 replies; 22+ messages in thread
From: Oskari Lemmela @ 2018-11-20 17:52 UTC (permalink / raw)
  To: Sebastian Reichel, Rob Herring, Mark Rutland, Chen-Yu Tsai,
	Maxime Ripard
  Cc: Lee Jones, Quentin Schulz, Vasily Khoruzhick, linux-pm,
	devicetree, linux-kernel, linux-arm-kernel, Oskari Lemmela

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

AXP803 AC and battery power supply support.

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


Oskari Lemmela (7):
  dt-bindings: power: supply: axp20x: add AXP813 AC power DT binding
  ARM: dts: axp81x: add AC power supply subnode
  arm64: dts: allwinner: axp803: add AC and battery power supplies
  arm64: dts: allwinner: a64: sopine-baseboard: enable power supplies
  power: supply: add AC power supply driver for AXP813
  mfd: axp20x: Add AC power supply cell for AXP813
  mfd: axp20x: Add supported cells for AXP803

Vasily Khoruzhick (1):
  arm64: dts: allwinner: a64: pinebook: enable power supplies

 .../bindings/power/supply/axp20x_ac_power.txt |  3 +
 arch/arm/boot/dts/axp81x.dtsi                 |  5 +
 arch/arm64/boot/dts/allwinner/axp803.dtsi     | 33 +++++++
 .../dts/allwinner/sun50i-a64-pinebook.dts     |  8 ++
 .../allwinner/sun50i-a64-sopine-baseboard.dts |  8 ++
 drivers/mfd/axp20x.c                          | 20 ++++
 drivers/power/supply/axp20x_ac_power.c        | 94 +++++++++++++++++++
 include/linux/mfd/axp20x.h                    |  1 +
 8 files changed, 172 insertions(+)

-- 
2.17.1


^ permalink raw reply	[flat|nested] 22+ messages in thread

* [PATCH v6 1/8] dt-bindings: power: supply: axp20x: add AXP813 AC power DT binding
  2018-11-20 17:52 [PATCH v6 0/8] AXP8x3 AC and battery power supply support Oskari Lemmela
@ 2018-11-20 17:52 ` Oskari Lemmela
  2018-11-20 17:52 ` [PATCH v6 2/8] ARM: dts: axp81x: add AC power supply subnode Oskari Lemmela
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 22+ messages in thread
From: Oskari Lemmela @ 2018-11-20 17:52 UTC (permalink / raw)
  To: Sebastian Reichel, Rob Herring, Mark Rutland, Chen-Yu Tsai,
	Maxime Ripard
  Cc: Lee Jones, Quentin Schulz, Vasily Khoruzhick, linux-pm,
	devicetree, linux-kernel, linux-arm-kernel, Oskari Lemmela

The AXP803/AXP813 AC power supply can limit input current and voltage.

Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
Reviewed-by: Rob Herring <robh@kernel.org>
Reviewed-by: Quentin Schulz <quentin.schulz@bootlin.com>
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com>
Tested-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
 .../devicetree/bindings/power/supply/axp20x_ac_power.txt       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Documentation/devicetree/bindings/power/supply/axp20x_ac_power.txt b/Documentation/devicetree/bindings/power/supply/axp20x_ac_power.txt
index 826e8a879121..7a1fb532abe5 100644
--- a/Documentation/devicetree/bindings/power/supply/axp20x_ac_power.txt
+++ b/Documentation/devicetree/bindings/power/supply/axp20x_ac_power.txt
@@ -4,6 +4,7 @@ Required Properties:
  - compatible: One of:
 			"x-powers,axp202-ac-power-supply"
 			"x-powers,axp221-ac-power-supply"
+			"x-powers,axp813-ac-power-supply"
 
 This node is a subnode of the axp20x PMIC.
 
@@ -13,6 +14,8 @@ reading ADC channels from the AXP20X ADC.
 The AXP22X is only able to tell if an AC power supply is present and
 usable.
 
+AXP813/AXP803 are able to limit current and supply voltage
+
 Example:
 
 &axp209 {
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH v6 2/8] ARM: dts: axp81x: add AC power supply subnode
  2018-11-20 17:52 [PATCH v6 0/8] AXP8x3 AC and battery power supply support Oskari Lemmela
  2018-11-20 17:52 ` [PATCH v6 1/8] dt-bindings: power: supply: axp20x: add AXP813 AC power DT binding Oskari Lemmela
@ 2018-11-20 17:52 ` Oskari Lemmela
  2018-11-20 17:52 ` [PATCH v6 3/8] arm64: dts: allwinner: axp803: add AC and battery power supplies Oskari Lemmela
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 22+ messages in thread
From: Oskari Lemmela @ 2018-11-20 17:52 UTC (permalink / raw)
  To: Sebastian Reichel, Rob Herring, Mark Rutland, Chen-Yu Tsai,
	Maxime Ripard
  Cc: Lee Jones, Quentin Schulz, Vasily Khoruzhick, linux-pm,
	devicetree, linux-kernel, linux-arm-kernel, Oskari Lemmela

Add AC power supply subnode for AXP81X PMIC.

Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
Reviewed-by: Quentin Schulz <quentin.schulz@bootlin.com>
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Tested-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
 arch/arm/boot/dts/axp81x.dtsi | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/arm/boot/dts/axp81x.dtsi b/arch/arm/boot/dts/axp81x.dtsi
index 043c717dcef1..bd83962d3627 100644
--- a/arch/arm/boot/dts/axp81x.dtsi
+++ b/arch/arm/boot/dts/axp81x.dtsi
@@ -48,6 +48,11 @@
 	interrupt-controller;
 	#interrupt-cells = <1>;
 
+	ac_power_supply: ac-power-supply {
+		compatible = "x-powers,axp813-ac-power-supply";
+		status = "disabled";
+	};
+
 	axp_adc: adc {
 		compatible = "x-powers,axp813-adc";
 		#io-channel-cells = <1>;
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH v6 3/8] arm64: dts: allwinner: axp803: add AC and battery power supplies
  2018-11-20 17:52 [PATCH v6 0/8] AXP8x3 AC and battery power supply support Oskari Lemmela
  2018-11-20 17:52 ` [PATCH v6 1/8] dt-bindings: power: supply: axp20x: add AXP813 AC power DT binding Oskari Lemmela
  2018-11-20 17:52 ` [PATCH v6 2/8] ARM: dts: axp81x: add AC power supply subnode Oskari Lemmela
@ 2018-11-20 17:52 ` Oskari Lemmela
  2018-11-20 17:52 ` [PATCH v6 4/8] arm64: dts: allwinner: a64: sopine-baseboard: enable " Oskari Lemmela
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 22+ messages in thread
From: Oskari Lemmela @ 2018-11-20 17:52 UTC (permalink / raw)
  To: Sebastian Reichel, Rob Herring, Mark Rutland, Chen-Yu Tsai,
	Maxime Ripard
  Cc: Lee Jones, Quentin Schulz, Vasily Khoruzhick, linux-pm,
	devicetree, linux-kernel, linux-arm-kernel, Oskari Lemmela

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

Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
Reviewed-by: Quentin Schulz <quentin.schulz@bootlin.com>
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Tested-by: Vasily Khoruzhick <anarsoul@gmail.com>
---
 arch/arm64/boot/dts/allwinner/axp803.dtsi | 33 +++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/arch/arm64/boot/dts/allwinner/axp803.dtsi b/arch/arm64/boot/dts/allwinner/axp803.dtsi
index e5eae8bafc42..c3a618e1279a 100644
--- a/arch/arm64/boot/dts/allwinner/axp803.dtsi
+++ b/arch/arm64/boot/dts/allwinner/axp803.dtsi
@@ -49,6 +49,39 @@
 	interrupt-controller;
 	#interrupt-cells = <1>;
 
+	ac_power_supply: ac-power-supply {
+		compatible = "x-powers,axp803-ac-power-supply",
+			     "x-powers,axp813-ac-power-supply";
+		status = "disabled";
+	};
+
+	axp_adc: adc {
+		compatible = "x-powers,axp803-adc", "x-powers,axp813-adc";
+		#io-channel-cells = <1>;
+	};
+
+	axp_gpio: gpio {
+		compatible = "x-powers,axp803-gpio", "x-powers,axp813-gpio";
+		gpio-controller;
+		#gpio-cells = <2>;
+
+		gpio0_ldo: gpio0-ldo {
+			pins = "GPIO0";
+			function = "ldo";
+		};
+
+		gpio1_ldo: gpio1-ldo {
+			pins = "GPIO1";
+			function = "ldo";
+		};
+	};
+
+	battery_power_supply: battery-power-supply {
+		compatible = "x-powers,axp803-battery-power-supply",
+			     "x-powers,axp813-battery-power-supply";
+		status = "disabled";
+	};
+
 	regulators {
 		/* Default work frequency for buck regulators */
 		x-powers,dcdc-freq = <3000>;
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH v6 4/8] arm64: dts: allwinner: a64: sopine-baseboard: enable power supplies
  2018-11-20 17:52 [PATCH v6 0/8] AXP8x3 AC and battery power supply support Oskari Lemmela
                   ` (2 preceding siblings ...)
  2018-11-20 17:52 ` [PATCH v6 3/8] arm64: dts: allwinner: axp803: add AC and battery power supplies Oskari Lemmela
@ 2018-11-20 17:52 ` Oskari Lemmela
  2018-11-20 17:52 ` [PATCH v6 5/8] arm64: dts: allwinner: a64: pinebook: " Oskari Lemmela
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 22+ messages in thread
From: Oskari Lemmela @ 2018-11-20 17:52 UTC (permalink / raw)
  To: Sebastian Reichel, Rob Herring, Mark Rutland, Chen-Yu Tsai,
	Maxime Ripard
  Cc: Lee Jones, Quentin Schulz, Vasily Khoruzhick, linux-pm,
	devicetree, linux-kernel, linux-arm-kernel, Oskari Lemmela

AXP803 ACIN pins are routed from SOM to the DC jack on the baseboard.
AXP803 charger pins BATSENSE, LOADSENSE, N_BATDRV, LX_CHG, VIN_CHG
and IPSOUT are connected via PMOS driver to SOM VBAT pins. VBAT and
AXP803 TS pins are routed to the baseboard 3-pin battery connector.

Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
Reviewed-by: Quentin Schulz <quentin.schulz@bootlin.com>
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
---
 .../boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts    | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
index 53fcc9098df3..4695b0d407b6 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
@@ -80,6 +80,14 @@
 	};
 };
 
+&ac_power_supply {
+	status = "okay";
+};
+
+&battery_power_supply {
+	status = "okay";
+};
+
 &de {
 	status = "okay";
 };
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH v6 5/8] arm64: dts: allwinner: a64: pinebook: enable power supplies
  2018-11-20 17:52 [PATCH v6 0/8] AXP8x3 AC and battery power supply support Oskari Lemmela
                   ` (3 preceding siblings ...)
  2018-11-20 17:52 ` [PATCH v6 4/8] arm64: dts: allwinner: a64: sopine-baseboard: enable " Oskari Lemmela
@ 2018-11-20 17:52 ` Oskari Lemmela
  2018-11-20 17:52 ` [PATCH v6 6/8] power: supply: add AC power supply driver for AXP813 Oskari Lemmela
                   ` (3 subsequent siblings)
  8 siblings, 0 replies; 22+ messages in thread
From: Oskari Lemmela @ 2018-11-20 17:52 UTC (permalink / raw)
  To: Sebastian Reichel, Rob Herring, Mark Rutland, Chen-Yu Tsai,
	Maxime Ripard
  Cc: Lee Jones, Quentin Schulz, Vasily Khoruzhick, linux-pm,
	devicetree, linux-kernel, linux-arm-kernel, Oskari Lemmela

From: Vasily Khoruzhick <anarsoul@gmail.com>

Pinebook has ACIN connector and 10000 mAh battery.

Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com>
Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
---
 arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
index 77fac84797e9..6a1402bf0362 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
@@ -148,6 +148,14 @@
 
 #include "axp803.dtsi"
 
+&ac_power_supply {
+	status = "okay";
+};
+
+&battery_power_supply {
+	status = "okay";
+};
+
 &reg_aldo1 {
 	regulator-min-microvolt = <2800000>;
 	regulator-max-microvolt = <2800000>;
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH v6 6/8] power: supply: add AC power supply driver for AXP813
  2018-11-20 17:52 [PATCH v6 0/8] AXP8x3 AC and battery power supply support Oskari Lemmela
                   ` (4 preceding siblings ...)
  2018-11-20 17:52 ` [PATCH v6 5/8] arm64: dts: allwinner: a64: pinebook: " Oskari Lemmela
@ 2018-11-20 17:52 ` Oskari Lemmela
  2018-11-20 17:52 ` [PATCH v6 7/8] mfd: axp20x: Add AC power supply cell " Oskari Lemmela
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 22+ messages in thread
From: Oskari Lemmela @ 2018-11-20 17:52 UTC (permalink / raw)
  To: Sebastian Reichel, Rob Herring, Mark Rutland, Chen-Yu Tsai,
	Maxime Ripard
  Cc: Lee Jones, Quentin Schulz, Vasily Khoruzhick, linux-pm,
	devicetree, linux-kernel, linux-arm-kernel, Oskari Lemmela

AXP813 and AXP803 PMICs can control input current and minimum voltage.

Both of these values are configurable.

Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
Reviewed-by: Quentin Schulz <quentin.schulz@bootlin.com>
Reviewed-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/power/supply/axp20x_ac_power.c | 94 ++++++++++++++++++++++++++
 include/linux/mfd/axp20x.h             |  1 +
 2 files changed, 95 insertions(+)

diff --git a/drivers/power/supply/axp20x_ac_power.c b/drivers/power/supply/axp20x_ac_power.c
index 0771f951b11f..59b4c8d3b961 100644
--- a/drivers/power/supply/axp20x_ac_power.c
+++ b/drivers/power/supply/axp20x_ac_power.c
@@ -27,6 +27,16 @@
 #define AXP20X_PWR_STATUS_ACIN_PRESENT	BIT(7)
 #define AXP20X_PWR_STATUS_ACIN_AVAIL	BIT(6)
 
+#define AXP813_VHOLD_MASK		GENMASK(5, 3)
+#define AXP813_VHOLD_UV_TO_BIT(x)	((((x) / 100000) - 40) << 3)
+#define AXP813_VHOLD_REG_TO_UV(x)	\
+	(((((x) & AXP813_VHOLD_MASK) >> 3) + 40) * 100000)
+
+#define AXP813_CURR_LIMIT_MASK		GENMASK(2, 0)
+#define AXP813_CURR_LIMIT_UA_TO_BIT(x)	(((x) / 500000) - 3)
+#define AXP813_CURR_LIMIT_REG_TO_UA(x)	\
+	((((x) & AXP813_CURR_LIMIT_MASK) + 3) * 500000)
+
 #define DRVNAME "axp20x-ac-power-supply"
 
 struct axp20x_ac_power {
@@ -102,6 +112,57 @@ static int axp20x_ac_power_get_property(struct power_supply *psy,
 
 		return 0;
 
+	case POWER_SUPPLY_PROP_VOLTAGE_MIN:
+		ret = regmap_read(power->regmap, AXP813_ACIN_PATH_CTRL, &reg);
+		if (ret)
+			return ret;
+
+		val->intval = AXP813_VHOLD_REG_TO_UV(reg);
+
+		return 0;
+
+	case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT:
+		ret = regmap_read(power->regmap, AXP813_ACIN_PATH_CTRL, &reg);
+		if (ret)
+			return ret;
+
+		val->intval = AXP813_CURR_LIMIT_REG_TO_UA(reg);
+		/* AXP813 datasheet defines values 11x as 4000mA */
+		if (val->intval > 4000000)
+			val->intval = 4000000;
+
+		return 0;
+
+	default:
+		return -EINVAL;
+	}
+
+	return -EINVAL;
+}
+
+static int axp813_ac_power_set_property(struct power_supply *psy,
+					enum power_supply_property psp,
+					const union power_supply_propval *val)
+{
+	struct axp20x_ac_power *power = power_supply_get_drvdata(psy);
+
+	switch (psp) {
+	case POWER_SUPPLY_PROP_VOLTAGE_MIN:
+		if (val->intval < 4000000 || val->intval > 4700000)
+			return -EINVAL;
+
+		return regmap_update_bits(power->regmap, AXP813_ACIN_PATH_CTRL,
+					  AXP813_VHOLD_MASK,
+					  AXP813_VHOLD_UV_TO_BIT(val->intval));
+
+	case POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT:
+		if (val->intval < 1500000 || val->intval > 4000000)
+			return -EINVAL;
+
+		return regmap_update_bits(power->regmap, AXP813_ACIN_PATH_CTRL,
+					  AXP813_CURR_LIMIT_MASK,
+					  AXP813_CURR_LIMIT_UA_TO_BIT(val->intval));
+
 	default:
 		return -EINVAL;
 	}
@@ -109,6 +170,13 @@ static int axp20x_ac_power_get_property(struct power_supply *psy,
 	return -EINVAL;
 }
 
+static int axp813_ac_power_prop_writeable(struct power_supply *psy,
+					  enum power_supply_property psp)
+{
+	return psp == POWER_SUPPLY_PROP_VOLTAGE_MIN ||
+	       psp == POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT;
+}
+
 static enum power_supply_property axp20x_ac_power_properties[] = {
 	POWER_SUPPLY_PROP_HEALTH,
 	POWER_SUPPLY_PROP_PRESENT,
@@ -123,6 +191,14 @@ static enum power_supply_property axp22x_ac_power_properties[] = {
 	POWER_SUPPLY_PROP_ONLINE,
 };
 
+static enum power_supply_property axp813_ac_power_properties[] = {
+	POWER_SUPPLY_PROP_HEALTH,
+	POWER_SUPPLY_PROP_PRESENT,
+	POWER_SUPPLY_PROP_ONLINE,
+	POWER_SUPPLY_PROP_VOLTAGE_MIN,
+	POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT,
+};
+
 static const struct power_supply_desc axp20x_ac_power_desc = {
 	.name = "axp20x-ac",
 	.type = POWER_SUPPLY_TYPE_MAINS,
@@ -139,6 +215,16 @@ static const struct power_supply_desc axp22x_ac_power_desc = {
 	.get_property = axp20x_ac_power_get_property,
 };
 
+static const struct power_supply_desc axp813_ac_power_desc = {
+	.name = "axp813-ac",
+	.type = POWER_SUPPLY_TYPE_MAINS,
+	.properties = axp813_ac_power_properties,
+	.num_properties = ARRAY_SIZE(axp813_ac_power_properties),
+	.property_is_writeable = axp813_ac_power_prop_writeable,
+	.get_property = axp20x_ac_power_get_property,
+	.set_property = axp813_ac_power_set_property,
+};
+
 struct axp_data {
 	const struct power_supply_desc	*power_desc;
 	bool				acin_adc;
@@ -154,6 +240,11 @@ static const struct axp_data axp22x_data = {
 	.acin_adc = false,
 };
 
+static const struct axp_data axp813_data = {
+	.power_desc = &axp813_ac_power_desc,
+	.acin_adc = false,
+};
+
 static int axp20x_ac_power_probe(struct platform_device *pdev)
 {
 	struct axp20x_dev *axp20x = dev_get_drvdata(pdev->dev.parent);
@@ -234,6 +325,9 @@ static const struct of_device_id axp20x_ac_power_match[] = {
 	}, {
 		.compatible = "x-powers,axp221-ac-power-supply",
 		.data = &axp22x_data,
+	}, {
+		.compatible = "x-powers,axp813-ac-power-supply",
+		.data = &axp813_data,
 	}, { /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, axp20x_ac_power_match);
diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h
index 517e60eecbcb..2302b620d238 100644
--- a/include/linux/mfd/axp20x.h
+++ b/include/linux/mfd/axp20x.h
@@ -266,6 +266,7 @@ enum axp20x_variants {
 #define AXP288_RT_BATT_V_H		0xa0
 #define AXP288_RT_BATT_V_L		0xa1
 
+#define AXP813_ACIN_PATH_CTRL		0x3a
 #define AXP813_ADC_RATE			0x85
 
 /* Fuel Gauge */
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH v6 7/8] mfd: axp20x: Add AC power supply cell for AXP813
  2018-11-20 17:52 [PATCH v6 0/8] AXP8x3 AC and battery power supply support Oskari Lemmela
                   ` (5 preceding siblings ...)
  2018-11-20 17:52 ` [PATCH v6 6/8] power: supply: add AC power supply driver for AXP813 Oskari Lemmela
@ 2018-11-20 17:52 ` Oskari Lemmela
  2018-12-07 16:40   ` Lee Jones
  2018-11-20 17:52 ` [PATCH v6 8/8] mfd: axp20x: Add supported cells for AXP803 Oskari Lemmela
  2018-11-30  8:31 ` [PATCH v6 0/8] AXP8x3 AC and battery power supply support Chen-Yu Tsai
  8 siblings, 1 reply; 22+ messages in thread
From: Oskari Lemmela @ 2018-11-20 17:52 UTC (permalink / raw)
  To: Sebastian Reichel, Rob Herring, Mark Rutland, Chen-Yu Tsai,
	Maxime Ripard
  Cc: Lee Jones, Quentin Schulz, Vasily Khoruzhick, linux-pm,
	devicetree, linux-kernel, linux-arm-kernel, Oskari Lemmela

As axp20x-ac-power-supply now supports AXP813, add a cell for it.

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

diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index 0be511dd93d0..dfc3cff1d08b 100644
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -778,6 +778,11 @@ static const struct mfd_cell axp813_cells[] = {
 	}, {
 		.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,
 	},
 };
 
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH v6 8/8] mfd: axp20x: Add supported cells for AXP803
  2018-11-20 17:52 [PATCH v6 0/8] AXP8x3 AC and battery power supply support Oskari Lemmela
                   ` (6 preceding siblings ...)
  2018-11-20 17:52 ` [PATCH v6 7/8] mfd: axp20x: Add AC power supply cell " Oskari Lemmela
@ 2018-11-20 17:52 ` Oskari Lemmela
  2018-12-07 16:40   ` Lee Jones
  2018-12-10  6:27   ` Lee Jones
  2018-11-30  8:31 ` [PATCH v6 0/8] AXP8x3 AC and battery power supply support Chen-Yu Tsai
  8 siblings, 2 replies; 22+ messages in thread
From: Oskari Lemmela @ 2018-11-20 17:52 UTC (permalink / raw)
  To: Sebastian Reichel, Rob Herring, Mark Rutland, Chen-Yu Tsai,
	Maxime Ripard
  Cc: Lee Jones, Quentin Schulz, Vasily Khoruzhick, linux-pm,
	devicetree, linux-kernel, linux-arm-kernel, 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>
---
 drivers/mfd/axp20x.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index dfc3cff1d08b..e415b967d38c 100644
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -728,11 +728,26 @@ static const struct mfd_cell axp288_cells[] = {
 
 static const struct mfd_cell axp803_cells[] = {
 	{
+		.name		= "axp20x-gpio",
+		.of_compatible	= "x-powers,axp813-gpio",
+	}, {
 		.name			= "axp221-pek",
 		.num_resources		= ARRAY_SIZE(axp803_pek_resources),
 		.resources		= axp803_pek_resources,
 	},
 	{	.name			= "axp20x-regulator" },
+	{
+		.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,
+	},
 };
 
 static const struct mfd_cell axp806_self_working_cells[] = {
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* Re: [PATCH v6 0/8] AXP8x3 AC and battery power supply support
  2018-11-20 17:52 [PATCH v6 0/8] AXP8x3 AC and battery power supply support Oskari Lemmela
                   ` (7 preceding siblings ...)
  2018-11-20 17:52 ` [PATCH v6 8/8] mfd: axp20x: Add supported cells for AXP803 Oskari Lemmela
@ 2018-11-30  8:31 ` Chen-Yu Tsai
  2018-12-05 18:00   ` Sebastian Reichel
  8 siblings, 1 reply; 22+ messages in thread
From: Chen-Yu Tsai @ 2018-11-30  8:31 UTC (permalink / raw)
  To: Sebastian Reichel, Lee Jones, oskari
  Cc: Rob Herring, Mark Rutland, Maxime Ripard, Quentin Schulz,
	Vasily Khoruzhick, open list:THERMAL, devicetree, linux-kernel,
	linux-arm-kernel

On Wed, Nov 21, 2018 at 1:52 AM Oskari Lemmela <oskari@lemmela.net> wrote:
>
> AXP813 AC power supply support with input current and
> voltage limiting support.
>
> AXP803 AC and battery power supply support.
>
> 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
>
>
> Oskari Lemmela (7):
>   dt-bindings: power: supply: axp20x: add AXP813 AC power DT binding
>   ARM: dts: axp81x: add AC power supply subnode
>   arm64: dts: allwinner: axp803: add AC and battery power supplies
>   arm64: dts: allwinner: a64: sopine-baseboard: enable power supplies
>   power: supply: add AC power supply driver for AXP813
>   mfd: axp20x: Add AC power supply cell for AXP813
>   mfd: axp20x: Add supported cells for AXP803
>
> Vasily Khoruzhick (1):
>   arm64: dts: allwinner: a64: pinebook: enable power supplies

Since this series has been fully reviewed, and the devices it
adds/enables aren't critical, i.e. won't cause the system to fail
if the drivers are missing, I've merged the dts patches for 4.21.

Hopefully Sebastian and Lee will get around to merging the driver
patches.

Thanks.
ChenYu

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v6 0/8] AXP8x3 AC and battery power supply support
  2018-11-30  8:31 ` [PATCH v6 0/8] AXP8x3 AC and battery power supply support Chen-Yu Tsai
@ 2018-12-05 18:00   ` Sebastian Reichel
  2018-12-07  7:28     ` Lee Jones
  0 siblings, 1 reply; 22+ messages in thread
From: Sebastian Reichel @ 2018-12-05 18:00 UTC (permalink / raw)
  To: Chen-Yu Tsai
  Cc: Lee Jones, oskari, Rob Herring, Mark Rutland, Maxime Ripard,
	Quentin Schulz, Vasily Khoruzhick, open list:THERMAL, devicetree,
	linux-kernel, linux-arm-kernel

[-- Attachment #1: Type: text/plain, Size: 3099 bytes --]

Hi,

On Fri, Nov 30, 2018 at 04:31:28PM +0800, Chen-Yu Tsai wrote:
> On Wed, Nov 21, 2018 at 1:52 AM Oskari Lemmela <oskari@lemmela.net> wrote:
> >
> > AXP813 AC power supply support with input current and
> > voltage limiting support.
> >
> > AXP803 AC and battery power supply support.
> >
> > 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
> >
> >
> > Oskari Lemmela (7):
> >   dt-bindings: power: supply: axp20x: add AXP813 AC power DT binding
> >   ARM: dts: axp81x: add AC power supply subnode
> >   arm64: dts: allwinner: axp803: add AC and battery power supplies
> >   arm64: dts: allwinner: a64: sopine-baseboard: enable power supplies
> >   power: supply: add AC power supply driver for AXP813
> >   mfd: axp20x: Add AC power supply cell for AXP813
> >   mfd: axp20x: Add supported cells for AXP803
> >
> > Vasily Khoruzhick (1):
> >   arm64: dts: allwinner: a64: pinebook: enable power supplies
> 
> Since this series has been fully reviewed, and the devices it
> adds/enables aren't critical, i.e. won't cause the system to fail
> if the drivers are missing, I've merged the dts patches for 4.21.
> 
> Hopefully Sebastian and Lee will get around to merging the driver
> patches.

I queued the power-supply driver changes and prepared a signed
immutable tag for Lee:

The following changes since commit 651022382c7f8da46cb4872a545ee1da6d097d2a:

  Linux 4.20-rc1 (2018-11-04 15:37:52 -0800)

are available in the Git repository at:

  ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git tags/psy-mfd-axp813-immutable-for-v4.21-signed

for you to fetch changes up to 7693b5643fd2d682de90733b67fc8032b9646911:

  power: supply: add AC power supply driver for AXP813 (2018-12-05 18:49:32 +0100)

----------------------------------------------------------------
Immutable branch between mfd and power-supply for driver
changes related to axp813.

Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>

----------------------------------------------------------------
Oskari Lemmela (2):
      dt-bindings: power: supply: axp20x: add AXP813 AC power DT binding
      power: supply: add AC power supply driver for AXP813

 .../bindings/power/supply/axp20x_ac_power.txt      |  3 +
 drivers/power/supply/axp20x_ac_power.c             | 94 ++++++++++++++++++++++
 include/linux/mfd/axp20x.h                         |  1 +
 3 files changed, 98 insertions(+)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v6 0/8] AXP8x3 AC and battery power supply support
  2018-12-05 18:00   ` Sebastian Reichel
@ 2018-12-07  7:28     ` Lee Jones
  2018-12-07  7:45       ` Chen-Yu Tsai
  0 siblings, 1 reply; 22+ messages in thread
From: Lee Jones @ 2018-12-07  7:28 UTC (permalink / raw)
  To: Sebastian Reichel
  Cc: Chen-Yu Tsai, oskari, Rob Herring, Mark Rutland, Maxime Ripard,
	Quentin Schulz, Vasily Khoruzhick, open list:THERMAL, devicetree,
	linux-kernel, linux-arm-kernel

On Wed, 05 Dec 2018, Sebastian Reichel wrote:

> Hi,
> 
> On Fri, Nov 30, 2018 at 04:31:28PM +0800, Chen-Yu Tsai wrote:
> > On Wed, Nov 21, 2018 at 1:52 AM Oskari Lemmela <oskari@lemmela.net> wrote:
> > >
> > > AXP813 AC power supply support with input current and
> > > voltage limiting support.
> > >
> > > AXP803 AC and battery power supply support.
> > >
> > > 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
> > >
> > >
> > > Oskari Lemmela (7):
> > >   dt-bindings: power: supply: axp20x: add AXP813 AC power DT binding
> > >   ARM: dts: axp81x: add AC power supply subnode
> > >   arm64: dts: allwinner: axp803: add AC and battery power supplies
> > >   arm64: dts: allwinner: a64: sopine-baseboard: enable power supplies
> > >   power: supply: add AC power supply driver for AXP813
> > >   mfd: axp20x: Add AC power supply cell for AXP813
> > >   mfd: axp20x: Add supported cells for AXP803
> > >
> > > Vasily Khoruzhick (1):
> > >   arm64: dts: allwinner: a64: pinebook: enable power supplies
> > 
> > Since this series has been fully reviewed, and the devices it
> > adds/enables aren't critical, i.e. won't cause the system to fail
> > if the drivers are missing, I've merged the dts patches for 4.21.
> > 
> > Hopefully Sebastian and Lee will get around to merging the driver
> > patches.
> 
> I queued the power-supply driver changes and prepared a signed
> immutable tag for Lee:
> 
> The following changes since commit 651022382c7f8da46cb4872a545ee1da6d097d2a:
> 
>   Linux 4.20-rc1 (2018-11-04 15:37:52 -0800)
> 
> are available in the Git repository at:
> 
>   ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git tags/psy-mfd-axp813-immutable-for-v4.21-signed
> 
> for you to fetch changes up to 7693b5643fd2d682de90733b67fc8032b9646911:
> 
>   power: supply: add AC power supply driver for AXP813 (2018-12-05 18:49:32 +0100)
> 
> ----------------------------------------------------------------
> Immutable branch between mfd and power-supply for driver
> changes related to axp813.
> 
> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> 
> ----------------------------------------------------------------
> Oskari Lemmela (2):
>       dt-bindings: power: supply: axp20x: add AXP813 AC power DT binding
>       power: supply: add AC power supply driver for AXP813
> 
>  .../bindings/power/supply/axp20x_ac_power.txt      |  3 +
>  drivers/power/supply/axp20x_ac_power.c             | 94 ++++++++++++++++++++++
>  include/linux/mfd/axp20x.h                         |  1 +
>  3 files changed, 98 insertions(+)

What patches are left now?  Just 7 and 8?

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

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v6 0/8] AXP8x3 AC and battery power supply support
  2018-12-07  7:28     ` Lee Jones
@ 2018-12-07  7:45       ` Chen-Yu Tsai
  0 siblings, 0 replies; 22+ messages in thread
From: Chen-Yu Tsai @ 2018-12-07  7:45 UTC (permalink / raw)
  To: Lee Jones
  Cc: sebastian.reichel, oskari, Rob Herring, Mark Rutland,
	Maxime Ripard, Quentin Schulz, Vasily Khoruzhick,
	open list:THERMAL, devicetree, linux-kernel, linux-arm-kernel

On Fri, Dec 7, 2018 at 3:28 PM Lee Jones <lee.jones@linaro.org> wrote:
>
> On Wed, 05 Dec 2018, Sebastian Reichel wrote:
>
> > Hi,
> >
> > On Fri, Nov 30, 2018 at 04:31:28PM +0800, Chen-Yu Tsai wrote:
> > > On Wed, Nov 21, 2018 at 1:52 AM Oskari Lemmela <oskari@lemmela.net> wrote:
> > > >
> > > > AXP813 AC power supply support with input current and
> > > > voltage limiting support.
> > > >
> > > > AXP803 AC and battery power supply support.
> > > >
> > > > 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
> > > >
> > > >
> > > > Oskari Lemmela (7):
> > > >   dt-bindings: power: supply: axp20x: add AXP813 AC power DT binding
> > > >   ARM: dts: axp81x: add AC power supply subnode
> > > >   arm64: dts: allwinner: axp803: add AC and battery power supplies
> > > >   arm64: dts: allwinner: a64: sopine-baseboard: enable power supplies
> > > >   power: supply: add AC power supply driver for AXP813
> > > >   mfd: axp20x: Add AC power supply cell for AXP813
> > > >   mfd: axp20x: Add supported cells for AXP803
> > > >
> > > > Vasily Khoruzhick (1):
> > > >   arm64: dts: allwinner: a64: pinebook: enable power supplies
> > >
> > > Since this series has been fully reviewed, and the devices it
> > > adds/enables aren't critical, i.e. won't cause the system to fail
> > > if the drivers are missing, I've merged the dts patches for 4.21.
> > >
> > > Hopefully Sebastian and Lee will get around to merging the driver
> > > patches.
> >
> > I queued the power-supply driver changes and prepared a signed
> > immutable tag for Lee:
> >
> > The following changes since commit 651022382c7f8da46cb4872a545ee1da6d097d2a:
> >
> >   Linux 4.20-rc1 (2018-11-04 15:37:52 -0800)
> >
> > are available in the Git repository at:
> >
> >   ssh://git@gitolite.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git tags/psy-mfd-axp813-immutable-for-v4.21-signed
> >
> > for you to fetch changes up to 7693b5643fd2d682de90733b67fc8032b9646911:
> >
> >   power: supply: add AC power supply driver for AXP813 (2018-12-05 18:49:32 +0100)
> >
> > ----------------------------------------------------------------
> > Immutable branch between mfd and power-supply for driver
> > changes related to axp813.
> >
> > Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.com>
> >
> > ----------------------------------------------------------------
> > Oskari Lemmela (2):
> >       dt-bindings: power: supply: axp20x: add AXP813 AC power DT binding
> >       power: supply: add AC power supply driver for AXP813
> >
> >  .../bindings/power/supply/axp20x_ac_power.txt      |  3 +
> >  drivers/power/supply/axp20x_ac_power.c             | 94 ++++++++++++++++++++++
> >  include/linux/mfd/axp20x.h                         |  1 +
> >  3 files changed, 98 insertions(+)
>
> What patches are left now?  Just 7 and 8?

That's right. If you could merge them, that'd be great.
Thanks Lee.

ChenYu

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v6 8/8] mfd: axp20x: Add supported cells for AXP803
  2018-11-20 17:52 ` [PATCH v6 8/8] mfd: axp20x: Add supported cells for AXP803 Oskari Lemmela
@ 2018-12-07 16:40   ` Lee Jones
  2018-12-07 18:58     ` Vasily Khoruzhick
  2018-12-08 18:10     ` Oskari Lemmelä
  2018-12-10  6:27   ` Lee Jones
  1 sibling, 2 replies; 22+ messages in thread
From: Lee Jones @ 2018-12-07 16:40 UTC (permalink / raw)
  To: Oskari Lemmela
  Cc: Sebastian Reichel, Rob Herring, Mark Rutland, Chen-Yu Tsai,
	Maxime Ripard, Quentin Schulz, Vasily Khoruzhick, linux-pm,
	devicetree, linux-kernel, linux-arm-kernel

On Tue, 20 Nov 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>
> ---
>  drivers/mfd/axp20x.c | 15 +++++++++++++++
>  1 file changed, 15 insertions(+)
> 
> diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
> index dfc3cff1d08b..e415b967d38c 100644
> --- a/drivers/mfd/axp20x.c
> +++ b/drivers/mfd/axp20x.c
> @@ -728,11 +728,26 @@ static const struct mfd_cell axp288_cells[] = {
>  
>  static const struct mfd_cell axp803_cells[] = {
>  	{
> +		.name		= "axp20x-gpio",
> +		.of_compatible	= "x-powers,axp813-gpio",
> +	}, {
>  		.name			= "axp221-pek",
>  		.num_resources		= ARRAY_SIZE(axp803_pek_resources),
>  		.resources		= axp803_pek_resources,
>  	},
>  	{	.name			= "axp20x-regulator" },
> +	{
> +		.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,
> +	},
>  };

My OCD-dar is going crazy.

Why haven't you used the same alignment as is already there?

If it starts to run over 80-chars then bring the others back.

Also why is there a single liner shoved in the middle of the
multi-line entries?  Please move the singles to the top or the
bottom.

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

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v6 7/8] mfd: axp20x: Add AC power supply cell for AXP813
  2018-11-20 17:52 ` [PATCH v6 7/8] mfd: axp20x: Add AC power supply cell " Oskari Lemmela
@ 2018-12-07 16:40   ` Lee Jones
  0 siblings, 0 replies; 22+ messages in thread
From: Lee Jones @ 2018-12-07 16:40 UTC (permalink / raw)
  To: Oskari Lemmela
  Cc: Sebastian Reichel, Rob Herring, Mark Rutland, Chen-Yu Tsai,
	Maxime Ripard, Quentin Schulz, Vasily Khoruzhick, linux-pm,
	devicetree, linux-kernel, linux-arm-kernel

On Tue, 20 Nov 2018, Oskari Lemmela wrote:

> As axp20x-ac-power-supply now supports AXP813, add a cell for it.
> 
> Signed-off-by: Oskari Lemmela <oskari@lemmela.net>
> Reviewed-by: Quentin Schulz <quentin.schulz@bootlin.com>
> Reviewed-by: Chen-Yu Tsai <wens@csie.org>
> Tested-by: Vasily Khoruzhick <anarsoul@gmail.com>
> ---
>  drivers/mfd/axp20x.c | 5 +++++
>  1 file changed, 5 insertions(+)

Applied, thanks.

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

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v6 8/8] mfd: axp20x: Add supported cells for AXP803
  2018-12-07 16:40   ` Lee Jones
@ 2018-12-07 18:58     ` Vasily Khoruzhick
  2018-12-07 19:22       ` Lee Jones
  2018-12-08 18:10     ` Oskari Lemmelä
  1 sibling, 1 reply; 22+ messages in thread
From: Vasily Khoruzhick @ 2018-12-07 18:58 UTC (permalink / raw)
  To: Lee Jones
  Cc: Oskari Lemmela, Sebastian Reichel, Rob Herring, Mark Rutland,
	Chen-Yu Tsai, Maxime Ripard, quentin.schulz, linux-pm,
	devicetree, linux-kernel, arm-linux

On Fri, Dec 7, 2018 at 8:40 AM Lee Jones <lee.jones@linaro.org> wrote:

> My OCD-dar is going crazy.
>
> Why haven't you used the same alignment as is already there?
>
> If it starts to run over 80-chars then bring the others back.
>
> Also why is there a single liner shoved in the middle of the
> multi-line entries?  Please move the singles to the top or the
> bottom.

Hi Lee,

Could you please reformat it in the way that makes your OCD-dar happy?
It would be really nice to get
AC and battery support for APX8x3 merged -- it'll make Pinebook and
Teres-I pretty well supported by mainline kernel.

Thanks,
Vasily

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

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v6 8/8] mfd: axp20x: Add supported cells for AXP803
  2018-12-07 18:58     ` Vasily Khoruzhick
@ 2018-12-07 19:22       ` Lee Jones
  2018-12-08 15:05         ` Quentin Schulz
  0 siblings, 1 reply; 22+ messages in thread
From: Lee Jones @ 2018-12-07 19:22 UTC (permalink / raw)
  To: Vasily Khoruzhick
  Cc: Oskari Lemmela, Sebastian Reichel, Rob Herring, Mark Rutland,
	Chen-Yu Tsai, Maxime Ripard, quentin.schulz, linux-pm,
	devicetree, linux-kernel, arm-linux

On Fri, 07 Dec 2018, Vasily Khoruzhick wrote:

> On Fri, Dec 7, 2018 at 8:40 AM Lee Jones <lee.jones@linaro.org> wrote:
> 
> > My OCD-dar is going crazy.
> >
> > Why haven't you used the same alignment as is already there?
> >
> > If it starts to run over 80-chars then bring the others back.
> >
> > Also why is there a single liner shoved in the middle of the
> > multi-line entries?  Please move the singles to the top or the
> > bottom.
> 
> Hi Lee,
> 
> Could you please reformat it in the way that makes your OCD-dar happy?
> It would be really nice to get

I'm afraid not, for a multitude of reasons.

The most important of which surround testing.

> AC and battery support for APX8x3 merged -- it'll make Pinebook and
> Teres-I pretty well supported by mainline kernel.

That's great.  A worthy cause indeed.  So I'm sure you guys will want
to turn the patch around in short order so that it's applied in time
for the next merge window.

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

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v6 8/8] mfd: axp20x: Add supported cells for AXP803
  2018-12-07 19:22       ` Lee Jones
@ 2018-12-08 15:05         ` Quentin Schulz
  2018-12-10  6:27           ` Lee Jones
  0 siblings, 1 reply; 22+ messages in thread
From: Quentin Schulz @ 2018-12-08 15:05 UTC (permalink / raw)
  To: Lee Jones
  Cc: Vasily Khoruzhick, Oskari Lemmela, Sebastian Reichel,
	Rob Herring, Mark Rutland, Chen-Yu Tsai, Maxime Ripard, linux-pm,
	devicetree, linux-kernel, arm-linux

[-- Attachment #1: Type: text/plain, Size: 2004 bytes --]

Hi Lee,

On Fri, Dec 07, 2018 at 07:22:37PM +0000, Lee Jones wrote:
> On Fri, 07 Dec 2018, Vasily Khoruzhick wrote:
> 
> > On Fri, Dec 7, 2018 at 8:40 AM Lee Jones <lee.jones@linaro.org> wrote:
> > 
> > > My OCD-dar is going crazy.
> > >
> > > Why haven't you used the same alignment as is already there?
> > >
> > > If it starts to run over 80-chars then bring the others back.
> > >
> > > Also why is there a single liner shoved in the middle of the
> > > multi-line entries?  Please move the singles to the top or the
> > > bottom.
> > 
> > Hi Lee,
> > 
> > Could you please reformat it in the way that makes your OCD-dar happy?
> > It would be really nice to get
> 
> I'm afraid not, for a multitude of reasons.
> 
> The most important of which surround testing.
> 
> > AC and battery support for APX8x3 merged -- it'll make Pinebook and
> > Teres-I pretty well supported by mainline kernel.
> 
> That's great.  A worthy cause indeed.  So I'm sure you guys will want
> to turn the patch around in short order so that it's applied in time
> for the next merge window.
> 

Aren't the MFD cells probed in order?

In that case, it makes little sense to short order them for this
particular device (X-Powers PMICs in general). It will just make the
system boot slower because of probe deferring.

Why? As explained by Chen-Yu in v3[1], axp-gpios can be muxed as
regulators, thus should be probed before axp-regulators. axp-adc is
often used by axp-battery, axp-usb-power, axp-ac-power, thus should be
probed beforehand as well.

For the alignment that also triggered your OCD, I can send you a patch
the day you merge this one if it can help. I sent a few patches for this
driver that didn't respect the alignment so I'm fine fixing the mfd
cells (and eventually re-order them as I saw a few axp-gpio cells being
declared after axp-regulators).

Does that make this patch OK for you, Lee?

Thanks,
Quentin

[1] https://lkml.org/lkml/2018/10/11/338

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v6 8/8] mfd: axp20x: Add supported cells for AXP803
  2018-12-07 16:40   ` Lee Jones
  2018-12-07 18:58     ` Vasily Khoruzhick
@ 2018-12-08 18:10     ` Oskari Lemmelä
  1 sibling, 0 replies; 22+ messages in thread
From: Oskari Lemmelä @ 2018-12-08 18:10 UTC (permalink / raw)
  To: Lee Jones
  Cc: Sebastian Reichel, Rob Herring, Mark Rutland, Chen-Yu Tsai,
	Maxime Ripard, Quentin Schulz, Vasily Khoruzhick, linux-pm,
	devicetree, linux-kernel, linux-arm-kernel

Hi Lee,

On 12/7/18 6:40 PM, Lee Jones wrote:
> On Tue, 20 Nov 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>
>> ---
>>   drivers/mfd/axp20x.c | 15 +++++++++++++++
>>   1 file changed, 15 insertions(+)
>>
>> diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
>> index dfc3cff1d08b..e415b967d38c 100644
>> --- a/drivers/mfd/axp20x.c
>> +++ b/drivers/mfd/axp20x.c
>> @@ -728,11 +728,26 @@ static const struct mfd_cell axp288_cells[] = {
>>   
>>   static const struct mfd_cell axp803_cells[] = {
>>   	{
>> +		.name		= "axp20x-gpio",
>> +		.of_compatible	= "x-powers,axp813-gpio",
>> +	}, {
>>   		.name			= "axp221-pek",
>>   		.num_resources		= ARRAY_SIZE(axp803_pek_resources),
>>   		.resources		= axp803_pek_resources,
>>   	},
>>   	{	.name			= "axp20x-regulator" },
>> +	{
>> +		.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,
>> +	},
>>   };
> My OCD-dar is going crazy.
>
> Why haven't you used the same alignment as is already there?
>
> If it starts to run over 80-chars then bring the others back.
>
> Also why is there a single liner shoved in the middle of the
> multi-line entries?  Please move the singles to the top or the
> bottom.
>
I sent patch set v8 which contains ChenYu's re-align patch and
this patch rebased top of it.

Re-align patch will make number of whitespaces consistent in axp20x.c

Thanks,
Oskari



^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v6 8/8] mfd: axp20x: Add supported cells for AXP803
  2018-12-08 15:05         ` Quentin Schulz
@ 2018-12-10  6:27           ` Lee Jones
  2018-12-10  8:29             ` Quentin Schulz
  0 siblings, 1 reply; 22+ messages in thread
From: Lee Jones @ 2018-12-10  6:27 UTC (permalink / raw)
  To: Quentin Schulz
  Cc: Vasily Khoruzhick, Oskari Lemmela, Sebastian Reichel,
	Rob Herring, Mark Rutland, Chen-Yu Tsai, Maxime Ripard, linux-pm,
	devicetree, linux-kernel, arm-linux

On Sat, 08 Dec 2018, Quentin Schulz wrote:

> Hi Lee,
> 
> On Fri, Dec 07, 2018 at 07:22:37PM +0000, Lee Jones wrote:
> > On Fri, 07 Dec 2018, Vasily Khoruzhick wrote:
> > 
> > > On Fri, Dec 7, 2018 at 8:40 AM Lee Jones <lee.jones@linaro.org> wrote:
> > > 
> > > > My OCD-dar is going crazy.
> > > >
> > > > Why haven't you used the same alignment as is already there?
> > > >
> > > > If it starts to run over 80-chars then bring the others back.
> > > >
> > > > Also why is there a single liner shoved in the middle of the
> > > > multi-line entries?  Please move the singles to the top or the
> > > > bottom.
> > > 
> > > Hi Lee,
> > > 
> > > Could you please reformat it in the way that makes your OCD-dar happy?
> > > It would be really nice to get
> > 
> > I'm afraid not, for a multitude of reasons.
> > 
> > The most important of which surround testing.
> > 
> > > AC and battery support for APX8x3 merged -- it'll make Pinebook and
> > > Teres-I pretty well supported by mainline kernel.
> > 
> > That's great.  A worthy cause indeed.  So I'm sure you guys will want
> > to turn the patch around in short order so that it's applied in time
> > for the next merge window.
> > 
> 
> Aren't the MFD cells probed in order?
> 
> In that case, it makes little sense to short order them for this
> particular device (X-Powers PMICs in general). It will just make the
> system boot slower because of probe deferring.
> 
> Why? As explained by Chen-Yu in v3[1], axp-gpios can be muxed as
> regulators, thus should be probed before axp-regulators. axp-adc is
> often used by axp-battery, axp-usb-power, axp-ac-power, thus should be
> probed beforehand as well.

If there are inter-dependencies between the devices, it makes sense to
keep them in the most efficient order.

> For the alignment that also triggered your OCD, I can send you a patch
> the day you merge this one if it can help. I sent a few patches for this
> driver that didn't respect the alignment so I'm fine fixing the mfd
> cells (and eventually re-order them as I saw a few axp-gpio cells being
> declared after axp-regulators).

That's fine.  Please send the patch (based on this set) right away.

> Does that make this patch OK for you, Lee?

Yes, thank you.

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

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v6 8/8] mfd: axp20x: Add supported cells for AXP803
  2018-11-20 17:52 ` [PATCH v6 8/8] mfd: axp20x: Add supported cells for AXP803 Oskari Lemmela
  2018-12-07 16:40   ` Lee Jones
@ 2018-12-10  6:27   ` Lee Jones
  1 sibling, 0 replies; 22+ messages in thread
From: Lee Jones @ 2018-12-10  6:27 UTC (permalink / raw)
  To: Oskari Lemmela
  Cc: Sebastian Reichel, Rob Herring, Mark Rutland, Chen-Yu Tsai,
	Maxime Ripard, Quentin Schulz, Vasily Khoruzhick, linux-pm,
	devicetree, linux-kernel, linux-arm-kernel

On Tue, 20 Nov 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>
> ---
>  drivers/mfd/axp20x.c | 15 +++++++++++++++
>  1 file changed, 15 insertions(+)

Applied, thanks.

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

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v6 8/8] mfd: axp20x: Add supported cells for AXP803
  2018-12-10  6:27           ` Lee Jones
@ 2018-12-10  8:29             ` Quentin Schulz
  0 siblings, 0 replies; 22+ messages in thread
From: Quentin Schulz @ 2018-12-10  8:29 UTC (permalink / raw)
  To: Lee Jones
  Cc: Vasily Khoruzhick, Oskari Lemmela, Sebastian Reichel,
	Rob Herring, Mark Rutland, Chen-Yu Tsai, Maxime Ripard, linux-pm,
	devicetree, linux-kernel, arm-linux

[-- Attachment #1: Type: text/plain, Size: 2613 bytes --]

Hi Lee,

On Mon, Dec 10, 2018 at 06:27:18AM +0000, Lee Jones wrote:
> On Sat, 08 Dec 2018, Quentin Schulz wrote:
> 
> > Hi Lee,
> > 
> > On Fri, Dec 07, 2018 at 07:22:37PM +0000, Lee Jones wrote:
> > > On Fri, 07 Dec 2018, Vasily Khoruzhick wrote:
> > > 
> > > > On Fri, Dec 7, 2018 at 8:40 AM Lee Jones <lee.jones@linaro.org> wrote:
> > > > 
> > > > > My OCD-dar is going crazy.
> > > > >
> > > > > Why haven't you used the same alignment as is already there?
> > > > >
> > > > > If it starts to run over 80-chars then bring the others back.
> > > > >
> > > > > Also why is there a single liner shoved in the middle of the
> > > > > multi-line entries?  Please move the singles to the top or the
> > > > > bottom.
> > > > 
> > > > Hi Lee,
> > > > 
> > > > Could you please reformat it in the way that makes your OCD-dar happy?
> > > > It would be really nice to get
> > > 
> > > I'm afraid not, for a multitude of reasons.
> > > 
> > > The most important of which surround testing.
> > > 
> > > > AC and battery support for APX8x3 merged -- it'll make Pinebook and
> > > > Teres-I pretty well supported by mainline kernel.
> > > 
> > > That's great.  A worthy cause indeed.  So I'm sure you guys will want
> > > to turn the patch around in short order so that it's applied in time
> > > for the next merge window.
> > > 
> > 
> > Aren't the MFD cells probed in order?
> > 
> > In that case, it makes little sense to short order them for this
> > particular device (X-Powers PMICs in general). It will just make the
> > system boot slower because of probe deferring.
> > 
> > Why? As explained by Chen-Yu in v3[1], axp-gpios can be muxed as
> > regulators, thus should be probed before axp-regulators. axp-adc is
> > often used by axp-battery, axp-usb-power, axp-ac-power, thus should be
> > probed beforehand as well.
> 
> If there are inter-dependencies between the devices, it makes sense to
> keep them in the most efficient order.
> 
> > For the alignment that also triggered your OCD, I can send you a patch
> > the day you merge this one if it can help. I sent a few patches for this
> > driver that didn't respect the alignment so I'm fine fixing the mfd
> > cells (and eventually re-order them as I saw a few axp-gpio cells being
> > declared after axp-regulators).
> 
> That's fine.  Please send the patch (based on this set) right away.
> 

Since Oskari sent a new version with an alignment fix patch and you
merged that version, I assume I do not have any work to do anymore on
this matter.

Thank you all for the patches,

Quentin

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2018-12-10  8:30 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-11-20 17:52 [PATCH v6 0/8] AXP8x3 AC and battery power supply support Oskari Lemmela
2018-11-20 17:52 ` [PATCH v6 1/8] dt-bindings: power: supply: axp20x: add AXP813 AC power DT binding Oskari Lemmela
2018-11-20 17:52 ` [PATCH v6 2/8] ARM: dts: axp81x: add AC power supply subnode Oskari Lemmela
2018-11-20 17:52 ` [PATCH v6 3/8] arm64: dts: allwinner: axp803: add AC and battery power supplies Oskari Lemmela
2018-11-20 17:52 ` [PATCH v6 4/8] arm64: dts: allwinner: a64: sopine-baseboard: enable " Oskari Lemmela
2018-11-20 17:52 ` [PATCH v6 5/8] arm64: dts: allwinner: a64: pinebook: " Oskari Lemmela
2018-11-20 17:52 ` [PATCH v6 6/8] power: supply: add AC power supply driver for AXP813 Oskari Lemmela
2018-11-20 17:52 ` [PATCH v6 7/8] mfd: axp20x: Add AC power supply cell " Oskari Lemmela
2018-12-07 16:40   ` Lee Jones
2018-11-20 17:52 ` [PATCH v6 8/8] mfd: axp20x: Add supported cells for AXP803 Oskari Lemmela
2018-12-07 16:40   ` Lee Jones
2018-12-07 18:58     ` Vasily Khoruzhick
2018-12-07 19:22       ` Lee Jones
2018-12-08 15:05         ` Quentin Schulz
2018-12-10  6:27           ` Lee Jones
2018-12-10  8:29             ` Quentin Schulz
2018-12-08 18:10     ` Oskari Lemmelä
2018-12-10  6:27   ` Lee Jones
2018-11-30  8:31 ` [PATCH v6 0/8] AXP8x3 AC and battery power supply support Chen-Yu Tsai
2018-12-05 18:00   ` Sebastian Reichel
2018-12-07  7:28     ` Lee Jones
2018-12-07  7:45       ` Chen-Yu Tsai

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).