[PATCH v4 0/6] mfd: axp20x: Add support for RSB based AXP223

[PATCH v4 0/6] mfd: axp20x: Add support for RSB based AXP223

[Chen-Yu Tsai]

Hi everyone,

This is v4 of the AXP223 PMIC series.

Changes since v3:

  - Removed settings for axp223 reg_rtc_ldo from board dts files that
    are already in axp22x.dtsi. The name is kept.

  - Dropped simplefb label and defconfig patches, as they are merged.

Changes since v2:

  - s/It's/Its/ for the commit messages of patches 5 and 7

  - Add Rob's Acked-by for patch 1

Changes since v1:

  - Dropped NMI interrupt controller dts patch (Merged)

  - Change MFD_AXP20X to represent the axp20x core, and drop MFD_AXP20X_CORE
  
  - Keep the axp20x core bits named axp20x.c

  - Add patch 7 to add AXP223 to sun8i-q8-common.dtsi

  - Add patch 8 & 9 to update defconfigs

  - Make axp20x drivers tristate and buildable as modules

  - Drop "_sunxi" substring from identifiers in axp20x-rsb driver


This series adds support for the Reduced Serial Bus based AXP223 PMIC.
The AXP223 is functionally identical to the AXP221, which we already
support. Only some default values for the regulators are different.
The defaults fit their recommended application, paired with different
SoCs.

Patch 1 adds AXP223 to the list of supported chips in the DT binding.

Patch 2 splits the axp20x mfd driver into 2 parts, a core library, and
an I2C driver.

Patch 3 adds an RSB based driver for the AXP223.

Patch 4 adds support for the AXP223 regulators

Patch 5 enables the AXP223 PMIC and its regulators for the Sinlinx
SinA33.

Patch 6 enables the AXP223 PMIC and its regulators for A23/A33 based
Q8 devices.


Regards
ChenYu


Chen-Yu Tsai (6):
  mfd: axp20x: Add AXP223 to list of supported PMICs in DT bindings
  mfd: axp20x: Split the driver into core and i2c bits
  mfd: axp20x: Add support for RSB based AXP223 PMIC
  regulator: axp20x: Support new AXP223 PMIC
  ARM: dts: sun8i: sinlinx-sina33: Add AXP223 PMIC device and regulator
    nodes
  ARM: dts: sun8i: q8-common: Add AXP223 PMIC device and regulator nodes

 Documentation/devicetree/bindings/mfd/axp20x.txt |   7 +-
 arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts   |  79 +++++++++++++-
 arch/arm/boot/dts/sun8i-q8-common.dtsi           |  86 ++++++++++++++-
 drivers/mfd/Kconfig                              |  25 ++++-
 drivers/mfd/Makefile                             |   2 +
 drivers/mfd/axp20x-i2c.c                         | 127 +++++++++++++++++++++++
 drivers/mfd/axp20x-rsb.c                         |  93 +++++++++++++++++
 drivers/mfd/axp20x.c                             | 110 +++-----------------
 drivers/regulator/axp20x-regulator.c             |   3 +
 include/linux/mfd/axp20x.h                       |  34 +++++-
 10 files changed, 458 insertions(+), 108 deletions(-)
 create mode 100644 drivers/mfd/axp20x-i2c.c
 create mode 100644 drivers/mfd/axp20x-rsb.c

-- 
2.6.2

[PATCH v4 0/6] mfd: axp20x: Add support for RSB based AXP223

[Chen-Yu Tsai]

Hi everyone,

This is v4 of the AXP223 PMIC series.

Changes since v3:

  - Removed settings for axp223 reg_rtc_ldo from board dts files that
    are already in axp22x.dtsi. The name is kept.

  - Dropped simplefb label and defconfig patches, as they are merged.

Changes since v2:

  - s/It's/Its/ for the commit messages of patches 5 and 7

  - Add Rob's Acked-by for patch 1

Changes since v1:

  - Dropped NMI interrupt controller dts patch (Merged)

  - Change MFD_AXP20X to represent the axp20x core, and drop MFD_AXP20X_CORE
  
  - Keep the axp20x core bits named axp20x.c

  - Add patch 7 to add AXP223 to sun8i-q8-common.dtsi

  - Add patch 8 & 9 to update defconfigs

  - Make axp20x drivers tristate and buildable as modules

  - Drop "_sunxi" substring from identifiers in axp20x-rsb driver


This series adds support for the Reduced Serial Bus based AXP223 PMIC.
The AXP223 is functionally identical to the AXP221, which we already
support. Only some default values for the regulators are different.
The defaults fit their recommended application, paired with different
SoCs.

Patch 1 adds AXP223 to the list of supported chips in the DT binding.

Patch 2 splits the axp20x mfd driver into 2 parts, a core library, and
an I2C driver.

Patch 3 adds an RSB based driver for the AXP223.

Patch 4 adds support for the AXP223 regulators

Patch 5 enables the AXP223 PMIC and its regulators for the Sinlinx
SinA33.

Patch 6 enables the AXP223 PMIC and its regulators for A23/A33 based
Q8 devices.


Regards
ChenYu


Chen-Yu Tsai (6):
  mfd: axp20x: Add AXP223 to list of supported PMICs in DT bindings
  mfd: axp20x: Split the driver into core and i2c bits
  mfd: axp20x: Add support for RSB based AXP223 PMIC
  regulator: axp20x: Support new AXP223 PMIC
  ARM: dts: sun8i: sinlinx-sina33: Add AXP223 PMIC device and regulator
    nodes
  ARM: dts: sun8i: q8-common: Add AXP223 PMIC device and regulator nodes

 Documentation/devicetree/bindings/mfd/axp20x.txt |   7 +-
 arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts   |  79 +++++++++++++-
 arch/arm/boot/dts/sun8i-q8-common.dtsi           |  86 ++++++++++++++-
 drivers/mfd/Kconfig                              |  25 ++++-
 drivers/mfd/Makefile                             |   2 +
 drivers/mfd/axp20x-i2c.c                         | 127 +++++++++++++++++++++++
 drivers/mfd/axp20x-rsb.c                         |  93 +++++++++++++++++
 drivers/mfd/axp20x.c                             | 110 +++-----------------
 drivers/regulator/axp20x-regulator.c             |   3 +
 include/linux/mfd/axp20x.h                       |  34 +++++-
 10 files changed, 458 insertions(+), 108 deletions(-)
 create mode 100644 drivers/mfd/axp20x-i2c.c
 create mode 100644 drivers/mfd/axp20x-rsb.c

-- 
2.6.2

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v4 0/6] mfd: axp20x: Add support for RSB based AXP223

[Chen-Yu Tsai]

Hi everyone,

This is v4 of the AXP223 PMIC series.

Changes since v3:

  - Removed settings for axp223 reg_rtc_ldo from board dts files that
    are already in axp22x.dtsi. The name is kept.

  - Dropped simplefb label and defconfig patches, as they are merged.

Changes since v2:

  - s/It's/Its/ for the commit messages of patches 5 and 7

  - Add Rob's Acked-by for patch 1

Changes since v1:

  - Dropped NMI interrupt controller dts patch (Merged)

  - Change MFD_AXP20X to represent the axp20x core, and drop MFD_AXP20X_CORE
  
  - Keep the axp20x core bits named axp20x.c

  - Add patch 7 to add AXP223 to sun8i-q8-common.dtsi

  - Add patch 8 & 9 to update defconfigs

  - Make axp20x drivers tristate and buildable as modules

  - Drop "_sunxi" substring from identifiers in axp20x-rsb driver


This series adds support for the Reduced Serial Bus based AXP223 PMIC.
The AXP223 is functionally identical to the AXP221, which we already
support. Only some default values for the regulators are different.
The defaults fit their recommended application, paired with different
SoCs.

Patch 1 adds AXP223 to the list of supported chips in the DT binding.

Patch 2 splits the axp20x mfd driver into 2 parts, a core library, and
an I2C driver.

Patch 3 adds an RSB based driver for the AXP223.

Patch 4 adds support for the AXP223 regulators

Patch 5 enables the AXP223 PMIC and its regulators for the Sinlinx
SinA33.

Patch 6 enables the AXP223 PMIC and its regulators for A23/A33 based
Q8 devices.


Regards
ChenYu


Chen-Yu Tsai (6):
  mfd: axp20x: Add AXP223 to list of supported PMICs in DT bindings
  mfd: axp20x: Split the driver into core and i2c bits
  mfd: axp20x: Add support for RSB based AXP223 PMIC
  regulator: axp20x: Support new AXP223 PMIC
  ARM: dts: sun8i: sinlinx-sina33: Add AXP223 PMIC device and regulator
    nodes
  ARM: dts: sun8i: q8-common: Add AXP223 PMIC device and regulator nodes

 Documentation/devicetree/bindings/mfd/axp20x.txt |   7 +-
 arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts   |  79 +++++++++++++-
 arch/arm/boot/dts/sun8i-q8-common.dtsi           |  86 ++++++++++++++-
 drivers/mfd/Kconfig                              |  25 ++++-
 drivers/mfd/Makefile                             |   2 +
 drivers/mfd/axp20x-i2c.c                         | 127 +++++++++++++++++++++++
 drivers/mfd/axp20x-rsb.c                         |  93 +++++++++++++++++
 drivers/mfd/axp20x.c                             | 110 +++-----------------
 drivers/regulator/axp20x-regulator.c             |   3 +
 include/linux/mfd/axp20x.h                       |  34 +++++-
 10 files changed, 458 insertions(+), 108 deletions(-)
 create mode 100644 drivers/mfd/axp20x-i2c.c
 create mode 100644 drivers/mfd/axp20x-rsb.c

-- 
2.6.2

[PATCH v4 1/6] mfd: axp20x: Add AXP223 to list of supported PMICs in DT bindings

[Chen-Yu Tsai]

The AXP223 is a new PMIC commonly paired with Allwinner A23/A33 SoCs.
It is functionally identical to AXP221; only the regulator default
voltage/status and the external host interface are different.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Rob Herring <robh@kernel.org>
---
 Documentation/devicetree/bindings/mfd/axp20x.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/mfd/axp20x.txt b/Documentation/devicetree/bindings/mfd/axp20x.txt
index a474359dd206..fd39fa54571b 100644
--- a/Documentation/devicetree/bindings/mfd/axp20x.txt
+++ b/Documentation/devicetree/bindings/mfd/axp20x.txt
@@ -5,11 +5,12 @@ axp152 (X-Powers)
 axp202 (X-Powers)
 axp209 (X-Powers)
 axp221 (X-Powers)
+axp223 (X-Powers)
 
 Required properties:
 - compatible: "x-powers,axp152", "x-powers,axp202", "x-powers,axp209",
-	      "x-powers,axp221"
-- reg: The I2C slave address for the AXP chip
+	      "x-powers,axp221", "x-powers,axp223"
+- reg: The I2C slave address or RSB hardware address for the AXP chip
 - interrupt-parent: The parent interrupt controller
 - interrupts: SoC NMI / GPIO interrupt connected to the PMIC's IRQ pin
 - interrupt-controller: The PMIC has its own internal IRQs
@@ -51,7 +52,7 @@ LDO3		: LDO		: ldo3in-supply
 LDO4		: LDO		: ldo24in-supply	: shared supply
 LDO5		: LDO		: ldo5in-supply
 
-AXP221 regulators, type, and corresponding input supply names:
+AXP221/AXP223 regulators, type, and corresponding input supply names:
 
 Regulator	  Type		  Supply Name		  Notes
 ---------	  ----		  -----------		  -----
-- 
2.6.2

[PATCH v4 1/6] mfd: axp20x: Add AXP223 to list of supported PMICs in DT bindings

[Chen-Yu Tsai]

The AXP223 is a new PMIC commonly paired with Allwinner A23/A33 SoCs.
It is functionally identical to AXP221; only the regulator default
voltage/status and the external host interface are different.

Signed-off-by: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>
Acked-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
---
 Documentation/devicetree/bindings/mfd/axp20x.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/mfd/axp20x.txt b/Documentation/devicetree/bindings/mfd/axp20x.txt
index a474359dd206..fd39fa54571b 100644
--- a/Documentation/devicetree/bindings/mfd/axp20x.txt
+++ b/Documentation/devicetree/bindings/mfd/axp20x.txt
@@ -5,11 +5,12 @@ axp152 (X-Powers)
 axp202 (X-Powers)
 axp209 (X-Powers)
 axp221 (X-Powers)
+axp223 (X-Powers)
 
 Required properties:
 - compatible: "x-powers,axp152", "x-powers,axp202", "x-powers,axp209",
-	      "x-powers,axp221"
-- reg: The I2C slave address for the AXP chip
+	      "x-powers,axp221", "x-powers,axp223"
+- reg: The I2C slave address or RSB hardware address for the AXP chip
 - interrupt-parent: The parent interrupt controller
 - interrupts: SoC NMI / GPIO interrupt connected to the PMIC's IRQ pin
 - interrupt-controller: The PMIC has its own internal IRQs
@@ -51,7 +52,7 @@ LDO3		: LDO		: ldo3in-supply
 LDO4		: LDO		: ldo24in-supply	: shared supply
 LDO5		: LDO		: ldo5in-supply
 
-AXP221 regulators, type, and corresponding input supply names:
+AXP221/AXP223 regulators, type, and corresponding input supply names:
 
 Regulator	  Type		  Supply Name		  Notes
 ---------	  ----		  -----------		  -----
-- 
2.6.2

[PATCH v4 1/6] mfd: axp20x: Add AXP223 to list of supported PMICs in DT bindings

[Chen-Yu Tsai]

The AXP223 is a new PMIC commonly paired with Allwinner A23/A33 SoCs.
It is functionally identical to AXP221; only the regulator default
voltage/status and the external host interface are different.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: Rob Herring <robh@kernel.org>
---
 Documentation/devicetree/bindings/mfd/axp20x.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/Documentation/devicetree/bindings/mfd/axp20x.txt b/Documentation/devicetree/bindings/mfd/axp20x.txt
index a474359dd206..fd39fa54571b 100644
--- a/Documentation/devicetree/bindings/mfd/axp20x.txt
+++ b/Documentation/devicetree/bindings/mfd/axp20x.txt
@@ -5,11 +5,12 @@ axp152 (X-Powers)
 axp202 (X-Powers)
 axp209 (X-Powers)
 axp221 (X-Powers)
+axp223 (X-Powers)
 
 Required properties:
 - compatible: "x-powers,axp152", "x-powers,axp202", "x-powers,axp209",
-	      "x-powers,axp221"
-- reg: The I2C slave address for the AXP chip
+	      "x-powers,axp221", "x-powers,axp223"
+- reg: The I2C slave address or RSB hardware address for the AXP chip
 - interrupt-parent: The parent interrupt controller
 - interrupts: SoC NMI / GPIO interrupt connected to the PMIC's IRQ pin
 - interrupt-controller: The PMIC has its own internal IRQs
@@ -51,7 +52,7 @@ LDO3		: LDO		: ldo3in-supply
 LDO4		: LDO		: ldo24in-supply	: shared supply
 LDO5		: LDO		: ldo5in-supply
 
-AXP221 regulators, type, and corresponding input supply names:
+AXP221/AXP223 regulators, type, and corresponding input supply names:
 
 Regulator	  Type		  Supply Name		  Notes
 ---------	  ----		  -----------		  -----
-- 
2.6.2

[PATCH v4 2/6] mfd: axp20x: Split the driver into core and i2c bits

[Chen-Yu Tsai]

The axp20x driver assumes the device is i2c based. This is not the
case with later chips, which use a proprietary 2 wire serial bus
by Allwinner called "Reduced Serial Bus".

This patch follows the example of mfd/wm831x and splits it into
an interface independent core, and an i2c specific glue layer.
MFD_AXP20X and the new MFD_AXP20X_I2C are changed to tristate
symbols, allowing the driver to be built as modules.

Included but unused header files are removed as well.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 drivers/mfd/Kconfig        |  14 +++--
 drivers/mfd/Makefile       |   1 +
 drivers/mfd/axp20x-i2c.c   | 127 +++++++++++++++++++++++++++++++++++++++++++++
 drivers/mfd/axp20x.c       | 108 +++++---------------------------------
 include/linux/mfd/axp20x.h |  33 +++++++++++-
 5 files changed, 183 insertions(+), 100 deletions(-)
 create mode 100644 drivers/mfd/axp20x-i2c.c

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 4d92df6ef9fe..804cd3dcce32 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -91,14 +91,18 @@ config MFD_BCM590XX
 	  Support for the BCM590xx PMUs from Broadcom
 
 config MFD_AXP20X
-	bool "X-Powers AXP20X"
+	tristate
 	select MFD_CORE
-	select REGMAP_I2C
 	select REGMAP_IRQ
-	depends on I2C=y
+
+config MFD_AXP20X_I2C
+	tristate "X-Powers AXP series PMICs with I2C"
+	select MFD_AXP20X
+	select REGMAP_I2C
+	depends on I2C
 	help
-	  If you say Y here you get support for the X-Powers AXP202, AXP209 and
-	  AXP288 power management IC (PMIC).
+	  If you say Y here you get support for the X-Powers AXP series power
+	  management ICs (PMICs) controlled with I2C.
 	  This driver include only the core APIs. You have to select individual
 	  components like regulators or the PEK (Power Enable Key) under the
 	  corresponding menus.
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index a8b76b81b467..a6913007d667 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -107,6 +107,7 @@ obj-$(CONFIG_PMIC_DA9052)	+= da9052-core.o
 obj-$(CONFIG_MFD_DA9052_SPI)	+= da9052-spi.o
 obj-$(CONFIG_MFD_DA9052_I2C)	+= da9052-i2c.o
 obj-$(CONFIG_MFD_AXP20X)	+= axp20x.o
+obj-$(CONFIG_MFD_AXP20X_I2C)	+= axp20x-i2c.o
 
 obj-$(CONFIG_MFD_LP3943)	+= lp3943.o
 obj-$(CONFIG_MFD_LP8788)	+= lp8788.o lp8788-irq.o
diff --git a/drivers/mfd/axp20x-i2c.c b/drivers/mfd/axp20x-i2c.c
new file mode 100644
index 000000000000..75b247af2514
--- /dev/null
+++ b/drivers/mfd/axp20x-i2c.c
@@ -0,0 +1,127 @@
+/*
+ * axp20x-i2c.c - I2C driver for the X-Powers' Power Management ICs
+ *
+ * AXP20x typically comprises an adaptive USB-Compatible PWM charger, BUCK DC-DC
+ * converters, LDOs, multiple 12-bit ADCs of voltage, current and temperature
+ * as well as configurable GPIOs.
+ *
+ * This driver supports the I2C variants.
+ *
+ * Author: Carlo Caione <carlo@caione.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/acpi.h>
+#include <linux/err.h>
+#include <linux/i2c.h>
+#include <linux/module.h>
+#include <linux/mfd/axp20x.h>
+#include <linux/of_device.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+
+static const struct of_device_id axp20x_i2c_of_match[] = {
+	{ .compatible = "x-powers,axp152", .data = (void *) AXP152_ID },
+	{ .compatible = "x-powers,axp202", .data = (void *) AXP202_ID },
+	{ .compatible = "x-powers,axp209", .data = (void *) AXP209_ID },
+	{ .compatible = "x-powers,axp221", .data = (void *) AXP221_ID },
+	{ },
+};
+MODULE_DEVICE_TABLE(of, axp20x_i2c_of_match);
+
+/*
+ * This is useless for OF-enabled devices, but it is needed by I2C subsystem
+ */
+static const struct i2c_device_id axp20x_i2c_id[] = {
+	{ },
+};
+MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
+
+static const struct acpi_device_id axp20x_i2c_acpi_match[] = {
+	{
+		.id = "INT33F4",
+		.driver_data = AXP288_ID,
+	},
+	{ },
+};
+MODULE_DEVICE_TABLE(acpi, axp20x_i2c_acpi_match);
+
+static int axp20x_i2c_match_device(struct axp20x_dev *axp20x,
+				   struct device *dev)
+{
+	const struct acpi_device_id *acpi_id;
+	const struct of_device_id *of_id;
+
+	if (dev->of_node) {
+		of_id = of_match_device(axp20x_i2c_of_match, dev);
+		if (!of_id) {
+			dev_err(dev, "Unable to match OF ID\n");
+			return -ENODEV;
+		}
+		axp20x->variant = (long) of_id->data;
+	} else {
+		acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev);
+		if (!acpi_id || !acpi_id->driver_data) {
+			dev_err(dev, "Unable to match ACPI ID and data\n");
+			return -ENODEV;
+		}
+		axp20x->variant = (long) acpi_id->driver_data;
+	}
+
+	return axp20x_match_device(axp20x, dev);
+}
+
+static int axp20x_i2c_probe(struct i2c_client *i2c,
+			    const struct i2c_device_id *id)
+{
+	struct axp20x_dev *axp20x;
+	int ret;
+
+	axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
+	if (!axp20x)
+		return -ENOMEM;
+
+	ret = axp20x_i2c_match_device(axp20x, &i2c->dev);
+	if (ret)
+		return ret;
+
+	axp20x->dev = &i2c->dev;
+	axp20x->irq = i2c->irq;
+	dev_set_drvdata(axp20x->dev, axp20x);
+
+	axp20x->regmap = devm_regmap_init_i2c(i2c, axp20x->regmap_cfg);
+	if (IS_ERR(axp20x->regmap)) {
+		ret = PTR_ERR(axp20x->regmap);
+		dev_err(&i2c->dev, "regmap init failed: %d\n", ret);
+		return ret;
+	}
+
+	return axp20x_device_probe(axp20x);
+}
+
+static int axp20x_i2c_remove(struct i2c_client *i2c)
+{
+	struct axp20x_dev *axp20x = i2c_get_clientdata(i2c);
+
+	return axp20x_device_remove(axp20x);
+}
+
+static struct i2c_driver axp20x_i2c_driver = {
+	.driver = {
+		.name	= "axp20x",
+		.of_match_table	= of_match_ptr(axp20x_i2c_of_match),
+		.acpi_match_table = ACPI_PTR(axp20x_i2c_acpi_match),
+	},
+	.probe		= axp20x_i2c_probe,
+	.remove		= axp20x_i2c_remove,
+	.id_table	= axp20x_i2c_id,
+};
+
+module_i2c_driver(axp20x_i2c_driver);
+
+MODULE_DESCRIPTION("PMIC MFD I2C driver for AXP20X");
+MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index 9842199e2e6c..01f139856bf1 100644
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -5,6 +5,8 @@
  * converters, LDOs, multiple 12-bit ADCs of voltage, current and temperature
  * as well as configurable GPIOs.
  *
+ * This file contains the interface independent core functions.
+ *
  * Author: Carlo Caione <carlo@caione.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -13,18 +15,14 @@
  */
 
 #include <linux/err.h>
-#include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
-#include <linux/slab.h>
 #include <linux/regulator/consumer.h>
 #include <linux/mfd/axp20x.h>
 #include <linux/mfd/core.h>
-#include <linux/of_device.h>
-#include <linux/of_irq.h>
 #include <linux/acpi.h>
 
 #define AXP20X_OFF	0x80
@@ -376,32 +374,6 @@ static const struct regmap_irq axp288_regmap_irqs[] = {
 	INIT_REGMAP_IRQ(AXP288, BC_USB_CHNG,            5, 1),
 };
 
-static const struct of_device_id axp20x_of_match[] = {
-	{ .compatible = "x-powers,axp152", .data = (void *) AXP152_ID },
-	{ .compatible = "x-powers,axp202", .data = (void *) AXP202_ID },
-	{ .compatible = "x-powers,axp209", .data = (void *) AXP209_ID },
-	{ .compatible = "x-powers,axp221", .data = (void *) AXP221_ID },
-	{ },
-};
-MODULE_DEVICE_TABLE(of, axp20x_of_match);
-
-/*
- * This is useless for OF-enabled devices, but it is needed by I2C subsystem
- */
-static const struct i2c_device_id axp20x_i2c_id[] = {
-	{ },
-};
-MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
-
-static const struct acpi_device_id axp20x_acpi_match[] = {
-	{
-		.id = "INT33F4",
-		.driver_data = AXP288_ID,
-	},
-	{ },
-};
-MODULE_DEVICE_TABLE(acpi, axp20x_acpi_match);
-
 static const struct regmap_irq_chip axp152_regmap_irq_chip = {
 	.name			= "axp152_irq_chip",
 	.status_base		= AXP152_IRQ1_STATE,
@@ -606,27 +578,8 @@ static void axp20x_power_off(void)
 		     AXP20X_OFF);
 }
 
-static int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
+int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
 {
-	const struct acpi_device_id *acpi_id;
-	const struct of_device_id *of_id;
-
-	if (dev->of_node) {
-		of_id = of_match_device(axp20x_of_match, dev);
-		if (!of_id) {
-			dev_err(dev, "Unable to match OF ID\n");
-			return -ENODEV;
-		}
-		axp20x->variant = (long) of_id->data;
-	} else {
-		acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev);
-		if (!acpi_id || !acpi_id->driver_data) {
-			dev_err(dev, "Unable to match ACPI ID and data\n");
-			return -ENODEV;
-		}
-		axp20x->variant = (long) acpi_id->driver_data;
-	}
-
 	switch (axp20x->variant) {
 	case AXP152_ID:
 		axp20x->nr_cells = ARRAY_SIZE(axp152_cells);
@@ -662,38 +615,18 @@ static int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
 
 	return 0;
 }
+EXPORT_SYMBOL(axp20x_match_device);
 
-static int axp20x_i2c_probe(struct i2c_client *i2c,
-			 const struct i2c_device_id *id)
+int axp20x_device_probe(struct axp20x_dev *axp20x)
 {
-	struct axp20x_dev *axp20x;
 	int ret;
 
-	axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
-	if (!axp20x)
-		return -ENOMEM;
-
-	ret = axp20x_match_device(axp20x, &i2c->dev);
-	if (ret)
-		return ret;
-
-	axp20x->i2c_client = i2c;
-	axp20x->dev = &i2c->dev;
-	dev_set_drvdata(axp20x->dev, axp20x);
-
-	axp20x->regmap = devm_regmap_init_i2c(i2c, axp20x->regmap_cfg);
-	if (IS_ERR(axp20x->regmap)) {
-		ret = PTR_ERR(axp20x->regmap);
-		dev_err(&i2c->dev, "regmap init failed: %d\n", ret);
-		return ret;
-	}
-
-	ret = regmap_add_irq_chip(axp20x->regmap, i2c->irq,
+	ret = regmap_add_irq_chip(axp20x->regmap, axp20x->irq,
 				  IRQF_ONESHOT | IRQF_SHARED, -1,
 				  axp20x->regmap_irq_chip,
 				  &axp20x->regmap_irqc);
 	if (ret) {
-		dev_err(&i2c->dev, "failed to add irq chip: %d\n", ret);
+		dev_err(axp20x->dev, "failed to add irq chip: %d\n", ret);
 		return ret;
 	}
 
@@ -701,8 +634,8 @@ static int axp20x_i2c_probe(struct i2c_client *i2c,
 			axp20x->nr_cells, NULL, 0, NULL);
 
 	if (ret) {
-		dev_err(&i2c->dev, "failed to add MFD devices: %d\n", ret);
-		regmap_del_irq_chip(i2c->irq, axp20x->regmap_irqc);
+		dev_err(axp20x->dev, "failed to add MFD devices: %d\n", ret);
+		regmap_del_irq_chip(axp20x->irq, axp20x->regmap_irqc);
 		return ret;
 	}
 
@@ -711,38 +644,25 @@ static int axp20x_i2c_probe(struct i2c_client *i2c,
 		pm_power_off = axp20x_power_off;
 	}
 
-	dev_info(&i2c->dev, "AXP20X driver loaded\n");
+	dev_info(axp20x->dev, "AXP20X driver loaded\n");
 
 	return 0;
 }
+EXPORT_SYMBOL(axp20x_device_probe);
 
-static int axp20x_i2c_remove(struct i2c_client *i2c)
+int axp20x_device_remove(struct axp20x_dev *axp20x)
 {
-	struct axp20x_dev *axp20x = i2c_get_clientdata(i2c);
-
 	if (axp20x == axp20x_pm_power_off) {
 		axp20x_pm_power_off = NULL;
 		pm_power_off = NULL;
 	}
 
 	mfd_remove_devices(axp20x->dev);
-	regmap_del_irq_chip(axp20x->i2c_client->irq, axp20x->regmap_irqc);
+	regmap_del_irq_chip(axp20x->irq, axp20x->regmap_irqc);
 
 	return 0;
 }
-
-static struct i2c_driver axp20x_i2c_driver = {
-	.driver = {
-		.name	= "axp20x",
-		.of_match_table	= of_match_ptr(axp20x_of_match),
-		.acpi_match_table = ACPI_PTR(axp20x_acpi_match),
-	},
-	.probe		= axp20x_i2c_probe,
-	.remove		= axp20x_i2c_remove,
-	.id_table	= axp20x_i2c_id,
-};
-
-module_i2c_driver(axp20x_i2c_driver);
+EXPORT_SYMBOL(axp20x_device_remove);
 
 MODULE_DESCRIPTION("PMIC MFD core driver for AXP20X");
 MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h
index b24c771cebd5..908f97f6e2d7 100644
--- a/include/linux/mfd/axp20x.h
+++ b/include/linux/mfd/axp20x.h
@@ -396,7 +396,7 @@ enum axp288_irqs {
 
 struct axp20x_dev {
 	struct device			*dev;
-	struct i2c_client		*i2c_client;
+	int				irq;
 	struct regmap			*regmap;
 	struct regmap_irq_chip_data	*regmap_irqc;
 	long				variant;
@@ -462,4 +462,35 @@ static inline int axp20x_read_variable_width(struct regmap *regmap,
 	return result;
 }
 
+/**
+ * axp20x_match_device(): Setup axp20x variant related fields
+ *
+ * @axp20x: axp20x device to setup (.variant field must be set)
+ * @dev: device associated with this axp20x device
+ *
+ * This lets the axp20x core configure the mfd cells and register maps
+ * for later use.
+ */
+int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev);
+
+/**
+ * axp20x_device_probe(): Probe a configured axp20x device
+ *
+ * @axp20x: axp20x device to probe (must be configured)
+ *
+ * This function lets the axp20x core register the axp20x mfd devices
+ * and irqchip. The axp20x device passed in must be fully configured
+ * with axp20x_match_device, its irq set, and regmap created.
+ */
+int axp20x_device_probe(struct axp20x_dev *axp20x);
+
+/**
+ * axp20x_device_probe(): Remove a axp20x device
+ *
+ * @axp20x: axp20x device to remove
+ *
+ * This tells the axp20x core to remove the associated mfd devices
+ */
+int axp20x_device_remove(struct axp20x_dev *axp20x);
+
 #endif /* __LINUX_MFD_AXP20X_H */
-- 
2.6.2

[PATCH v4 2/6] mfd: axp20x: Split the driver into core and i2c bits

[Chen-Yu Tsai]

The axp20x driver assumes the device is i2c based. This is not the
case with later chips, which use a proprietary 2 wire serial bus
by Allwinner called "Reduced Serial Bus".

This patch follows the example of mfd/wm831x and splits it into
an interface independent core, and an i2c specific glue layer.
MFD_AXP20X and the new MFD_AXP20X_I2C are changed to tristate
symbols, allowing the driver to be built as modules.

Included but unused header files are removed as well.

Signed-off-by: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>
---
 drivers/mfd/Kconfig        |  14 +++--
 drivers/mfd/Makefile       |   1 +
 drivers/mfd/axp20x-i2c.c   | 127 +++++++++++++++++++++++++++++++++++++++++++++
 drivers/mfd/axp20x.c       | 108 +++++---------------------------------
 include/linux/mfd/axp20x.h |  33 +++++++++++-
 5 files changed, 183 insertions(+), 100 deletions(-)
 create mode 100644 drivers/mfd/axp20x-i2c.c

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 4d92df6ef9fe..804cd3dcce32 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -91,14 +91,18 @@ config MFD_BCM590XX
 	  Support for the BCM590xx PMUs from Broadcom
 
 config MFD_AXP20X
-	bool "X-Powers AXP20X"
+	tristate
 	select MFD_CORE
-	select REGMAP_I2C
 	select REGMAP_IRQ
-	depends on I2C=y
+
+config MFD_AXP20X_I2C
+	tristate "X-Powers AXP series PMICs with I2C"
+	select MFD_AXP20X
+	select REGMAP_I2C
+	depends on I2C
 	help
-	  If you say Y here you get support for the X-Powers AXP202, AXP209 and
-	  AXP288 power management IC (PMIC).
+	  If you say Y here you get support for the X-Powers AXP series power
+	  management ICs (PMICs) controlled with I2C.
 	  This driver include only the core APIs. You have to select individual
 	  components like regulators or the PEK (Power Enable Key) under the
 	  corresponding menus.
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index a8b76b81b467..a6913007d667 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -107,6 +107,7 @@ obj-$(CONFIG_PMIC_DA9052)	+= da9052-core.o
 obj-$(CONFIG_MFD_DA9052_SPI)	+= da9052-spi.o
 obj-$(CONFIG_MFD_DA9052_I2C)	+= da9052-i2c.o
 obj-$(CONFIG_MFD_AXP20X)	+= axp20x.o
+obj-$(CONFIG_MFD_AXP20X_I2C)	+= axp20x-i2c.o
 
 obj-$(CONFIG_MFD_LP3943)	+= lp3943.o
 obj-$(CONFIG_MFD_LP8788)	+= lp8788.o lp8788-irq.o
diff --git a/drivers/mfd/axp20x-i2c.c b/drivers/mfd/axp20x-i2c.c
new file mode 100644
index 000000000000..75b247af2514
--- /dev/null
+++ b/drivers/mfd/axp20x-i2c.c
@@ -0,0 +1,127 @@
+/*
+ * axp20x-i2c.c - I2C driver for the X-Powers' Power Management ICs
+ *
+ * AXP20x typically comprises an adaptive USB-Compatible PWM charger, BUCK DC-DC
+ * converters, LDOs, multiple 12-bit ADCs of voltage, current and temperature
+ * as well as configurable GPIOs.
+ *
+ * This driver supports the I2C variants.
+ *
+ * Author: Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/acpi.h>
+#include <linux/err.h>
+#include <linux/i2c.h>
+#include <linux/module.h>
+#include <linux/mfd/axp20x.h>
+#include <linux/of_device.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+
+static const struct of_device_id axp20x_i2c_of_match[] = {
+	{ .compatible = "x-powers,axp152", .data = (void *) AXP152_ID },
+	{ .compatible = "x-powers,axp202", .data = (void *) AXP202_ID },
+	{ .compatible = "x-powers,axp209", .data = (void *) AXP209_ID },
+	{ .compatible = "x-powers,axp221", .data = (void *) AXP221_ID },
+	{ },
+};
+MODULE_DEVICE_TABLE(of, axp20x_i2c_of_match);
+
+/*
+ * This is useless for OF-enabled devices, but it is needed by I2C subsystem
+ */
+static const struct i2c_device_id axp20x_i2c_id[] = {
+	{ },
+};
+MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
+
+static const struct acpi_device_id axp20x_i2c_acpi_match[] = {
+	{
+		.id = "INT33F4",
+		.driver_data = AXP288_ID,
+	},
+	{ },
+};
+MODULE_DEVICE_TABLE(acpi, axp20x_i2c_acpi_match);
+
+static int axp20x_i2c_match_device(struct axp20x_dev *axp20x,
+				   struct device *dev)
+{
+	const struct acpi_device_id *acpi_id;
+	const struct of_device_id *of_id;
+
+	if (dev->of_node) {
+		of_id = of_match_device(axp20x_i2c_of_match, dev);
+		if (!of_id) {
+			dev_err(dev, "Unable to match OF ID\n");
+			return -ENODEV;
+		}
+		axp20x->variant = (long) of_id->data;
+	} else {
+		acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev);
+		if (!acpi_id || !acpi_id->driver_data) {
+			dev_err(dev, "Unable to match ACPI ID and data\n");
+			return -ENODEV;
+		}
+		axp20x->variant = (long) acpi_id->driver_data;
+	}
+
+	return axp20x_match_device(axp20x, dev);
+}
+
+static int axp20x_i2c_probe(struct i2c_client *i2c,
+			    const struct i2c_device_id *id)
+{
+	struct axp20x_dev *axp20x;
+	int ret;
+
+	axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
+	if (!axp20x)
+		return -ENOMEM;
+
+	ret = axp20x_i2c_match_device(axp20x, &i2c->dev);
+	if (ret)
+		return ret;
+
+	axp20x->dev = &i2c->dev;
+	axp20x->irq = i2c->irq;
+	dev_set_drvdata(axp20x->dev, axp20x);
+
+	axp20x->regmap = devm_regmap_init_i2c(i2c, axp20x->regmap_cfg);
+	if (IS_ERR(axp20x->regmap)) {
+		ret = PTR_ERR(axp20x->regmap);
+		dev_err(&i2c->dev, "regmap init failed: %d\n", ret);
+		return ret;
+	}
+
+	return axp20x_device_probe(axp20x);
+}
+
+static int axp20x_i2c_remove(struct i2c_client *i2c)
+{
+	struct axp20x_dev *axp20x = i2c_get_clientdata(i2c);
+
+	return axp20x_device_remove(axp20x);
+}
+
+static struct i2c_driver axp20x_i2c_driver = {
+	.driver = {
+		.name	= "axp20x",
+		.of_match_table	= of_match_ptr(axp20x_i2c_of_match),
+		.acpi_match_table = ACPI_PTR(axp20x_i2c_acpi_match),
+	},
+	.probe		= axp20x_i2c_probe,
+	.remove		= axp20x_i2c_remove,
+	.id_table	= axp20x_i2c_id,
+};
+
+module_i2c_driver(axp20x_i2c_driver);
+
+MODULE_DESCRIPTION("PMIC MFD I2C driver for AXP20X");
+MODULE_AUTHOR("Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index 9842199e2e6c..01f139856bf1 100644
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -5,6 +5,8 @@
  * converters, LDOs, multiple 12-bit ADCs of voltage, current and temperature
  * as well as configurable GPIOs.
  *
+ * This file contains the interface independent core functions.
+ *
  * Author: Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -13,18 +15,14 @@
  */
 
 #include <linux/err.h>
-#include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
-#include <linux/slab.h>
 #include <linux/regulator/consumer.h>
 #include <linux/mfd/axp20x.h>
 #include <linux/mfd/core.h>
-#include <linux/of_device.h>
-#include <linux/of_irq.h>
 #include <linux/acpi.h>
 
 #define AXP20X_OFF	0x80
@@ -376,32 +374,6 @@ static const struct regmap_irq axp288_regmap_irqs[] = {
 	INIT_REGMAP_IRQ(AXP288, BC_USB_CHNG,            5, 1),
 };
 
-static const struct of_device_id axp20x_of_match[] = {
-	{ .compatible = "x-powers,axp152", .data = (void *) AXP152_ID },
-	{ .compatible = "x-powers,axp202", .data = (void *) AXP202_ID },
-	{ .compatible = "x-powers,axp209", .data = (void *) AXP209_ID },
-	{ .compatible = "x-powers,axp221", .data = (void *) AXP221_ID },
-	{ },
-};
-MODULE_DEVICE_TABLE(of, axp20x_of_match);
-
-/*
- * This is useless for OF-enabled devices, but it is needed by I2C subsystem
- */
-static const struct i2c_device_id axp20x_i2c_id[] = {
-	{ },
-};
-MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
-
-static const struct acpi_device_id axp20x_acpi_match[] = {
-	{
-		.id = "INT33F4",
-		.driver_data = AXP288_ID,
-	},
-	{ },
-};
-MODULE_DEVICE_TABLE(acpi, axp20x_acpi_match);
-
 static const struct regmap_irq_chip axp152_regmap_irq_chip = {
 	.name			= "axp152_irq_chip",
 	.status_base		= AXP152_IRQ1_STATE,
@@ -606,27 +578,8 @@ static void axp20x_power_off(void)
 		     AXP20X_OFF);
 }
 
-static int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
+int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
 {
-	const struct acpi_device_id *acpi_id;
-	const struct of_device_id *of_id;
-
-	if (dev->of_node) {
-		of_id = of_match_device(axp20x_of_match, dev);
-		if (!of_id) {
-			dev_err(dev, "Unable to match OF ID\n");
-			return -ENODEV;
-		}
-		axp20x->variant = (long) of_id->data;
-	} else {
-		acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev);
-		if (!acpi_id || !acpi_id->driver_data) {
-			dev_err(dev, "Unable to match ACPI ID and data\n");
-			return -ENODEV;
-		}
-		axp20x->variant = (long) acpi_id->driver_data;
-	}
-
 	switch (axp20x->variant) {
 	case AXP152_ID:
 		axp20x->nr_cells = ARRAY_SIZE(axp152_cells);
@@ -662,38 +615,18 @@ static int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
 
 	return 0;
 }
+EXPORT_SYMBOL(axp20x_match_device);
 
-static int axp20x_i2c_probe(struct i2c_client *i2c,
-			 const struct i2c_device_id *id)
+int axp20x_device_probe(struct axp20x_dev *axp20x)
 {
-	struct axp20x_dev *axp20x;
 	int ret;
 
-	axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
-	if (!axp20x)
-		return -ENOMEM;
-
-	ret = axp20x_match_device(axp20x, &i2c->dev);
-	if (ret)
-		return ret;
-
-	axp20x->i2c_client = i2c;
-	axp20x->dev = &i2c->dev;
-	dev_set_drvdata(axp20x->dev, axp20x);
-
-	axp20x->regmap = devm_regmap_init_i2c(i2c, axp20x->regmap_cfg);
-	if (IS_ERR(axp20x->regmap)) {
-		ret = PTR_ERR(axp20x->regmap);
-		dev_err(&i2c->dev, "regmap init failed: %d\n", ret);
-		return ret;
-	}
-
-	ret = regmap_add_irq_chip(axp20x->regmap, i2c->irq,
+	ret = regmap_add_irq_chip(axp20x->regmap, axp20x->irq,
 				  IRQF_ONESHOT | IRQF_SHARED, -1,
 				  axp20x->regmap_irq_chip,
 				  &axp20x->regmap_irqc);
 	if (ret) {
-		dev_err(&i2c->dev, "failed to add irq chip: %d\n", ret);
+		dev_err(axp20x->dev, "failed to add irq chip: %d\n", ret);
 		return ret;
 	}
 
@@ -701,8 +634,8 @@ static int axp20x_i2c_probe(struct i2c_client *i2c,
 			axp20x->nr_cells, NULL, 0, NULL);
 
 	if (ret) {
-		dev_err(&i2c->dev, "failed to add MFD devices: %d\n", ret);
-		regmap_del_irq_chip(i2c->irq, axp20x->regmap_irqc);
+		dev_err(axp20x->dev, "failed to add MFD devices: %d\n", ret);
+		regmap_del_irq_chip(axp20x->irq, axp20x->regmap_irqc);
 		return ret;
 	}
 
@@ -711,38 +644,25 @@ static int axp20x_i2c_probe(struct i2c_client *i2c,
 		pm_power_off = axp20x_power_off;
 	}
 
-	dev_info(&i2c->dev, "AXP20X driver loaded\n");
+	dev_info(axp20x->dev, "AXP20X driver loaded\n");
 
 	return 0;
 }
+EXPORT_SYMBOL(axp20x_device_probe);
 
-static int axp20x_i2c_remove(struct i2c_client *i2c)
+int axp20x_device_remove(struct axp20x_dev *axp20x)
 {
-	struct axp20x_dev *axp20x = i2c_get_clientdata(i2c);
-
 	if (axp20x == axp20x_pm_power_off) {
 		axp20x_pm_power_off = NULL;
 		pm_power_off = NULL;
 	}
 
 	mfd_remove_devices(axp20x->dev);
-	regmap_del_irq_chip(axp20x->i2c_client->irq, axp20x->regmap_irqc);
+	regmap_del_irq_chip(axp20x->irq, axp20x->regmap_irqc);
 
 	return 0;
 }
-
-static struct i2c_driver axp20x_i2c_driver = {
-	.driver = {
-		.name	= "axp20x",
-		.of_match_table	= of_match_ptr(axp20x_of_match),
-		.acpi_match_table = ACPI_PTR(axp20x_acpi_match),
-	},
-	.probe		= axp20x_i2c_probe,
-	.remove		= axp20x_i2c_remove,
-	.id_table	= axp20x_i2c_id,
-};
-
-module_i2c_driver(axp20x_i2c_driver);
+EXPORT_SYMBOL(axp20x_device_remove);
 
 MODULE_DESCRIPTION("PMIC MFD core driver for AXP20X");
 MODULE_AUTHOR("Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>");
diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h
index b24c771cebd5..908f97f6e2d7 100644
--- a/include/linux/mfd/axp20x.h
+++ b/include/linux/mfd/axp20x.h
@@ -396,7 +396,7 @@ enum axp288_irqs {
 
 struct axp20x_dev {
 	struct device			*dev;
-	struct i2c_client		*i2c_client;
+	int				irq;
 	struct regmap			*regmap;
 	struct regmap_irq_chip_data	*regmap_irqc;
 	long				variant;
@@ -462,4 +462,35 @@ static inline int axp20x_read_variable_width(struct regmap *regmap,
 	return result;
 }
 
+/**
+ * axp20x_match_device(): Setup axp20x variant related fields
+ *
+ * @axp20x: axp20x device to setup (.variant field must be set)
+ * @dev: device associated with this axp20x device
+ *
+ * This lets the axp20x core configure the mfd cells and register maps
+ * for later use.
+ */
+int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev);
+
+/**
+ * axp20x_device_probe(): Probe a configured axp20x device
+ *
+ * @axp20x: axp20x device to probe (must be configured)
+ *
+ * This function lets the axp20x core register the axp20x mfd devices
+ * and irqchip. The axp20x device passed in must be fully configured
+ * with axp20x_match_device, its irq set, and regmap created.
+ */
+int axp20x_device_probe(struct axp20x_dev *axp20x);
+
+/**
+ * axp20x_device_probe(): Remove a axp20x device
+ *
+ * @axp20x: axp20x device to remove
+ *
+ * This tells the axp20x core to remove the associated mfd devices
+ */
+int axp20x_device_remove(struct axp20x_dev *axp20x);
+
 #endif /* __LINUX_MFD_AXP20X_H */
-- 
2.6.2

[PATCH v4 2/6] mfd: axp20x: Split the driver into core and i2c bits

[Chen-Yu Tsai]

The axp20x driver assumes the device is i2c based. This is not the
case with later chips, which use a proprietary 2 wire serial bus
by Allwinner called "Reduced Serial Bus".

This patch follows the example of mfd/wm831x and splits it into
an interface independent core, and an i2c specific glue layer.
MFD_AXP20X and the new MFD_AXP20X_I2C are changed to tristate
symbols, allowing the driver to be built as modules.

Included but unused header files are removed as well.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 drivers/mfd/Kconfig        |  14 +++--
 drivers/mfd/Makefile       |   1 +
 drivers/mfd/axp20x-i2c.c   | 127 +++++++++++++++++++++++++++++++++++++++++++++
 drivers/mfd/axp20x.c       | 108 +++++---------------------------------
 include/linux/mfd/axp20x.h |  33 +++++++++++-
 5 files changed, 183 insertions(+), 100 deletions(-)
 create mode 100644 drivers/mfd/axp20x-i2c.c

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 4d92df6ef9fe..804cd3dcce32 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -91,14 +91,18 @@ config MFD_BCM590XX
 	  Support for the BCM590xx PMUs from Broadcom
 
 config MFD_AXP20X
-	bool "X-Powers AXP20X"
+	tristate
 	select MFD_CORE
-	select REGMAP_I2C
 	select REGMAP_IRQ
-	depends on I2C=y
+
+config MFD_AXP20X_I2C
+	tristate "X-Powers AXP series PMICs with I2C"
+	select MFD_AXP20X
+	select REGMAP_I2C
+	depends on I2C
 	help
-	  If you say Y here you get support for the X-Powers AXP202, AXP209 and
-	  AXP288 power management IC (PMIC).
+	  If you say Y here you get support for the X-Powers AXP series power
+	  management ICs (PMICs) controlled with I2C.
 	  This driver include only the core APIs. You have to select individual
 	  components like regulators or the PEK (Power Enable Key) under the
 	  corresponding menus.
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index a8b76b81b467..a6913007d667 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -107,6 +107,7 @@ obj-$(CONFIG_PMIC_DA9052)	+= da9052-core.o
 obj-$(CONFIG_MFD_DA9052_SPI)	+= da9052-spi.o
 obj-$(CONFIG_MFD_DA9052_I2C)	+= da9052-i2c.o
 obj-$(CONFIG_MFD_AXP20X)	+= axp20x.o
+obj-$(CONFIG_MFD_AXP20X_I2C)	+= axp20x-i2c.o
 
 obj-$(CONFIG_MFD_LP3943)	+= lp3943.o
 obj-$(CONFIG_MFD_LP8788)	+= lp8788.o lp8788-irq.o
diff --git a/drivers/mfd/axp20x-i2c.c b/drivers/mfd/axp20x-i2c.c
new file mode 100644
index 000000000000..75b247af2514
--- /dev/null
+++ b/drivers/mfd/axp20x-i2c.c
@@ -0,0 +1,127 @@
+/*
+ * axp20x-i2c.c - I2C driver for the X-Powers' Power Management ICs
+ *
+ * AXP20x typically comprises an adaptive USB-Compatible PWM charger, BUCK DC-DC
+ * converters, LDOs, multiple 12-bit ADCs of voltage, current and temperature
+ * as well as configurable GPIOs.
+ *
+ * This driver supports the I2C variants.
+ *
+ * Author: Carlo Caione <carlo@caione.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/acpi.h>
+#include <linux/err.h>
+#include <linux/i2c.h>
+#include <linux/module.h>
+#include <linux/mfd/axp20x.h>
+#include <linux/of_device.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+
+static const struct of_device_id axp20x_i2c_of_match[] = {
+	{ .compatible = "x-powers,axp152", .data = (void *) AXP152_ID },
+	{ .compatible = "x-powers,axp202", .data = (void *) AXP202_ID },
+	{ .compatible = "x-powers,axp209", .data = (void *) AXP209_ID },
+	{ .compatible = "x-powers,axp221", .data = (void *) AXP221_ID },
+	{ },
+};
+MODULE_DEVICE_TABLE(of, axp20x_i2c_of_match);
+
+/*
+ * This is useless for OF-enabled devices, but it is needed by I2C subsystem
+ */
+static const struct i2c_device_id axp20x_i2c_id[] = {
+	{ },
+};
+MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
+
+static const struct acpi_device_id axp20x_i2c_acpi_match[] = {
+	{
+		.id = "INT33F4",
+		.driver_data = AXP288_ID,
+	},
+	{ },
+};
+MODULE_DEVICE_TABLE(acpi, axp20x_i2c_acpi_match);
+
+static int axp20x_i2c_match_device(struct axp20x_dev *axp20x,
+				   struct device *dev)
+{
+	const struct acpi_device_id *acpi_id;
+	const struct of_device_id *of_id;
+
+	if (dev->of_node) {
+		of_id = of_match_device(axp20x_i2c_of_match, dev);
+		if (!of_id) {
+			dev_err(dev, "Unable to match OF ID\n");
+			return -ENODEV;
+		}
+		axp20x->variant = (long) of_id->data;
+	} else {
+		acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev);
+		if (!acpi_id || !acpi_id->driver_data) {
+			dev_err(dev, "Unable to match ACPI ID and data\n");
+			return -ENODEV;
+		}
+		axp20x->variant = (long) acpi_id->driver_data;
+	}
+
+	return axp20x_match_device(axp20x, dev);
+}
+
+static int axp20x_i2c_probe(struct i2c_client *i2c,
+			    const struct i2c_device_id *id)
+{
+	struct axp20x_dev *axp20x;
+	int ret;
+
+	axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
+	if (!axp20x)
+		return -ENOMEM;
+
+	ret = axp20x_i2c_match_device(axp20x, &i2c->dev);
+	if (ret)
+		return ret;
+
+	axp20x->dev = &i2c->dev;
+	axp20x->irq = i2c->irq;
+	dev_set_drvdata(axp20x->dev, axp20x);
+
+	axp20x->regmap = devm_regmap_init_i2c(i2c, axp20x->regmap_cfg);
+	if (IS_ERR(axp20x->regmap)) {
+		ret = PTR_ERR(axp20x->regmap);
+		dev_err(&i2c->dev, "regmap init failed: %d\n", ret);
+		return ret;
+	}
+
+	return axp20x_device_probe(axp20x);
+}
+
+static int axp20x_i2c_remove(struct i2c_client *i2c)
+{
+	struct axp20x_dev *axp20x = i2c_get_clientdata(i2c);
+
+	return axp20x_device_remove(axp20x);
+}
+
+static struct i2c_driver axp20x_i2c_driver = {
+	.driver = {
+		.name	= "axp20x",
+		.of_match_table	= of_match_ptr(axp20x_i2c_of_match),
+		.acpi_match_table = ACPI_PTR(axp20x_i2c_acpi_match),
+	},
+	.probe		= axp20x_i2c_probe,
+	.remove		= axp20x_i2c_remove,
+	.id_table	= axp20x_i2c_id,
+};
+
+module_i2c_driver(axp20x_i2c_driver);
+
+MODULE_DESCRIPTION("PMIC MFD I2C driver for AXP20X");
+MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
+MODULE_LICENSE("GPL");
diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index 9842199e2e6c..01f139856bf1 100644
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -5,6 +5,8 @@
  * converters, LDOs, multiple 12-bit ADCs of voltage, current and temperature
  * as well as configurable GPIOs.
  *
+ * This file contains the interface independent core functions.
+ *
  * Author: Carlo Caione <carlo@caione.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -13,18 +15,14 @@
  */
 
 #include <linux/err.h>
-#include <linux/i2c.h>
 #include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
-#include <linux/slab.h>
 #include <linux/regulator/consumer.h>
 #include <linux/mfd/axp20x.h>
 #include <linux/mfd/core.h>
-#include <linux/of_device.h>
-#include <linux/of_irq.h>
 #include <linux/acpi.h>
 
 #define AXP20X_OFF	0x80
@@ -376,32 +374,6 @@ static const struct regmap_irq axp288_regmap_irqs[] = {
 	INIT_REGMAP_IRQ(AXP288, BC_USB_CHNG,            5, 1),
 };
 
-static const struct of_device_id axp20x_of_match[] = {
-	{ .compatible = "x-powers,axp152", .data = (void *) AXP152_ID },
-	{ .compatible = "x-powers,axp202", .data = (void *) AXP202_ID },
-	{ .compatible = "x-powers,axp209", .data = (void *) AXP209_ID },
-	{ .compatible = "x-powers,axp221", .data = (void *) AXP221_ID },
-	{ },
-};
-MODULE_DEVICE_TABLE(of, axp20x_of_match);
-
-/*
- * This is useless for OF-enabled devices, but it is needed by I2C subsystem
- */
-static const struct i2c_device_id axp20x_i2c_id[] = {
-	{ },
-};
-MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
-
-static const struct acpi_device_id axp20x_acpi_match[] = {
-	{
-		.id = "INT33F4",
-		.driver_data = AXP288_ID,
-	},
-	{ },
-};
-MODULE_DEVICE_TABLE(acpi, axp20x_acpi_match);
-
 static const struct regmap_irq_chip axp152_regmap_irq_chip = {
 	.name			= "axp152_irq_chip",
 	.status_base		= AXP152_IRQ1_STATE,
@@ -606,27 +578,8 @@ static void axp20x_power_off(void)
 		     AXP20X_OFF);
 }
 
-static int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
+int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
 {
-	const struct acpi_device_id *acpi_id;
-	const struct of_device_id *of_id;
-
-	if (dev->of_node) {
-		of_id = of_match_device(axp20x_of_match, dev);
-		if (!of_id) {
-			dev_err(dev, "Unable to match OF ID\n");
-			return -ENODEV;
-		}
-		axp20x->variant = (long) of_id->data;
-	} else {
-		acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev);
-		if (!acpi_id || !acpi_id->driver_data) {
-			dev_err(dev, "Unable to match ACPI ID and data\n");
-			return -ENODEV;
-		}
-		axp20x->variant = (long) acpi_id->driver_data;
-	}
-
 	switch (axp20x->variant) {
 	case AXP152_ID:
 		axp20x->nr_cells = ARRAY_SIZE(axp152_cells);
@@ -662,38 +615,18 @@ static int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
 
 	return 0;
 }
+EXPORT_SYMBOL(axp20x_match_device);
 
-static int axp20x_i2c_probe(struct i2c_client *i2c,
-			 const struct i2c_device_id *id)
+int axp20x_device_probe(struct axp20x_dev *axp20x)
 {
-	struct axp20x_dev *axp20x;
 	int ret;
 
-	axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
-	if (!axp20x)
-		return -ENOMEM;
-
-	ret = axp20x_match_device(axp20x, &i2c->dev);
-	if (ret)
-		return ret;
-
-	axp20x->i2c_client = i2c;
-	axp20x->dev = &i2c->dev;
-	dev_set_drvdata(axp20x->dev, axp20x);
-
-	axp20x->regmap = devm_regmap_init_i2c(i2c, axp20x->regmap_cfg);
-	if (IS_ERR(axp20x->regmap)) {
-		ret = PTR_ERR(axp20x->regmap);
-		dev_err(&i2c->dev, "regmap init failed: %d\n", ret);
-		return ret;
-	}
-
-	ret = regmap_add_irq_chip(axp20x->regmap, i2c->irq,
+	ret = regmap_add_irq_chip(axp20x->regmap, axp20x->irq,
 				  IRQF_ONESHOT | IRQF_SHARED, -1,
 				  axp20x->regmap_irq_chip,
 				  &axp20x->regmap_irqc);
 	if (ret) {
-		dev_err(&i2c->dev, "failed to add irq chip: %d\n", ret);
+		dev_err(axp20x->dev, "failed to add irq chip: %d\n", ret);
 		return ret;
 	}
 
@@ -701,8 +634,8 @@ static int axp20x_i2c_probe(struct i2c_client *i2c,
 			axp20x->nr_cells, NULL, 0, NULL);
 
 	if (ret) {
-		dev_err(&i2c->dev, "failed to add MFD devices: %d\n", ret);
-		regmap_del_irq_chip(i2c->irq, axp20x->regmap_irqc);
+		dev_err(axp20x->dev, "failed to add MFD devices: %d\n", ret);
+		regmap_del_irq_chip(axp20x->irq, axp20x->regmap_irqc);
 		return ret;
 	}
 
@@ -711,38 +644,25 @@ static int axp20x_i2c_probe(struct i2c_client *i2c,
 		pm_power_off = axp20x_power_off;
 	}
 
-	dev_info(&i2c->dev, "AXP20X driver loaded\n");
+	dev_info(axp20x->dev, "AXP20X driver loaded\n");
 
 	return 0;
 }
+EXPORT_SYMBOL(axp20x_device_probe);
 
-static int axp20x_i2c_remove(struct i2c_client *i2c)
+int axp20x_device_remove(struct axp20x_dev *axp20x)
 {
-	struct axp20x_dev *axp20x = i2c_get_clientdata(i2c);
-
 	if (axp20x == axp20x_pm_power_off) {
 		axp20x_pm_power_off = NULL;
 		pm_power_off = NULL;
 	}
 
 	mfd_remove_devices(axp20x->dev);
-	regmap_del_irq_chip(axp20x->i2c_client->irq, axp20x->regmap_irqc);
+	regmap_del_irq_chip(axp20x->irq, axp20x->regmap_irqc);
 
 	return 0;
 }
-
-static struct i2c_driver axp20x_i2c_driver = {
-	.driver = {
-		.name	= "axp20x",
-		.of_match_table	= of_match_ptr(axp20x_of_match),
-		.acpi_match_table = ACPI_PTR(axp20x_acpi_match),
-	},
-	.probe		= axp20x_i2c_probe,
-	.remove		= axp20x_i2c_remove,
-	.id_table	= axp20x_i2c_id,
-};
-
-module_i2c_driver(axp20x_i2c_driver);
+EXPORT_SYMBOL(axp20x_device_remove);
 
 MODULE_DESCRIPTION("PMIC MFD core driver for AXP20X");
 MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h
index b24c771cebd5..908f97f6e2d7 100644
--- a/include/linux/mfd/axp20x.h
+++ b/include/linux/mfd/axp20x.h
@@ -396,7 +396,7 @@ enum axp288_irqs {
 
 struct axp20x_dev {
 	struct device			*dev;
-	struct i2c_client		*i2c_client;
+	int				irq;
 	struct regmap			*regmap;
 	struct regmap_irq_chip_data	*regmap_irqc;
 	long				variant;
@@ -462,4 +462,35 @@ static inline int axp20x_read_variable_width(struct regmap *regmap,
 	return result;
 }
 
+/**
+ * axp20x_match_device(): Setup axp20x variant related fields
+ *
+ * @axp20x: axp20x device to setup (.variant field must be set)
+ * @dev: device associated with this axp20x device
+ *
+ * This lets the axp20x core configure the mfd cells and register maps
+ * for later use.
+ */
+int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev);
+
+/**
+ * axp20x_device_probe(): Probe a configured axp20x device
+ *
+ * @axp20x: axp20x device to probe (must be configured)
+ *
+ * This function lets the axp20x core register the axp20x mfd devices
+ * and irqchip. The axp20x device passed in must be fully configured
+ * with axp20x_match_device, its irq set, and regmap created.
+ */
+int axp20x_device_probe(struct axp20x_dev *axp20x);
+
+/**
+ * axp20x_device_probe(): Remove a axp20x device
+ *
+ * @axp20x: axp20x device to remove
+ *
+ * This tells the axp20x core to remove the associated mfd devices
+ */
+int axp20x_device_remove(struct axp20x_dev *axp20x);
+
 #endif /* __LINUX_MFD_AXP20X_H */
-- 
2.6.2

[PATCH v4 3/6] mfd: axp20x: Add support for RSB based AXP223 PMIC

[Chen-Yu Tsai]

The AXP223 is a new PMIC commonly paired with Allwinner A23/A33 SoCs.
It is functionally identical to AXP221; only the regulator default
voltage/status and the external host interface are different.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 drivers/mfd/Kconfig        | 11 ++++++
 drivers/mfd/Makefile       |  1 +
 drivers/mfd/axp20x-rsb.c   | 93 ++++++++++++++++++++++++++++++++++++++++++++++
 drivers/mfd/axp20x.c       |  2 +
 include/linux/mfd/axp20x.h |  1 +
 5 files changed, 108 insertions(+)
 create mode 100644 drivers/mfd/axp20x-rsb.c

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 804cd3dcce32..13c565103e96 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -107,6 +107,17 @@ config MFD_AXP20X_I2C
 	  components like regulators or the PEK (Power Enable Key) under the
 	  corresponding menus.
 
+config MFD_AXP20X_RSB
+	tristate "X-Powers AXP series PMICs with RSB"
+	select MFD_AXP20X
+	depends on SUNXI_RSB
+	help
+	  If you say Y here you get support for the X-Powers AXP series power
+	  management ICs (PMICs) controlled with RSB.
+	  This driver include only the core APIs. You have to select individual
+	  components like regulators or the PEK (Power Enable Key) under the
+	  corresponding menus.
+
 config MFD_CROS_EC
 	tristate "ChromeOS Embedded Controller"
 	select MFD_CORE
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index a6913007d667..caea6637d5e8 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -108,6 +108,7 @@ obj-$(CONFIG_MFD_DA9052_SPI)	+= da9052-spi.o
 obj-$(CONFIG_MFD_DA9052_I2C)	+= da9052-i2c.o
 obj-$(CONFIG_MFD_AXP20X)	+= axp20x.o
 obj-$(CONFIG_MFD_AXP20X_I2C)	+= axp20x-i2c.o
+obj-$(CONFIG_MFD_AXP20X_RSB)	+= axp20x-rsb.o
 
 obj-$(CONFIG_MFD_LP3943)	+= lp3943.o
 obj-$(CONFIG_MFD_LP8788)	+= lp8788.o lp8788-irq.o
diff --git a/drivers/mfd/axp20x-rsb.c b/drivers/mfd/axp20x-rsb.c
new file mode 100644
index 000000000000..3ea0d5db37d0
--- /dev/null
+++ b/drivers/mfd/axp20x-rsb.c
@@ -0,0 +1,93 @@
+/*
+ * axp20x-rsb.c - RSB driver for the X-Powers' Power Management ICs
+ *
+ * AXP20x typically comprises an adaptive USB-Compatible PWM charger, BUCK DC-DC
+ * converters, LDOs, multiple 12-bit ADCs of voltage, current and temperature
+ * as well as configurable GPIOs.
+ *
+ * This driver supports the RSB variants.
+ *
+ * Author: Chen-Yu Tsai <wens@csie.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/acpi.h>
+#include <linux/err.h>
+#include <linux/module.h>
+#include <linux/mfd/axp20x.h>
+#include <linux/of_device.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+#include <linux/sunxi-rsb.h>
+
+static const struct of_device_id axp20x_rsb_of_match[] = {
+	{ .compatible = "x-powers,axp223", .data = (void *) AXP223_ID },
+	{ },
+};
+MODULE_DEVICE_TABLE(of, axp20x_rsb_of_match);
+
+static int axp20x_rsb_match_device(struct axp20x_dev *axp20x,
+					 struct device *dev)
+{
+	const struct of_device_id *of_id;
+
+	of_id = of_match_device(axp20x_rsb_of_match, dev);
+	if (!of_id) {
+		dev_err(dev, "Unable to match OF ID\n");
+		return -ENODEV;
+	}
+	axp20x->variant = (long) of_id->data;
+
+	return axp20x_match_device(axp20x, dev);
+}
+
+static int axp20x_rsb_probe(struct sunxi_rsb_device *rdev)
+{
+	struct axp20x_dev *axp20x;
+	int ret;
+
+	axp20x = devm_kzalloc(&rdev->dev, sizeof(*axp20x), GFP_KERNEL);
+	if (!axp20x)
+		return -ENOMEM;
+
+	ret = axp20x_rsb_match_device(axp20x, &rdev->dev);
+	if (ret)
+		return ret;
+
+	axp20x->dev = &rdev->dev;
+	axp20x->irq = rdev->irq;
+	sunxi_rsb_device_set_drvdata(rdev, axp20x);
+
+	axp20x->regmap = devm_regmap_init_sunxi_rsb(rdev, axp20x->regmap_cfg);
+	if (IS_ERR(axp20x->regmap)) {
+		ret = PTR_ERR(axp20x->regmap);
+		dev_err(&rdev->dev, "regmap init failed: %d\n", ret);
+		return ret;
+	}
+
+	return axp20x_device_probe(axp20x);
+}
+
+static int axp20x_rsb_remove(struct sunxi_rsb_device *rdev)
+{
+	struct axp20x_dev *axp20x = sunxi_rsb_device_get_drvdata(rdev);
+
+	return axp20x_device_remove(axp20x);
+}
+
+static struct sunxi_rsb_driver axp20x_rsb_driver = {
+	.driver = {
+		.name	= "axp20x-rsb",
+		.of_match_table	= of_match_ptr(axp20x_rsb_of_match),
+	},
+	.probe	= axp20x_rsb_probe,
+	.remove	= axp20x_rsb_remove,
+};
+module_sunxi_rsb_driver(axp20x_rsb_driver);
+
+MODULE_DESCRIPTION("PMIC MFD sunXi RSB driver for AXP20X");
+MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index 01f139856bf1..8057000da9d6 100644
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -32,6 +32,7 @@ static const char * const axp20x_model_names[] = {
 	"AXP202",
 	"AXP209",
 	"AXP221",
+	"AXP223",
 	"AXP288",
 };
 
@@ -595,6 +596,7 @@ int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
 		axp20x->regmap_irq_chip = &axp20x_regmap_irq_chip;
 		break;
 	case AXP221_ID:
+	case AXP223_ID:
 		axp20x->nr_cells = ARRAY_SIZE(axp22x_cells);
 		axp20x->cells = axp22x_cells;
 		axp20x->regmap_cfg = &axp22x_regmap_config;
diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h
index 908f97f6e2d7..fef8dea18e66 100644
--- a/include/linux/mfd/axp20x.h
+++ b/include/linux/mfd/axp20x.h
@@ -18,6 +18,7 @@ enum {
 	AXP202_ID,
 	AXP209_ID,
 	AXP221_ID,
+	AXP223_ID,
 	AXP288_ID,
 	NR_AXP20X_VARIANTS,
 };
-- 
2.6.2

[PATCH v4 3/6] mfd: axp20x: Add support for RSB based AXP223 PMIC

[Chen-Yu Tsai]

The AXP223 is a new PMIC commonly paired with Allwinner A23/A33 SoCs.
It is functionally identical to AXP221; only the regulator default
voltage/status and the external host interface are different.

Signed-off-by: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>
---
 drivers/mfd/Kconfig        | 11 ++++++
 drivers/mfd/Makefile       |  1 +
 drivers/mfd/axp20x-rsb.c   | 93 ++++++++++++++++++++++++++++++++++++++++++++++
 drivers/mfd/axp20x.c       |  2 +
 include/linux/mfd/axp20x.h |  1 +
 5 files changed, 108 insertions(+)
 create mode 100644 drivers/mfd/axp20x-rsb.c

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 804cd3dcce32..13c565103e96 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -107,6 +107,17 @@ config MFD_AXP20X_I2C
 	  components like regulators or the PEK (Power Enable Key) under the
 	  corresponding menus.
 
+config MFD_AXP20X_RSB
+	tristate "X-Powers AXP series PMICs with RSB"
+	select MFD_AXP20X
+	depends on SUNXI_RSB
+	help
+	  If you say Y here you get support for the X-Powers AXP series power
+	  management ICs (PMICs) controlled with RSB.
+	  This driver include only the core APIs. You have to select individual
+	  components like regulators or the PEK (Power Enable Key) under the
+	  corresponding menus.
+
 config MFD_CROS_EC
 	tristate "ChromeOS Embedded Controller"
 	select MFD_CORE
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index a6913007d667..caea6637d5e8 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -108,6 +108,7 @@ obj-$(CONFIG_MFD_DA9052_SPI)	+= da9052-spi.o
 obj-$(CONFIG_MFD_DA9052_I2C)	+= da9052-i2c.o
 obj-$(CONFIG_MFD_AXP20X)	+= axp20x.o
 obj-$(CONFIG_MFD_AXP20X_I2C)	+= axp20x-i2c.o
+obj-$(CONFIG_MFD_AXP20X_RSB)	+= axp20x-rsb.o
 
 obj-$(CONFIG_MFD_LP3943)	+= lp3943.o
 obj-$(CONFIG_MFD_LP8788)	+= lp8788.o lp8788-irq.o
diff --git a/drivers/mfd/axp20x-rsb.c b/drivers/mfd/axp20x-rsb.c
new file mode 100644
index 000000000000..3ea0d5db37d0
--- /dev/null
+++ b/drivers/mfd/axp20x-rsb.c
@@ -0,0 +1,93 @@
+/*
+ * axp20x-rsb.c - RSB driver for the X-Powers' Power Management ICs
+ *
+ * AXP20x typically comprises an adaptive USB-Compatible PWM charger, BUCK DC-DC
+ * converters, LDOs, multiple 12-bit ADCs of voltage, current and temperature
+ * as well as configurable GPIOs.
+ *
+ * This driver supports the RSB variants.
+ *
+ * Author: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/acpi.h>
+#include <linux/err.h>
+#include <linux/module.h>
+#include <linux/mfd/axp20x.h>
+#include <linux/of_device.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+#include <linux/sunxi-rsb.h>
+
+static const struct of_device_id axp20x_rsb_of_match[] = {
+	{ .compatible = "x-powers,axp223", .data = (void *) AXP223_ID },
+	{ },
+};
+MODULE_DEVICE_TABLE(of, axp20x_rsb_of_match);
+
+static int axp20x_rsb_match_device(struct axp20x_dev *axp20x,
+					 struct device *dev)
+{
+	const struct of_device_id *of_id;
+
+	of_id = of_match_device(axp20x_rsb_of_match, dev);
+	if (!of_id) {
+		dev_err(dev, "Unable to match OF ID\n");
+		return -ENODEV;
+	}
+	axp20x->variant = (long) of_id->data;
+
+	return axp20x_match_device(axp20x, dev);
+}
+
+static int axp20x_rsb_probe(struct sunxi_rsb_device *rdev)
+{
+	struct axp20x_dev *axp20x;
+	int ret;
+
+	axp20x = devm_kzalloc(&rdev->dev, sizeof(*axp20x), GFP_KERNEL);
+	if (!axp20x)
+		return -ENOMEM;
+
+	ret = axp20x_rsb_match_device(axp20x, &rdev->dev);
+	if (ret)
+		return ret;
+
+	axp20x->dev = &rdev->dev;
+	axp20x->irq = rdev->irq;
+	sunxi_rsb_device_set_drvdata(rdev, axp20x);
+
+	axp20x->regmap = devm_regmap_init_sunxi_rsb(rdev, axp20x->regmap_cfg);
+	if (IS_ERR(axp20x->regmap)) {
+		ret = PTR_ERR(axp20x->regmap);
+		dev_err(&rdev->dev, "regmap init failed: %d\n", ret);
+		return ret;
+	}
+
+	return axp20x_device_probe(axp20x);
+}
+
+static int axp20x_rsb_remove(struct sunxi_rsb_device *rdev)
+{
+	struct axp20x_dev *axp20x = sunxi_rsb_device_get_drvdata(rdev);
+
+	return axp20x_device_remove(axp20x);
+}
+
+static struct sunxi_rsb_driver axp20x_rsb_driver = {
+	.driver = {
+		.name	= "axp20x-rsb",
+		.of_match_table	= of_match_ptr(axp20x_rsb_of_match),
+	},
+	.probe	= axp20x_rsb_probe,
+	.remove	= axp20x_rsb_remove,
+};
+module_sunxi_rsb_driver(axp20x_rsb_driver);
+
+MODULE_DESCRIPTION("PMIC MFD sunXi RSB driver for AXP20X");
+MODULE_AUTHOR("Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index 01f139856bf1..8057000da9d6 100644
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -32,6 +32,7 @@ static const char * const axp20x_model_names[] = {
 	"AXP202",
 	"AXP209",
 	"AXP221",
+	"AXP223",
 	"AXP288",
 };
 
@@ -595,6 +596,7 @@ int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
 		axp20x->regmap_irq_chip = &axp20x_regmap_irq_chip;
 		break;
 	case AXP221_ID:
+	case AXP223_ID:
 		axp20x->nr_cells = ARRAY_SIZE(axp22x_cells);
 		axp20x->cells = axp22x_cells;
 		axp20x->regmap_cfg = &axp22x_regmap_config;
diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h
index 908f97f6e2d7..fef8dea18e66 100644
--- a/include/linux/mfd/axp20x.h
+++ b/include/linux/mfd/axp20x.h
@@ -18,6 +18,7 @@ enum {
 	AXP202_ID,
 	AXP209_ID,
 	AXP221_ID,
+	AXP223_ID,
 	AXP288_ID,
 	NR_AXP20X_VARIANTS,
 };
-- 
2.6.2

[PATCH v4 3/6] mfd: axp20x: Add support for RSB based AXP223 PMIC

[Chen-Yu Tsai]

The AXP223 is a new PMIC commonly paired with Allwinner A23/A33 SoCs.
It is functionally identical to AXP221; only the regulator default
voltage/status and the external host interface are different.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 drivers/mfd/Kconfig        | 11 ++++++
 drivers/mfd/Makefile       |  1 +
 drivers/mfd/axp20x-rsb.c   | 93 ++++++++++++++++++++++++++++++++++++++++++++++
 drivers/mfd/axp20x.c       |  2 +
 include/linux/mfd/axp20x.h |  1 +
 5 files changed, 108 insertions(+)
 create mode 100644 drivers/mfd/axp20x-rsb.c

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 804cd3dcce32..13c565103e96 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -107,6 +107,17 @@ config MFD_AXP20X_I2C
 	  components like regulators or the PEK (Power Enable Key) under the
 	  corresponding menus.
 
+config MFD_AXP20X_RSB
+	tristate "X-Powers AXP series PMICs with RSB"
+	select MFD_AXP20X
+	depends on SUNXI_RSB
+	help
+	  If you say Y here you get support for the X-Powers AXP series power
+	  management ICs (PMICs) controlled with RSB.
+	  This driver include only the core APIs. You have to select individual
+	  components like regulators or the PEK (Power Enable Key) under the
+	  corresponding menus.
+
 config MFD_CROS_EC
 	tristate "ChromeOS Embedded Controller"
 	select MFD_CORE
diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index a6913007d667..caea6637d5e8 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -108,6 +108,7 @@ obj-$(CONFIG_MFD_DA9052_SPI)	+= da9052-spi.o
 obj-$(CONFIG_MFD_DA9052_I2C)	+= da9052-i2c.o
 obj-$(CONFIG_MFD_AXP20X)	+= axp20x.o
 obj-$(CONFIG_MFD_AXP20X_I2C)	+= axp20x-i2c.o
+obj-$(CONFIG_MFD_AXP20X_RSB)	+= axp20x-rsb.o
 
 obj-$(CONFIG_MFD_LP3943)	+= lp3943.o
 obj-$(CONFIG_MFD_LP8788)	+= lp8788.o lp8788-irq.o
diff --git a/drivers/mfd/axp20x-rsb.c b/drivers/mfd/axp20x-rsb.c
new file mode 100644
index 000000000000..3ea0d5db37d0
--- /dev/null
+++ b/drivers/mfd/axp20x-rsb.c
@@ -0,0 +1,93 @@
+/*
+ * axp20x-rsb.c - RSB driver for the X-Powers' Power Management ICs
+ *
+ * AXP20x typically comprises an adaptive USB-Compatible PWM charger, BUCK DC-DC
+ * converters, LDOs, multiple 12-bit ADCs of voltage, current and temperature
+ * as well as configurable GPIOs.
+ *
+ * This driver supports the RSB variants.
+ *
+ * Author: Chen-Yu Tsai <wens@csie.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/acpi.h>
+#include <linux/err.h>
+#include <linux/module.h>
+#include <linux/mfd/axp20x.h>
+#include <linux/of_device.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+#include <linux/sunxi-rsb.h>
+
+static const struct of_device_id axp20x_rsb_of_match[] = {
+	{ .compatible = "x-powers,axp223", .data = (void *) AXP223_ID },
+	{ },
+};
+MODULE_DEVICE_TABLE(of, axp20x_rsb_of_match);
+
+static int axp20x_rsb_match_device(struct axp20x_dev *axp20x,
+					 struct device *dev)
+{
+	const struct of_device_id *of_id;
+
+	of_id = of_match_device(axp20x_rsb_of_match, dev);
+	if (!of_id) {
+		dev_err(dev, "Unable to match OF ID\n");
+		return -ENODEV;
+	}
+	axp20x->variant = (long) of_id->data;
+
+	return axp20x_match_device(axp20x, dev);
+}
+
+static int axp20x_rsb_probe(struct sunxi_rsb_device *rdev)
+{
+	struct axp20x_dev *axp20x;
+	int ret;
+
+	axp20x = devm_kzalloc(&rdev->dev, sizeof(*axp20x), GFP_KERNEL);
+	if (!axp20x)
+		return -ENOMEM;
+
+	ret = axp20x_rsb_match_device(axp20x, &rdev->dev);
+	if (ret)
+		return ret;
+
+	axp20x->dev = &rdev->dev;
+	axp20x->irq = rdev->irq;
+	sunxi_rsb_device_set_drvdata(rdev, axp20x);
+
+	axp20x->regmap = devm_regmap_init_sunxi_rsb(rdev, axp20x->regmap_cfg);
+	if (IS_ERR(axp20x->regmap)) {
+		ret = PTR_ERR(axp20x->regmap);
+		dev_err(&rdev->dev, "regmap init failed: %d\n", ret);
+		return ret;
+	}
+
+	return axp20x_device_probe(axp20x);
+}
+
+static int axp20x_rsb_remove(struct sunxi_rsb_device *rdev)
+{
+	struct axp20x_dev *axp20x = sunxi_rsb_device_get_drvdata(rdev);
+
+	return axp20x_device_remove(axp20x);
+}
+
+static struct sunxi_rsb_driver axp20x_rsb_driver = {
+	.driver = {
+		.name	= "axp20x-rsb",
+		.of_match_table	= of_match_ptr(axp20x_rsb_of_match),
+	},
+	.probe	= axp20x_rsb_probe,
+	.remove	= axp20x_rsb_remove,
+};
+module_sunxi_rsb_driver(axp20x_rsb_driver);
+
+MODULE_DESCRIPTION("PMIC MFD sunXi RSB driver for AXP20X");
+MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
+MODULE_LICENSE("GPL v2");
diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index 01f139856bf1..8057000da9d6 100644
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -32,6 +32,7 @@ static const char * const axp20x_model_names[] = {
 	"AXP202",
 	"AXP209",
 	"AXP221",
+	"AXP223",
 	"AXP288",
 };
 
@@ -595,6 +596,7 @@ int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
 		axp20x->regmap_irq_chip = &axp20x_regmap_irq_chip;
 		break;
 	case AXP221_ID:
+	case AXP223_ID:
 		axp20x->nr_cells = ARRAY_SIZE(axp22x_cells);
 		axp20x->cells = axp22x_cells;
 		axp20x->regmap_cfg = &axp22x_regmap_config;
diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h
index 908f97f6e2d7..fef8dea18e66 100644
--- a/include/linux/mfd/axp20x.h
+++ b/include/linux/mfd/axp20x.h
@@ -18,6 +18,7 @@ enum {
 	AXP202_ID,
 	AXP209_ID,
 	AXP221_ID,
+	AXP223_ID,
 	AXP288_ID,
 	NR_AXP20X_VARIANTS,
 };
-- 
2.6.2

[PATCH v4 4/6] regulator: axp20x: Support new AXP223 PMIC

[Chen-Yu Tsai]

The AXP223 is a new PMIC commonly paired with Allwinner A23/A33 SoCs.
It is functionally identical to AXP221; only the regulator default
voltage/status and the external host interface are different.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Reviewed-by: Mark Brown <broonie@kernel.org>
---
 drivers/regulator/axp20x-regulator.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c
index 35de22fdb7a0..55cce8125716 100644
--- a/drivers/regulator/axp20x-regulator.c
+++ b/drivers/regulator/axp20x-regulator.c
@@ -244,6 +244,7 @@ static int axp20x_set_dcdc_freq(struct platform_device *pdev, u32 dcdcfreq)
 		step = 75;
 		break;
 	case AXP221_ID:
+	case AXP223_ID:
 		min = 1800;
 		max = 4050;
 		def = 3000;
@@ -322,6 +323,7 @@ static int axp20x_set_dcdc_workmode(struct regulator_dev *rdev, int id, u32 work
 		break;
 
 	case AXP221_ID:
+	case AXP223_ID:
 		if (id < AXP22X_DCDC1 || id > AXP22X_DCDC5)
 			return -EINVAL;
 
@@ -360,6 +362,7 @@ static int axp20x_regulator_probe(struct platform_device *pdev)
 		nregulators = AXP20X_REG_ID_MAX;
 		break;
 	case AXP221_ID:
+	case AXP223_ID:
 		regulators = axp22x_regulators;
 		nregulators = AXP22X_REG_ID_MAX;
 		break;
-- 
2.6.2

[PATCH v4 4/6] regulator: axp20x: Support new AXP223 PMIC

[Chen-Yu Tsai]

The AXP223 is a new PMIC commonly paired with Allwinner A23/A33 SoCs.
It is functionally identical to AXP221; only the regulator default
voltage/status and the external host interface are different.

Signed-off-by: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>
Reviewed-by: Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
---
 drivers/regulator/axp20x-regulator.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c
index 35de22fdb7a0..55cce8125716 100644
--- a/drivers/regulator/axp20x-regulator.c
+++ b/drivers/regulator/axp20x-regulator.c
@@ -244,6 +244,7 @@ static int axp20x_set_dcdc_freq(struct platform_device *pdev, u32 dcdcfreq)
 		step = 75;
 		break;
 	case AXP221_ID:
+	case AXP223_ID:
 		min = 1800;
 		max = 4050;
 		def = 3000;
@@ -322,6 +323,7 @@ static int axp20x_set_dcdc_workmode(struct regulator_dev *rdev, int id, u32 work
 		break;
 
 	case AXP221_ID:
+	case AXP223_ID:
 		if (id < AXP22X_DCDC1 || id > AXP22X_DCDC5)
 			return -EINVAL;
 
@@ -360,6 +362,7 @@ static int axp20x_regulator_probe(struct platform_device *pdev)
 		nregulators = AXP20X_REG_ID_MAX;
 		break;
 	case AXP221_ID:
+	case AXP223_ID:
 		regulators = axp22x_regulators;
 		nregulators = AXP22X_REG_ID_MAX;
 		break;
-- 
2.6.2

[PATCH v4 4/6] regulator: axp20x: Support new AXP223 PMIC

[Chen-Yu Tsai]

The AXP223 is a new PMIC commonly paired with Allwinner A23/A33 SoCs.
It is functionally identical to AXP221; only the regulator default
voltage/status and the external host interface are different.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Reviewed-by: Mark Brown <broonie@kernel.org>
---
 drivers/regulator/axp20x-regulator.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c
index 35de22fdb7a0..55cce8125716 100644
--- a/drivers/regulator/axp20x-regulator.c
+++ b/drivers/regulator/axp20x-regulator.c
@@ -244,6 +244,7 @@ static int axp20x_set_dcdc_freq(struct platform_device *pdev, u32 dcdcfreq)
 		step = 75;
 		break;
 	case AXP221_ID:
+	case AXP223_ID:
 		min = 1800;
 		max = 4050;
 		def = 3000;
@@ -322,6 +323,7 @@ static int axp20x_set_dcdc_workmode(struct regulator_dev *rdev, int id, u32 work
 		break;
 
 	case AXP221_ID:
+	case AXP223_ID:
 		if (id < AXP22X_DCDC1 || id > AXP22X_DCDC5)
 			return -EINVAL;
 
@@ -360,6 +362,7 @@ static int axp20x_regulator_probe(struct platform_device *pdev)
 		nregulators = AXP20X_REG_ID_MAX;
 		break;
 	case AXP221_ID:
+	case AXP223_ID:
 		regulators = axp22x_regulators;
 		nregulators = AXP22X_REG_ID_MAX;
 		break;
-- 
2.6.2

[PATCH v4 5/6] ARM: dts: sun8i: sinlinx-sina33: Add AXP223 PMIC device and regulator nodes

[Chen-Yu Tsai]

This board has a X-Powers AXP223 PMIC connected via RSB. Its regulators
provide power to various parts of the SoC and the board.

Also update the regulator supply phandles.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 79 +++++++++++++++++++++++++-
 1 file changed, 76 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
index 13ce68f06dd6..91a0fde47fdd 100644
--- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
+++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
@@ -68,7 +68,7 @@
 };
 
 &lradc {
-	vref-supply = <&reg_vcc3v0>;
+	vref-supply = <&reg_dcdc1>;
 	status = "okay";
 
 	button@200 {
@@ -96,7 +96,7 @@
 &mmc0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_sina33>;
-	vmmc-supply = <&reg_vcc3v0>;
+	vmmc-supply = <&reg_dcdc1>;
 	bus-width = <4>;
 	cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */
 	cd-inverted;
@@ -106,7 +106,7 @@
 &mmc2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc2_8bit_pins>;
-	vmmc-supply = <&reg_vcc3v0>;
+	vmmc-supply = <&reg_dcdc1>;
 	bus-width = <8>;
 	non-removable;
 	status = "okay";
@@ -132,6 +132,79 @@
 
 &r_rsb {
 	status = "okay";
+
+	axp22x: pmic@3e3 {
+		compatible = "x-powers,axp223";
+		reg = <0x3e3>;
+		interrupt-parent = <&nmi_intc>;
+		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+		eldoin-supply = <&reg_dcdc1>;
+	};
+};
+
+#include "axp22x.dtsi"
+
+&reg_aldo1 {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-io";
+};
+
+&reg_aldo2 {
+	regulator-always-on;
+	regulator-min-microvolt = <2350000>;
+	regulator-max-microvolt = <2650000>;
+	regulator-name = "vdd-dll";
+};
+
+&reg_aldo3 {
+	regulator-always-on;
+	regulator-min-microvolt = <2700000>;
+	regulator-max-microvolt = <3300000>;
+	regulator-name = "vcc-pll-avcc";
+};
+
+&reg_dc5ldo {
+	regulator-always-on;
+	regulator-min-microvolt = <900000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-cpus";
+};
+
+&reg_dcdc1 {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-3v0";
+};
+
+&reg_dcdc2 {
+	regulator-always-on;
+	regulator-min-microvolt = <900000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-sys";
+};
+
+&reg_dcdc3 {
+	regulator-always-on;
+	regulator-min-microvolt = <900000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-cpu";
+};
+
+&reg_dcdc5 {
+	regulator-always-on;
+	regulator-min-microvolt = <1500000>;
+	regulator-max-microvolt = <1500000>;
+	regulator-name = "vcc-dram";
+};
+
+&reg_rtc_ldo {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-rtc";
 };
 
 &uart0 {
-- 
2.6.2

[PATCH v4 5/6] ARM: dts: sun8i: sinlinx-sina33: Add AXP223 PMIC device and regulator nodes

[Chen-Yu Tsai]

This board has a X-Powers AXP223 PMIC connected via RSB. Its regulators
provide power to various parts of the SoC and the board.

Also update the regulator supply phandles.

Signed-off-by: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>
---
 arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 79 +++++++++++++++++++++++++-
 1 file changed, 76 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
index 13ce68f06dd6..91a0fde47fdd 100644
--- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
+++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
@@ -68,7 +68,7 @@
 };
 
 &lradc {
-	vref-supply = <&reg_vcc3v0>;
+	vref-supply = <&reg_dcdc1>;
 	status = "okay";
 
 	button@200 {
@@ -96,7 +96,7 @@
 &mmc0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_sina33>;
-	vmmc-supply = <&reg_vcc3v0>;
+	vmmc-supply = <&reg_dcdc1>;
 	bus-width = <4>;
 	cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */
 	cd-inverted;
@@ -106,7 +106,7 @@
 &mmc2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc2_8bit_pins>;
-	vmmc-supply = <&reg_vcc3v0>;
+	vmmc-supply = <&reg_dcdc1>;
 	bus-width = <8>;
 	non-removable;
 	status = "okay";
@@ -132,6 +132,79 @@
 
 &r_rsb {
 	status = "okay";
+
+	axp22x: pmic@3e3 {
+		compatible = "x-powers,axp223";
+		reg = <0x3e3>;
+		interrupt-parent = <&nmi_intc>;
+		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+		eldoin-supply = <&reg_dcdc1>;
+	};
+};
+
+#include "axp22x.dtsi"
+
+&reg_aldo1 {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-io";
+};
+
+&reg_aldo2 {
+	regulator-always-on;
+	regulator-min-microvolt = <2350000>;
+	regulator-max-microvolt = <2650000>;
+	regulator-name = "vdd-dll";
+};
+
+&reg_aldo3 {
+	regulator-always-on;
+	regulator-min-microvolt = <2700000>;
+	regulator-max-microvolt = <3300000>;
+	regulator-name = "vcc-pll-avcc";
+};
+
+&reg_dc5ldo {
+	regulator-always-on;
+	regulator-min-microvolt = <900000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-cpus";
+};
+
+&reg_dcdc1 {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-3v0";
+};
+
+&reg_dcdc2 {
+	regulator-always-on;
+	regulator-min-microvolt = <900000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-sys";
+};
+
+&reg_dcdc3 {
+	regulator-always-on;
+	regulator-min-microvolt = <900000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-cpu";
+};
+
+&reg_dcdc5 {
+	regulator-always-on;
+	regulator-min-microvolt = <1500000>;
+	regulator-max-microvolt = <1500000>;
+	regulator-name = "vcc-dram";
+};
+
+&reg_rtc_ldo {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-rtc";
 };
 
 &uart0 {
-- 
2.6.2

[PATCH v4 5/6] ARM: dts: sun8i: sinlinx-sina33: Add AXP223 PMIC device and regulator nodes

[Chen-Yu Tsai]

This board has a X-Powers AXP223 PMIC connected via RSB. Its regulators
provide power to various parts of the SoC and the board.

Also update the regulator supply phandles.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts | 79 +++++++++++++++++++++++++-
 1 file changed, 76 insertions(+), 3 deletions(-)

diff --git a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
index 13ce68f06dd6..91a0fde47fdd 100644
--- a/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
+++ b/arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
@@ -68,7 +68,7 @@
 };
 
 &lradc {
-	vref-supply = <&reg_vcc3v0>;
+	vref-supply = <&reg_dcdc1>;
 	status = "okay";
 
 	button at 200 {
@@ -96,7 +96,7 @@
 &mmc0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_sina33>;
-	vmmc-supply = <&reg_vcc3v0>;
+	vmmc-supply = <&reg_dcdc1>;
 	bus-width = <4>;
 	cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */
 	cd-inverted;
@@ -106,7 +106,7 @@
 &mmc2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc2_8bit_pins>;
-	vmmc-supply = <&reg_vcc3v0>;
+	vmmc-supply = <&reg_dcdc1>;
 	bus-width = <8>;
 	non-removable;
 	status = "okay";
@@ -132,6 +132,79 @@
 
 &r_rsb {
 	status = "okay";
+
+	axp22x: pmic at 3e3 {
+		compatible = "x-powers,axp223";
+		reg = <0x3e3>;
+		interrupt-parent = <&nmi_intc>;
+		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+		eldoin-supply = <&reg_dcdc1>;
+	};
+};
+
+#include "axp22x.dtsi"
+
+&reg_aldo1 {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-io";
+};
+
+&reg_aldo2 {
+	regulator-always-on;
+	regulator-min-microvolt = <2350000>;
+	regulator-max-microvolt = <2650000>;
+	regulator-name = "vdd-dll";
+};
+
+&reg_aldo3 {
+	regulator-always-on;
+	regulator-min-microvolt = <2700000>;
+	regulator-max-microvolt = <3300000>;
+	regulator-name = "vcc-pll-avcc";
+};
+
+&reg_dc5ldo {
+	regulator-always-on;
+	regulator-min-microvolt = <900000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-cpus";
+};
+
+&reg_dcdc1 {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-3v0";
+};
+
+&reg_dcdc2 {
+	regulator-always-on;
+	regulator-min-microvolt = <900000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-sys";
+};
+
+&reg_dcdc3 {
+	regulator-always-on;
+	regulator-min-microvolt = <900000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-cpu";
+};
+
+&reg_dcdc5 {
+	regulator-always-on;
+	regulator-min-microvolt = <1500000>;
+	regulator-max-microvolt = <1500000>;
+	regulator-name = "vcc-dram";
+};
+
+&reg_rtc_ldo {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-rtc";
 };
 
 &uart0 {
-- 
2.6.2

[PATCH v4 6/6] ARM: dts: sun8i: q8-common: Add AXP223 PMIC device and regulator nodes

[Chen-Yu Tsai]

A23/A33 Q8 tablets have an X-Powers AXP223 PMIC connected via RSB. Its
regulators provide power to various parts of the SoC and the board.

Also add lcd regulator supply for simplefb and update the existing
vmmc-supply for mmc0.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 arch/arm/boot/dts/sun8i-q8-common.dtsi | 86 +++++++++++++++++++++++++++++++++-
 1 file changed, 84 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/sun8i-q8-common.dtsi b/arch/arm/boot/dts/sun8i-q8-common.dtsi
index 1a69231d2da5..01ab47b32d8d 100644
--- a/arch/arm/boot/dts/sun8i-q8-common.dtsi
+++ b/arch/arm/boot/dts/sun8i-q8-common.dtsi
@@ -56,7 +56,6 @@
 		brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;
 		default-brightness-level = <8>;
 		enable-gpios = <&pio 7 6 GPIO_ACTIVE_HIGH>; /* PH6 */
-		/* backlight is powered by AXP223 DC1SW */
 	};
 
 	chosen {
@@ -67,7 +66,7 @@
 &mmc0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_q8>;
-	vmmc-supply = <&reg_vcc3v0>;
+	vmmc-supply = <&reg_dcdc1>;
 	bus-width = <4>;
 	cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */
 	cd-inverted;
@@ -92,6 +91,85 @@
 
 &r_rsb {
 	status = "okay";
+
+	axp22x: pmic@3e3 {
+		compatible = "x-powers,axp223";
+		reg = <0x3e3>;
+		interrupt-parent = <&nmi_intc>;
+		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+		eldoin-supply = <&reg_dcdc1>;
+	};
+};
+
+#include "axp22x.dtsi"
+
+&reg_aldo1 {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-io";
+};
+
+&reg_aldo2 {
+	regulator-always-on;
+	regulator-min-microvolt = <2350000>;
+	regulator-max-microvolt = <2650000>;
+	regulator-name = "vdd-dll";
+};
+
+&reg_aldo3 {
+	regulator-always-on;
+	regulator-min-microvolt = <2700000>;
+	regulator-max-microvolt = <3300000>;
+	regulator-name = "vcc-pll-avcc";
+};
+
+&reg_dc1sw {
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-lcd";
+};
+
+&reg_dc5ldo {
+	regulator-always-on;
+	regulator-min-microvolt = <900000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-cpus";
+};
+
+&reg_dcdc1 {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-3v0";
+};
+
+&reg_dcdc2 {
+	regulator-always-on;
+	regulator-min-microvolt = <900000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-sys";
+};
+
+&reg_dcdc3 {
+	regulator-always-on;
+	regulator-min-microvolt = <900000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-cpu";
+};
+
+&reg_dcdc5 {
+	regulator-always-on;
+	regulator-min-microvolt = <1500000>;
+	regulator-max-microvolt = <1500000>;
+	regulator-name = "vcc-dram";
+};
+
+&reg_rtc_ldo {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-rtc";
 };
 
 &r_uart {
@@ -99,3 +177,7 @@
 	pinctrl-0 = <&r_uart_pins_a>;
 	status = "okay";
 };
+
+&simplefb_lcd {
+	vcc-lcd-supply = <&reg_dc1sw>;
+};
-- 
2.6.2

[PATCH v4 6/6] ARM: dts: sun8i: q8-common: Add AXP223 PMIC device and regulator nodes

[Chen-Yu Tsai]

A23/A33 Q8 tablets have an X-Powers AXP223 PMIC connected via RSB. Its
regulators provide power to various parts of the SoC and the board.

Also add lcd regulator supply for simplefb and update the existing
vmmc-supply for mmc0.

Signed-off-by: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>
---
 arch/arm/boot/dts/sun8i-q8-common.dtsi | 86 +++++++++++++++++++++++++++++++++-
 1 file changed, 84 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/sun8i-q8-common.dtsi b/arch/arm/boot/dts/sun8i-q8-common.dtsi
index 1a69231d2da5..01ab47b32d8d 100644
--- a/arch/arm/boot/dts/sun8i-q8-common.dtsi
+++ b/arch/arm/boot/dts/sun8i-q8-common.dtsi
@@ -56,7 +56,6 @@
 		brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;
 		default-brightness-level = <8>;
 		enable-gpios = <&pio 7 6 GPIO_ACTIVE_HIGH>; /* PH6 */
-		/* backlight is powered by AXP223 DC1SW */
 	};
 
 	chosen {
@@ -67,7 +66,7 @@
 &mmc0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_q8>;
-	vmmc-supply = <&reg_vcc3v0>;
+	vmmc-supply = <&reg_dcdc1>;
 	bus-width = <4>;
 	cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */
 	cd-inverted;
@@ -92,6 +91,85 @@
 
 &r_rsb {
 	status = "okay";
+
+	axp22x: pmic@3e3 {
+		compatible = "x-powers,axp223";
+		reg = <0x3e3>;
+		interrupt-parent = <&nmi_intc>;
+		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+		eldoin-supply = <&reg_dcdc1>;
+	};
+};
+
+#include "axp22x.dtsi"
+
+&reg_aldo1 {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-io";
+};
+
+&reg_aldo2 {
+	regulator-always-on;
+	regulator-min-microvolt = <2350000>;
+	regulator-max-microvolt = <2650000>;
+	regulator-name = "vdd-dll";
+};
+
+&reg_aldo3 {
+	regulator-always-on;
+	regulator-min-microvolt = <2700000>;
+	regulator-max-microvolt = <3300000>;
+	regulator-name = "vcc-pll-avcc";
+};
+
+&reg_dc1sw {
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-lcd";
+};
+
+&reg_dc5ldo {
+	regulator-always-on;
+	regulator-min-microvolt = <900000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-cpus";
+};
+
+&reg_dcdc1 {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-3v0";
+};
+
+&reg_dcdc2 {
+	regulator-always-on;
+	regulator-min-microvolt = <900000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-sys";
+};
+
+&reg_dcdc3 {
+	regulator-always-on;
+	regulator-min-microvolt = <900000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-cpu";
+};
+
+&reg_dcdc5 {
+	regulator-always-on;
+	regulator-min-microvolt = <1500000>;
+	regulator-max-microvolt = <1500000>;
+	regulator-name = "vcc-dram";
+};
+
+&reg_rtc_ldo {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-rtc";
 };
 
 &r_uart {
@@ -99,3 +177,7 @@
 	pinctrl-0 = <&r_uart_pins_a>;
 	status = "okay";
 };
+
+&simplefb_lcd {
+	vcc-lcd-supply = <&reg_dc1sw>;
+};
-- 
2.6.2

[PATCH v4 6/6] ARM: dts: sun8i: q8-common: Add AXP223 PMIC device and regulator nodes

[Chen-Yu Tsai]

A23/A33 Q8 tablets have an X-Powers AXP223 PMIC connected via RSB. Its
regulators provide power to various parts of the SoC and the board.

Also add lcd regulator supply for simplefb and update the existing
vmmc-supply for mmc0.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
---
 arch/arm/boot/dts/sun8i-q8-common.dtsi | 86 +++++++++++++++++++++++++++++++++-
 1 file changed, 84 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/sun8i-q8-common.dtsi b/arch/arm/boot/dts/sun8i-q8-common.dtsi
index 1a69231d2da5..01ab47b32d8d 100644
--- a/arch/arm/boot/dts/sun8i-q8-common.dtsi
+++ b/arch/arm/boot/dts/sun8i-q8-common.dtsi
@@ -56,7 +56,6 @@
 		brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;
 		default-brightness-level = <8>;
 		enable-gpios = <&pio 7 6 GPIO_ACTIVE_HIGH>; /* PH6 */
-		/* backlight is powered by AXP223 DC1SW */
 	};
 
 	chosen {
@@ -67,7 +66,7 @@
 &mmc0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_q8>;
-	vmmc-supply = <&reg_vcc3v0>;
+	vmmc-supply = <&reg_dcdc1>;
 	bus-width = <4>;
 	cd-gpios = <&pio 1 4 GPIO_ACTIVE_HIGH>; /* PB4 */
 	cd-inverted;
@@ -92,6 +91,85 @@
 
 &r_rsb {
 	status = "okay";
+
+	axp22x: pmic at 3e3 {
+		compatible = "x-powers,axp223";
+		reg = <0x3e3>;
+		interrupt-parent = <&nmi_intc>;
+		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
+		eldoin-supply = <&reg_dcdc1>;
+	};
+};
+
+#include "axp22x.dtsi"
+
+&reg_aldo1 {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-io";
+};
+
+&reg_aldo2 {
+	regulator-always-on;
+	regulator-min-microvolt = <2350000>;
+	regulator-max-microvolt = <2650000>;
+	regulator-name = "vdd-dll";
+};
+
+&reg_aldo3 {
+	regulator-always-on;
+	regulator-min-microvolt = <2700000>;
+	regulator-max-microvolt = <3300000>;
+	regulator-name = "vcc-pll-avcc";
+};
+
+&reg_dc1sw {
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-lcd";
+};
+
+&reg_dc5ldo {
+	regulator-always-on;
+	regulator-min-microvolt = <900000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-cpus";
+};
+
+&reg_dcdc1 {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-3v0";
+};
+
+&reg_dcdc2 {
+	regulator-always-on;
+	regulator-min-microvolt = <900000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-sys";
+};
+
+&reg_dcdc3 {
+	regulator-always-on;
+	regulator-min-microvolt = <900000>;
+	regulator-max-microvolt = <1400000>;
+	regulator-name = "vdd-cpu";
+};
+
+&reg_dcdc5 {
+	regulator-always-on;
+	regulator-min-microvolt = <1500000>;
+	regulator-max-microvolt = <1500000>;
+	regulator-name = "vcc-dram";
+};
+
+&reg_rtc_ldo {
+	regulator-always-on;
+	regulator-min-microvolt = <3000000>;
+	regulator-max-microvolt = <3000000>;
+	regulator-name = "vcc-rtc";
 };
 
 &r_uart {
@@ -99,3 +177,7 @@
 	pinctrl-0 = <&r_uart_pins_a>;
 	status = "okay";
 };
+
+&simplefb_lcd {
+	vcc-lcd-supply = <&reg_dc1sw>;
+};
-- 
2.6.2

Re: [PATCH v4 2/6] mfd: axp20x: Split the driver into core and i2c bits

[Andy Shevchenko]

On Tue, Nov 24, 2015 at 5:48 AM, Chen-Yu Tsai <wens@csie.org> wrote:
> The axp20x driver assumes the device is i2c based. This is not the
> case with later chips, which use a proprietary 2 wire serial bus
> by Allwinner called "Reduced Serial Bus".
>
> This patch follows the example of mfd/wm831x and splits it into
> an interface independent core, and an i2c specific glue layer.
> MFD_AXP20X and the new MFD_AXP20X_I2C are changed to tristate
> symbols, allowing the driver to be built as modules.
>
> Included but unused header files are removed as well.
>
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> ---
>  drivers/mfd/Kconfig        |  14 +++--
>  drivers/mfd/Makefile       |   1 +
>  drivers/mfd/axp20x-i2c.c   | 127 +++++++++++++++++++++++++++++++++++++++++++++
>  drivers/mfd/axp20x.c       | 108 +++++---------------------------------
>  include/linux/mfd/axp20x.h |  33 +++++++++++-
>  5 files changed, 183 insertions(+), 100 deletions(-)
>  create mode 100644 drivers/mfd/axp20x-i2c.c
>
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> index 4d92df6ef9fe..804cd3dcce32 100644
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -91,14 +91,18 @@ config MFD_BCM590XX
>           Support for the BCM590xx PMUs from Broadcom
>
>  config MFD_AXP20X
> -       bool "X-Powers AXP20X"
> +       tristate
>         select MFD_CORE
> -       select REGMAP_I2C
>         select REGMAP_IRQ
> -       depends on I2C=y
> +
> +config MFD_AXP20X_I2C
> +       tristate "X-Powers AXP series PMICs with I2C"
> +       select MFD_AXP20X
> +       select REGMAP_I2C
> +       depends on I2C
>         help
> -         If you say Y here you get support for the X-Powers AXP202, AXP209 and
> -         AXP288 power management IC (PMIC).
> +         If you say Y here you get support for the X-Powers AXP series power
> +         management ICs (PMICs) controlled with I2C.
>           This driver include only the core APIs. You have to select individual
>           components like regulators or the PEK (Power Enable Key) under the
>           corresponding menus.
> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
> index a8b76b81b467..a6913007d667 100644
> --- a/drivers/mfd/Makefile
> +++ b/drivers/mfd/Makefile
> @@ -107,6 +107,7 @@ obj-$(CONFIG_PMIC_DA9052)   += da9052-core.o
>  obj-$(CONFIG_MFD_DA9052_SPI)   += da9052-spi.o
>  obj-$(CONFIG_MFD_DA9052_I2C)   += da9052-i2c.o
>  obj-$(CONFIG_MFD_AXP20X)       += axp20x.o
> +obj-$(CONFIG_MFD_AXP20X_I2C)   += axp20x-i2c.o
>
>  obj-$(CONFIG_MFD_LP3943)       += lp3943.o
>  obj-$(CONFIG_MFD_LP8788)       += lp8788.o lp8788-irq.o
> diff --git a/drivers/mfd/axp20x-i2c.c b/drivers/mfd/axp20x-i2c.c
> new file mode 100644
> index 000000000000..75b247af2514
> --- /dev/null
> +++ b/drivers/mfd/axp20x-i2c.c
> @@ -0,0 +1,127 @@
> +/*
> + * axp20x-i2c.c - I2C driver for the X-Powers' Power Management ICs
> + *
> + * AXP20x typically comprises an adaptive USB-Compatible PWM charger, BUCK DC-DC
> + * converters, LDOs, multiple 12-bit ADCs of voltage, current and temperature
> + * as well as configurable GPIOs.
> + *
> + * This driver supports the I2C variants.
> + *
> + * Author: Carlo Caione <carlo@caione.org>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#include <linux/acpi.h>
> +#include <linux/err.h>
> +#include <linux/i2c.h>
> +#include <linux/module.h>
> +#include <linux/mfd/axp20x.h>
> +#include <linux/of_device.h>
> +#include <linux/regmap.h>
> +#include <linux/slab.h>
> +
> +static const struct of_device_id axp20x_i2c_of_match[] = {
> +       { .compatible = "x-powers,axp152", .data = (void *) AXP152_ID },
> +       { .compatible = "x-powers,axp202", .data = (void *) AXP202_ID },
> +       { .compatible = "x-powers,axp209", .data = (void *) AXP209_ID },
> +       { .compatible = "x-powers,axp221", .data = (void *) AXP221_ID },
> +       { },
> +};
> +MODULE_DEVICE_TABLE(of, axp20x_i2c_of_match);
> +
> +/*
> + * This is useless for OF-enabled devices, but it is needed by I2C subsystem
> + */
> +static const struct i2c_device_id axp20x_i2c_id[] = {
> +       { },
> +};
> +MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
> +
> +static const struct acpi_device_id axp20x_i2c_acpi_match[] = {
> +       {
> +               .id = "INT33F4",
> +               .driver_data = AXP288_ID,
> +       },
> +       { },
> +};
> +MODULE_DEVICE_TABLE(acpi, axp20x_i2c_acpi_match);
> +
> +static int axp20x_i2c_match_device(struct axp20x_dev *axp20x,
> +                                  struct device *dev)
> +{
> +       const struct acpi_device_id *acpi_id;
> +       const struct of_device_id *of_id;
> +
> +       if (dev->of_node) {

What about

if (…of_node) {
      const struct of_device_id *id;
…
} else if ACPI_COMPANION(…) {
      const struct acpi_device_id *id;
…
} else {
 return -ENODEV;
}

> +               of_id = of_match_device(axp20x_i2c_of_match, dev);
> +               if (!of_id) {
> +                       dev_err(dev, "Unable to match OF ID\n");
> +                       return -ENODEV;
> +               }
> +               axp20x->variant = (long) of_id->data;

Extra space after casting.

> +       } else {
> +               acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev);
> +               if (!acpi_id || !acpi_id->driver_data) {
> +                       dev_err(dev, "Unable to match ACPI ID and data\n");
> +                       return -ENODEV;
> +               }
> +               axp20x->variant = (long) acpi_id->driver_data;

Ditto.

> +       }
> +
> +       return axp20x_match_device(axp20x, dev);
> +}
> +
> +static int axp20x_i2c_probe(struct i2c_client *i2c,
> +                           const struct i2c_device_id *id)
> +{
> +       struct axp20x_dev *axp20x;
> +       int ret;
> +
> +       axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
> +       if (!axp20x)
> +               return -ENOMEM;
> +
> +       ret = axp20x_i2c_match_device(axp20x, &i2c->dev);
> +       if (ret)
> +               return ret;
> +
> +       axp20x->dev = &i2c->dev;
> +       axp20x->irq = i2c->irq;

If you move _match_device() here you will be able to drop away struct
device * parameter.

> +       dev_set_drvdata(axp20x->dev, axp20x);
> +
> +       axp20x->regmap = devm_regmap_init_i2c(i2c, axp20x->regmap_cfg);
> +       if (IS_ERR(axp20x->regmap)) {
> +               ret = PTR_ERR(axp20x->regmap);
> +               dev_err(&i2c->dev, "regmap init failed: %d\n", ret);
> +               return ret;
> +       }
> +
> +       return axp20x_device_probe(axp20x);
> +}
> +
> +static int axp20x_i2c_remove(struct i2c_client *i2c)
> +{
> +       struct axp20x_dev *axp20x = i2c_get_clientdata(i2c);
> +
> +       return axp20x_device_remove(axp20x);
> +}
> +
> +static struct i2c_driver axp20x_i2c_driver = {
> +       .driver = {
> +               .name   = "axp20x",
> +               .of_match_table = of_match_ptr(axp20x_i2c_of_match),
> +               .acpi_match_table = ACPI_PTR(axp20x_i2c_acpi_match),
> +       },
> +       .probe          = axp20x_i2c_probe,
> +       .remove         = axp20x_i2c_remove,
> +       .id_table       = axp20x_i2c_id,
> +};
> +
> +module_i2c_driver(axp20x_i2c_driver);
> +
> +MODULE_DESCRIPTION("PMIC MFD I2C driver for AXP20X");
> +MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
> +MODULE_LICENSE("GPL");
> diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
> index 9842199e2e6c..01f139856bf1 100644
> --- a/drivers/mfd/axp20x.c
> +++ b/drivers/mfd/axp20x.c
> @@ -5,6 +5,8 @@
>   * converters, LDOs, multiple 12-bit ADCs of voltage, current and temperature
>   * as well as configurable GPIOs.
>   *
> + * This file contains the interface independent core functions.
> + *
>   * Author: Carlo Caione <carlo@caione.org>
>   *
>   * This program is free software; you can redistribute it and/or modify
> @@ -13,18 +15,14 @@
>   */
>
>  #include <linux/err.h>
> -#include <linux/i2c.h>
>  #include <linux/interrupt.h>
>  #include <linux/kernel.h>
>  #include <linux/module.h>
>  #include <linux/pm_runtime.h>
>  #include <linux/regmap.h>
> -#include <linux/slab.h>
>  #include <linux/regulator/consumer.h>
>  #include <linux/mfd/axp20x.h>
>  #include <linux/mfd/core.h>
> -#include <linux/of_device.h>
> -#include <linux/of_irq.h>
>  #include <linux/acpi.h>
>
>  #define AXP20X_OFF     0x80
> @@ -376,32 +374,6 @@ static const struct regmap_irq axp288_regmap_irqs[] = {
>         INIT_REGMAP_IRQ(AXP288, BC_USB_CHNG,            5, 1),
>  };
>
> -static const struct of_device_id axp20x_of_match[] = {
> -       { .compatible = "x-powers,axp152", .data = (void *) AXP152_ID },
> -       { .compatible = "x-powers,axp202", .data = (void *) AXP202_ID },
> -       { .compatible = "x-powers,axp209", .data = (void *) AXP209_ID },
> -       { .compatible = "x-powers,axp221", .data = (void *) AXP221_ID },
> -       { },
> -};
> -MODULE_DEVICE_TABLE(of, axp20x_of_match);
> -
> -/*
> - * This is useless for OF-enabled devices, but it is needed by I2C subsystem
> - */
> -static const struct i2c_device_id axp20x_i2c_id[] = {
> -       { },
> -};
> -MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
> -
> -static const struct acpi_device_id axp20x_acpi_match[] = {
> -       {
> -               .id = "INT33F4",
> -               .driver_data = AXP288_ID,
> -       },
> -       { },
> -};
> -MODULE_DEVICE_TABLE(acpi, axp20x_acpi_match);
> -
>  static const struct regmap_irq_chip axp152_regmap_irq_chip = {
>         .name                   = "axp152_irq_chip",
>         .status_base            = AXP152_IRQ1_STATE,
> @@ -606,27 +578,8 @@ static void axp20x_power_off(void)
>                      AXP20X_OFF);
>  }
>
> -static int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
> +int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
>  {
> -       const struct acpi_device_id *acpi_id;
> -       const struct of_device_id *of_id;
> -
> -       if (dev->of_node) {
> -               of_id = of_match_device(axp20x_of_match, dev);
> -               if (!of_id) {
> -                       dev_err(dev, "Unable to match OF ID\n");
> -                       return -ENODEV;
> -               }
> -               axp20x->variant = (long) of_id->data;
> -       } else {
> -               acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev);
> -               if (!acpi_id || !acpi_id->driver_data) {
> -                       dev_err(dev, "Unable to match ACPI ID and data\n");
> -                       return -ENODEV;
> -               }
> -               axp20x->variant = (long) acpi_id->driver_data;
> -       }
> -
>         switch (axp20x->variant) {
>         case AXP152_ID:
>                 axp20x->nr_cells = ARRAY_SIZE(axp152_cells);
> @@ -662,38 +615,18 @@ static int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
>
>         return 0;
>  }
> +EXPORT_SYMBOL(axp20x_match_device);
>
> -static int axp20x_i2c_probe(struct i2c_client *i2c,
> -                        const struct i2c_device_id *id)
> +int axp20x_device_probe(struct axp20x_dev *axp20x)
>  {
> -       struct axp20x_dev *axp20x;
>         int ret;
>
> -       axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
> -       if (!axp20x)
> -               return -ENOMEM;
> -
> -       ret = axp20x_match_device(axp20x, &i2c->dev);
> -       if (ret)
> -               return ret;
> -
> -       axp20x->i2c_client = i2c;
> -       axp20x->dev = &i2c->dev;
> -       dev_set_drvdata(axp20x->dev, axp20x);
> -
> -       axp20x->regmap = devm_regmap_init_i2c(i2c, axp20x->regmap_cfg);
> -       if (IS_ERR(axp20x->regmap)) {
> -               ret = PTR_ERR(axp20x->regmap);
> -               dev_err(&i2c->dev, "regmap init failed: %d\n", ret);
> -               return ret;
> -       }
> -
> -       ret = regmap_add_irq_chip(axp20x->regmap, i2c->irq,
> +       ret = regmap_add_irq_chip(axp20x->regmap, axp20x->irq,
>                                   IRQF_ONESHOT | IRQF_SHARED, -1,
>                                   axp20x->regmap_irq_chip,
>                                   &axp20x->regmap_irqc);
>         if (ret) {
> -               dev_err(&i2c->dev, "failed to add irq chip: %d\n", ret);
> +               dev_err(axp20x->dev, "failed to add irq chip: %d\n", ret);
>                 return ret;
>         }
>
> @@ -701,8 +634,8 @@ static int axp20x_i2c_probe(struct i2c_client *i2c,
>                         axp20x->nr_cells, NULL, 0, NULL);
>
>         if (ret) {
> -               dev_err(&i2c->dev, "failed to add MFD devices: %d\n", ret);
> -               regmap_del_irq_chip(i2c->irq, axp20x->regmap_irqc);
> +               dev_err(axp20x->dev, "failed to add MFD devices: %d\n", ret);
> +               regmap_del_irq_chip(axp20x->irq, axp20x->regmap_irqc);
>                 return ret;
>         }
>
> @@ -711,38 +644,25 @@ static int axp20x_i2c_probe(struct i2c_client *i2c,
>                 pm_power_off = axp20x_power_off;
>         }
>
> -       dev_info(&i2c->dev, "AXP20X driver loaded\n");
> +       dev_info(axp20x->dev, "AXP20X driver loaded\n");
>
>         return 0;
>  }
> +EXPORT_SYMBOL(axp20x_device_probe);
>
> -static int axp20x_i2c_remove(struct i2c_client *i2c)
> +int axp20x_device_remove(struct axp20x_dev *axp20x)
>  {
> -       struct axp20x_dev *axp20x = i2c_get_clientdata(i2c);
> -
>         if (axp20x == axp20x_pm_power_off) {
>                 axp20x_pm_power_off = NULL;
>                 pm_power_off = NULL;
>         }
>
>         mfd_remove_devices(axp20x->dev);
> -       regmap_del_irq_chip(axp20x->i2c_client->irq, axp20x->regmap_irqc);
> +       regmap_del_irq_chip(axp20x->irq, axp20x->regmap_irqc);
>
>         return 0;
>  }
> -
> -static struct i2c_driver axp20x_i2c_driver = {
> -       .driver = {
> -               .name   = "axp20x",
> -               .of_match_table = of_match_ptr(axp20x_of_match),
> -               .acpi_match_table = ACPI_PTR(axp20x_acpi_match),
> -       },
> -       .probe          = axp20x_i2c_probe,
> -       .remove         = axp20x_i2c_remove,
> -       .id_table       = axp20x_i2c_id,
> -};
> -
> -module_i2c_driver(axp20x_i2c_driver);
> +EXPORT_SYMBOL(axp20x_device_remove);
>
>  MODULE_DESCRIPTION("PMIC MFD core driver for AXP20X");
>  MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
> diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h
> index b24c771cebd5..908f97f6e2d7 100644
> --- a/include/linux/mfd/axp20x.h
> +++ b/include/linux/mfd/axp20x.h
> @@ -396,7 +396,7 @@ enum axp288_irqs {
>
>  struct axp20x_dev {
>         struct device                   *dev;
> -       struct i2c_client               *i2c_client;
> +       int                             irq;
>         struct regmap                   *regmap;
>         struct regmap_irq_chip_data     *regmap_irqc;
>         long                            variant;
> @@ -462,4 +462,35 @@ static inline int axp20x_read_variable_width(struct regmap *regmap,
>         return result;
>  }
>
> +/**
> + * axp20x_match_device(): Setup axp20x variant related fields
> + *
> + * @axp20x: axp20x device to setup (.variant field must be set)
> + * @dev: device associated with this axp20x device
> + *
> + * This lets the axp20x core configure the mfd cells and register maps
> + * for later use.
> + */
> +int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev);
> +
> +/**
> + * axp20x_device_probe(): Probe a configured axp20x device
> + *
> + * @axp20x: axp20x device to probe (must be configured)
> + *
> + * This function lets the axp20x core register the axp20x mfd devices
> + * and irqchip. The axp20x device passed in must be fully configured
> + * with axp20x_match_device, its irq set, and regmap created.
> + */
> +int axp20x_device_probe(struct axp20x_dev *axp20x);
> +
> +/**
> + * axp20x_device_probe(): Remove a axp20x device
> + *
> + * @axp20x: axp20x device to remove
> + *
> + * This tells the axp20x core to remove the associated mfd devices
> + */
> +int axp20x_device_remove(struct axp20x_dev *axp20x);
> +
>  #endif /* __LINUX_MFD_AXP20X_H */
> --
> 2.6.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/



-- 
With Best Regards,
Andy Shevchenko

[PATCH v4 2/6] mfd: axp20x: Split the driver into core and i2c bits

[Andy Shevchenko]

On Tue, Nov 24, 2015 at 5:48 AM, Chen-Yu Tsai <wens@csie.org> wrote:
> The axp20x driver assumes the device is i2c based. This is not the
> case with later chips, which use a proprietary 2 wire serial bus
> by Allwinner called "Reduced Serial Bus".
>
> This patch follows the example of mfd/wm831x and splits it into
> an interface independent core, and an i2c specific glue layer.
> MFD_AXP20X and the new MFD_AXP20X_I2C are changed to tristate
> symbols, allowing the driver to be built as modules.
>
> Included but unused header files are removed as well.
>
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> ---
>  drivers/mfd/Kconfig        |  14 +++--
>  drivers/mfd/Makefile       |   1 +
>  drivers/mfd/axp20x-i2c.c   | 127 +++++++++++++++++++++++++++++++++++++++++++++
>  drivers/mfd/axp20x.c       | 108 +++++---------------------------------
>  include/linux/mfd/axp20x.h |  33 +++++++++++-
>  5 files changed, 183 insertions(+), 100 deletions(-)
>  create mode 100644 drivers/mfd/axp20x-i2c.c
>
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> index 4d92df6ef9fe..804cd3dcce32 100644
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -91,14 +91,18 @@ config MFD_BCM590XX
>           Support for the BCM590xx PMUs from Broadcom
>
>  config MFD_AXP20X
> -       bool "X-Powers AXP20X"
> +       tristate
>         select MFD_CORE
> -       select REGMAP_I2C
>         select REGMAP_IRQ
> -       depends on I2C=y
> +
> +config MFD_AXP20X_I2C
> +       tristate "X-Powers AXP series PMICs with I2C"
> +       select MFD_AXP20X
> +       select REGMAP_I2C
> +       depends on I2C
>         help
> -         If you say Y here you get support for the X-Powers AXP202, AXP209 and
> -         AXP288 power management IC (PMIC).
> +         If you say Y here you get support for the X-Powers AXP series power
> +         management ICs (PMICs) controlled with I2C.
>           This driver include only the core APIs. You have to select individual
>           components like regulators or the PEK (Power Enable Key) under the
>           corresponding menus.
> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
> index a8b76b81b467..a6913007d667 100644
> --- a/drivers/mfd/Makefile
> +++ b/drivers/mfd/Makefile
> @@ -107,6 +107,7 @@ obj-$(CONFIG_PMIC_DA9052)   += da9052-core.o
>  obj-$(CONFIG_MFD_DA9052_SPI)   += da9052-spi.o
>  obj-$(CONFIG_MFD_DA9052_I2C)   += da9052-i2c.o
>  obj-$(CONFIG_MFD_AXP20X)       += axp20x.o
> +obj-$(CONFIG_MFD_AXP20X_I2C)   += axp20x-i2c.o
>
>  obj-$(CONFIG_MFD_LP3943)       += lp3943.o
>  obj-$(CONFIG_MFD_LP8788)       += lp8788.o lp8788-irq.o
> diff --git a/drivers/mfd/axp20x-i2c.c b/drivers/mfd/axp20x-i2c.c
> new file mode 100644
> index 000000000000..75b247af2514
> --- /dev/null
> +++ b/drivers/mfd/axp20x-i2c.c
> @@ -0,0 +1,127 @@
> +/*
> + * axp20x-i2c.c - I2C driver for the X-Powers' Power Management ICs
> + *
> + * AXP20x typically comprises an adaptive USB-Compatible PWM charger, BUCK DC-DC
> + * converters, LDOs, multiple 12-bit ADCs of voltage, current and temperature
> + * as well as configurable GPIOs.
> + *
> + * This driver supports the I2C variants.
> + *
> + * Author: Carlo Caione <carlo@caione.org>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#include <linux/acpi.h>
> +#include <linux/err.h>
> +#include <linux/i2c.h>
> +#include <linux/module.h>
> +#include <linux/mfd/axp20x.h>
> +#include <linux/of_device.h>
> +#include <linux/regmap.h>
> +#include <linux/slab.h>
> +
> +static const struct of_device_id axp20x_i2c_of_match[] = {
> +       { .compatible = "x-powers,axp152", .data = (void *) AXP152_ID },
> +       { .compatible = "x-powers,axp202", .data = (void *) AXP202_ID },
> +       { .compatible = "x-powers,axp209", .data = (void *) AXP209_ID },
> +       { .compatible = "x-powers,axp221", .data = (void *) AXP221_ID },
> +       { },
> +};
> +MODULE_DEVICE_TABLE(of, axp20x_i2c_of_match);
> +
> +/*
> + * This is useless for OF-enabled devices, but it is needed by I2C subsystem
> + */
> +static const struct i2c_device_id axp20x_i2c_id[] = {
> +       { },
> +};
> +MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
> +
> +static const struct acpi_device_id axp20x_i2c_acpi_match[] = {
> +       {
> +               .id = "INT33F4",
> +               .driver_data = AXP288_ID,
> +       },
> +       { },
> +};
> +MODULE_DEVICE_TABLE(acpi, axp20x_i2c_acpi_match);
> +
> +static int axp20x_i2c_match_device(struct axp20x_dev *axp20x,
> +                                  struct device *dev)
> +{
> +       const struct acpi_device_id *acpi_id;
> +       const struct of_device_id *of_id;
> +
> +       if (dev->of_node) {

What about

if (?of_node) {
      const struct of_device_id *id;
?
} else if ACPI_COMPANION(?) {
      const struct acpi_device_id *id;
?
} else {
 return -ENODEV;
}

> +               of_id = of_match_device(axp20x_i2c_of_match, dev);
> +               if (!of_id) {
> +                       dev_err(dev, "Unable to match OF ID\n");
> +                       return -ENODEV;
> +               }
> +               axp20x->variant = (long) of_id->data;

Extra space after casting.

> +       } else {
> +               acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev);
> +               if (!acpi_id || !acpi_id->driver_data) {
> +                       dev_err(dev, "Unable to match ACPI ID and data\n");
> +                       return -ENODEV;
> +               }
> +               axp20x->variant = (long) acpi_id->driver_data;

Ditto.

> +       }
> +
> +       return axp20x_match_device(axp20x, dev);
> +}
> +
> +static int axp20x_i2c_probe(struct i2c_client *i2c,
> +                           const struct i2c_device_id *id)
> +{
> +       struct axp20x_dev *axp20x;
> +       int ret;
> +
> +       axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
> +       if (!axp20x)
> +               return -ENOMEM;
> +
> +       ret = axp20x_i2c_match_device(axp20x, &i2c->dev);
> +       if (ret)
> +               return ret;
> +
> +       axp20x->dev = &i2c->dev;
> +       axp20x->irq = i2c->irq;

If you move _match_device() here you will be able to drop away struct
device * parameter.

> +       dev_set_drvdata(axp20x->dev, axp20x);
> +
> +       axp20x->regmap = devm_regmap_init_i2c(i2c, axp20x->regmap_cfg);
> +       if (IS_ERR(axp20x->regmap)) {
> +               ret = PTR_ERR(axp20x->regmap);
> +               dev_err(&i2c->dev, "regmap init failed: %d\n", ret);
> +               return ret;
> +       }
> +
> +       return axp20x_device_probe(axp20x);
> +}
> +
> +static int axp20x_i2c_remove(struct i2c_client *i2c)
> +{
> +       struct axp20x_dev *axp20x = i2c_get_clientdata(i2c);
> +
> +       return axp20x_device_remove(axp20x);
> +}
> +
> +static struct i2c_driver axp20x_i2c_driver = {
> +       .driver = {
> +               .name   = "axp20x",
> +               .of_match_table = of_match_ptr(axp20x_i2c_of_match),
> +               .acpi_match_table = ACPI_PTR(axp20x_i2c_acpi_match),
> +       },
> +       .probe          = axp20x_i2c_probe,
> +       .remove         = axp20x_i2c_remove,
> +       .id_table       = axp20x_i2c_id,
> +};
> +
> +module_i2c_driver(axp20x_i2c_driver);
> +
> +MODULE_DESCRIPTION("PMIC MFD I2C driver for AXP20X");
> +MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
> +MODULE_LICENSE("GPL");
> diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
> index 9842199e2e6c..01f139856bf1 100644
> --- a/drivers/mfd/axp20x.c
> +++ b/drivers/mfd/axp20x.c
> @@ -5,6 +5,8 @@
>   * converters, LDOs, multiple 12-bit ADCs of voltage, current and temperature
>   * as well as configurable GPIOs.
>   *
> + * This file contains the interface independent core functions.
> + *
>   * Author: Carlo Caione <carlo@caione.org>
>   *
>   * This program is free software; you can redistribute it and/or modify
> @@ -13,18 +15,14 @@
>   */
>
>  #include <linux/err.h>
> -#include <linux/i2c.h>
>  #include <linux/interrupt.h>
>  #include <linux/kernel.h>
>  #include <linux/module.h>
>  #include <linux/pm_runtime.h>
>  #include <linux/regmap.h>
> -#include <linux/slab.h>
>  #include <linux/regulator/consumer.h>
>  #include <linux/mfd/axp20x.h>
>  #include <linux/mfd/core.h>
> -#include <linux/of_device.h>
> -#include <linux/of_irq.h>
>  #include <linux/acpi.h>
>
>  #define AXP20X_OFF     0x80
> @@ -376,32 +374,6 @@ static const struct regmap_irq axp288_regmap_irqs[] = {
>         INIT_REGMAP_IRQ(AXP288, BC_USB_CHNG,            5, 1),
>  };
>
> -static const struct of_device_id axp20x_of_match[] = {
> -       { .compatible = "x-powers,axp152", .data = (void *) AXP152_ID },
> -       { .compatible = "x-powers,axp202", .data = (void *) AXP202_ID },
> -       { .compatible = "x-powers,axp209", .data = (void *) AXP209_ID },
> -       { .compatible = "x-powers,axp221", .data = (void *) AXP221_ID },
> -       { },
> -};
> -MODULE_DEVICE_TABLE(of, axp20x_of_match);
> -
> -/*
> - * This is useless for OF-enabled devices, but it is needed by I2C subsystem
> - */
> -static const struct i2c_device_id axp20x_i2c_id[] = {
> -       { },
> -};
> -MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
> -
> -static const struct acpi_device_id axp20x_acpi_match[] = {
> -       {
> -               .id = "INT33F4",
> -               .driver_data = AXP288_ID,
> -       },
> -       { },
> -};
> -MODULE_DEVICE_TABLE(acpi, axp20x_acpi_match);
> -
>  static const struct regmap_irq_chip axp152_regmap_irq_chip = {
>         .name                   = "axp152_irq_chip",
>         .status_base            = AXP152_IRQ1_STATE,
> @@ -606,27 +578,8 @@ static void axp20x_power_off(void)
>                      AXP20X_OFF);
>  }
>
> -static int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
> +int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
>  {
> -       const struct acpi_device_id *acpi_id;
> -       const struct of_device_id *of_id;
> -
> -       if (dev->of_node) {
> -               of_id = of_match_device(axp20x_of_match, dev);
> -               if (!of_id) {
> -                       dev_err(dev, "Unable to match OF ID\n");
> -                       return -ENODEV;
> -               }
> -               axp20x->variant = (long) of_id->data;
> -       } else {
> -               acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev);
> -               if (!acpi_id || !acpi_id->driver_data) {
> -                       dev_err(dev, "Unable to match ACPI ID and data\n");
> -                       return -ENODEV;
> -               }
> -               axp20x->variant = (long) acpi_id->driver_data;
> -       }
> -
>         switch (axp20x->variant) {
>         case AXP152_ID:
>                 axp20x->nr_cells = ARRAY_SIZE(axp152_cells);
> @@ -662,38 +615,18 @@ static int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
>
>         return 0;
>  }
> +EXPORT_SYMBOL(axp20x_match_device);
>
> -static int axp20x_i2c_probe(struct i2c_client *i2c,
> -                        const struct i2c_device_id *id)
> +int axp20x_device_probe(struct axp20x_dev *axp20x)
>  {
> -       struct axp20x_dev *axp20x;
>         int ret;
>
> -       axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
> -       if (!axp20x)
> -               return -ENOMEM;
> -
> -       ret = axp20x_match_device(axp20x, &i2c->dev);
> -       if (ret)
> -               return ret;
> -
> -       axp20x->i2c_client = i2c;
> -       axp20x->dev = &i2c->dev;
> -       dev_set_drvdata(axp20x->dev, axp20x);
> -
> -       axp20x->regmap = devm_regmap_init_i2c(i2c, axp20x->regmap_cfg);
> -       if (IS_ERR(axp20x->regmap)) {
> -               ret = PTR_ERR(axp20x->regmap);
> -               dev_err(&i2c->dev, "regmap init failed: %d\n", ret);
> -               return ret;
> -       }
> -
> -       ret = regmap_add_irq_chip(axp20x->regmap, i2c->irq,
> +       ret = regmap_add_irq_chip(axp20x->regmap, axp20x->irq,
>                                   IRQF_ONESHOT | IRQF_SHARED, -1,
>                                   axp20x->regmap_irq_chip,
>                                   &axp20x->regmap_irqc);
>         if (ret) {
> -               dev_err(&i2c->dev, "failed to add irq chip: %d\n", ret);
> +               dev_err(axp20x->dev, "failed to add irq chip: %d\n", ret);
>                 return ret;
>         }
>
> @@ -701,8 +634,8 @@ static int axp20x_i2c_probe(struct i2c_client *i2c,
>                         axp20x->nr_cells, NULL, 0, NULL);
>
>         if (ret) {
> -               dev_err(&i2c->dev, "failed to add MFD devices: %d\n", ret);
> -               regmap_del_irq_chip(i2c->irq, axp20x->regmap_irqc);
> +               dev_err(axp20x->dev, "failed to add MFD devices: %d\n", ret);
> +               regmap_del_irq_chip(axp20x->irq, axp20x->regmap_irqc);
>                 return ret;
>         }
>
> @@ -711,38 +644,25 @@ static int axp20x_i2c_probe(struct i2c_client *i2c,
>                 pm_power_off = axp20x_power_off;
>         }
>
> -       dev_info(&i2c->dev, "AXP20X driver loaded\n");
> +       dev_info(axp20x->dev, "AXP20X driver loaded\n");
>
>         return 0;
>  }
> +EXPORT_SYMBOL(axp20x_device_probe);
>
> -static int axp20x_i2c_remove(struct i2c_client *i2c)
> +int axp20x_device_remove(struct axp20x_dev *axp20x)
>  {
> -       struct axp20x_dev *axp20x = i2c_get_clientdata(i2c);
> -
>         if (axp20x == axp20x_pm_power_off) {
>                 axp20x_pm_power_off = NULL;
>                 pm_power_off = NULL;
>         }
>
>         mfd_remove_devices(axp20x->dev);
> -       regmap_del_irq_chip(axp20x->i2c_client->irq, axp20x->regmap_irqc);
> +       regmap_del_irq_chip(axp20x->irq, axp20x->regmap_irqc);
>
>         return 0;
>  }
> -
> -static struct i2c_driver axp20x_i2c_driver = {
> -       .driver = {
> -               .name   = "axp20x",
> -               .of_match_table = of_match_ptr(axp20x_of_match),
> -               .acpi_match_table = ACPI_PTR(axp20x_acpi_match),
> -       },
> -       .probe          = axp20x_i2c_probe,
> -       .remove         = axp20x_i2c_remove,
> -       .id_table       = axp20x_i2c_id,
> -};
> -
> -module_i2c_driver(axp20x_i2c_driver);
> +EXPORT_SYMBOL(axp20x_device_remove);
>
>  MODULE_DESCRIPTION("PMIC MFD core driver for AXP20X");
>  MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
> diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h
> index b24c771cebd5..908f97f6e2d7 100644
> --- a/include/linux/mfd/axp20x.h
> +++ b/include/linux/mfd/axp20x.h
> @@ -396,7 +396,7 @@ enum axp288_irqs {
>
>  struct axp20x_dev {
>         struct device                   *dev;
> -       struct i2c_client               *i2c_client;
> +       int                             irq;
>         struct regmap                   *regmap;
>         struct regmap_irq_chip_data     *regmap_irqc;
>         long                            variant;
> @@ -462,4 +462,35 @@ static inline int axp20x_read_variable_width(struct regmap *regmap,
>         return result;
>  }
>
> +/**
> + * axp20x_match_device(): Setup axp20x variant related fields
> + *
> + * @axp20x: axp20x device to setup (.variant field must be set)
> + * @dev: device associated with this axp20x device
> + *
> + * This lets the axp20x core configure the mfd cells and register maps
> + * for later use.
> + */
> +int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev);
> +
> +/**
> + * axp20x_device_probe(): Probe a configured axp20x device
> + *
> + * @axp20x: axp20x device to probe (must be configured)
> + *
> + * This function lets the axp20x core register the axp20x mfd devices
> + * and irqchip. The axp20x device passed in must be fully configured
> + * with axp20x_match_device, its irq set, and regmap created.
> + */
> +int axp20x_device_probe(struct axp20x_dev *axp20x);
> +
> +/**
> + * axp20x_device_probe(): Remove a axp20x device
> + *
> + * @axp20x: axp20x device to remove
> + *
> + * This tells the axp20x core to remove the associated mfd devices
> + */
> +int axp20x_device_remove(struct axp20x_dev *axp20x);
> +
>  #endif /* __LINUX_MFD_AXP20X_H */
> --
> 2.6.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/



-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH v4 3/6] mfd: axp20x: Add support for RSB based AXP223 PMIC

[Andy Shevchenko]

On Tue, Nov 24, 2015 at 5:48 AM, Chen-Yu Tsai <wens@csie.org> wrote:
> The AXP223 is a new PMIC commonly paired with Allwinner A23/A33 SoCs.
> It is functionally identical to AXP221; only the regulator default
> voltage/status and the external host interface are different.
>
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> ---
>  drivers/mfd/Kconfig        | 11 ++++++
>  drivers/mfd/Makefile       |  1 +
>  drivers/mfd/axp20x-rsb.c   | 93 ++++++++++++++++++++++++++++++++++++++++++++++
>  drivers/mfd/axp20x.c       |  2 +
>  include/linux/mfd/axp20x.h |  1 +
>  5 files changed, 108 insertions(+)
>  create mode 100644 drivers/mfd/axp20x-rsb.c
>
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> index 804cd3dcce32..13c565103e96 100644
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -107,6 +107,17 @@ config MFD_AXP20X_I2C
>           components like regulators or the PEK (Power Enable Key) under the
>           corresponding menus.
>
> +config MFD_AXP20X_RSB
> +       tristate "X-Powers AXP series PMICs with RSB"
> +       select MFD_AXP20X
> +       depends on SUNXI_RSB
> +       help
> +         If you say Y here you get support for the X-Powers AXP series power
> +         management ICs (PMICs) controlled with RSB.
> +         This driver include only the core APIs. You have to select individual
> +         components like regulators or the PEK (Power Enable Key) under the
> +         corresponding menus.
> +
>  config MFD_CROS_EC
>         tristate "ChromeOS Embedded Controller"
>         select MFD_CORE
> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
> index a6913007d667..caea6637d5e8 100644
> --- a/drivers/mfd/Makefile
> +++ b/drivers/mfd/Makefile
> @@ -108,6 +108,7 @@ obj-$(CONFIG_MFD_DA9052_SPI)        += da9052-spi.o
>  obj-$(CONFIG_MFD_DA9052_I2C)   += da9052-i2c.o
>  obj-$(CONFIG_MFD_AXP20X)       += axp20x.o
>  obj-$(CONFIG_MFD_AXP20X_I2C)   += axp20x-i2c.o
> +obj-$(CONFIG_MFD_AXP20X_RSB)   += axp20x-rsb.o
>
>  obj-$(CONFIG_MFD_LP3943)       += lp3943.o
>  obj-$(CONFIG_MFD_LP8788)       += lp8788.o lp8788-irq.o
> diff --git a/drivers/mfd/axp20x-rsb.c b/drivers/mfd/axp20x-rsb.c
> new file mode 100644
> index 000000000000..3ea0d5db37d0
> --- /dev/null
> +++ b/drivers/mfd/axp20x-rsb.c
> @@ -0,0 +1,93 @@
> +/*
> + * axp20x-rsb.c - RSB driver for the X-Powers' Power Management ICs
> + *
> + * AXP20x typically comprises an adaptive USB-Compatible PWM charger, BUCK DC-DC
> + * converters, LDOs, multiple 12-bit ADCs of voltage, current and temperature
> + * as well as configurable GPIOs.
> + *
> + * This driver supports the RSB variants.
> + *
> + * Author: Chen-Yu Tsai <wens@csie.org>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#include <linux/acpi.h>
> +#include <linux/err.h>
> +#include <linux/module.h>
> +#include <linux/mfd/axp20x.h>
> +#include <linux/of_device.h>
> +#include <linux/regmap.h>
> +#include <linux/slab.h>
> +#include <linux/sunxi-rsb.h>
> +
> +static const struct of_device_id axp20x_rsb_of_match[] = {
> +       { .compatible = "x-powers,axp223", .data = (void *) AXP223_ID },
> +       { },
> +};
> +MODULE_DEVICE_TABLE(of, axp20x_rsb_of_match);
> +
> +static int axp20x_rsb_match_device(struct axp20x_dev *axp20x,
> +                                        struct device *dev)

Same idea, drop away second parameter.

> +{
> +       const struct of_device_id *of_id;
> +
> +       of_id = of_match_device(axp20x_rsb_of_match, dev);
> +       if (!of_id) {
> +               dev_err(dev, "Unable to match OF ID\n");
> +               return -ENODEV;
> +       }
> +       axp20x->variant = (long) of_id->data;

Extra space.

> +
> +       return axp20x_match_device(axp20x, dev);
> +}
> +
> +static int axp20x_rsb_probe(struct sunxi_rsb_device *rdev)
> +{
> +       struct axp20x_dev *axp20x;
> +       int ret;
> +
> +       axp20x = devm_kzalloc(&rdev->dev, sizeof(*axp20x), GFP_KERNEL);
> +       if (!axp20x)
> +               return -ENOMEM;
> +
> +       ret = axp20x_rsb_match_device(axp20x, &rdev->dev);
> +       if (ret)
> +               return ret;
> +
> +       axp20x->dev = &rdev->dev;
> +       axp20x->irq = rdev->irq;
> +       sunxi_rsb_device_set_drvdata(rdev, axp20x);
> +
> +       axp20x->regmap = devm_regmap_init_sunxi_rsb(rdev, axp20x->regmap_cfg);
> +       if (IS_ERR(axp20x->regmap)) {
> +               ret = PTR_ERR(axp20x->regmap);
> +               dev_err(&rdev->dev, "regmap init failed: %d\n", ret);
> +               return ret;
> +       }
> +
> +       return axp20x_device_probe(axp20x);
> +}
> +
> +static int axp20x_rsb_remove(struct sunxi_rsb_device *rdev)
> +{
> +       struct axp20x_dev *axp20x = sunxi_rsb_device_get_drvdata(rdev);
> +
> +       return axp20x_device_remove(axp20x);
> +}
> +
> +static struct sunxi_rsb_driver axp20x_rsb_driver = {
> +       .driver = {
> +               .name   = "axp20x-rsb",
> +               .of_match_table = of_match_ptr(axp20x_rsb_of_match),
> +       },
> +       .probe  = axp20x_rsb_probe,
> +       .remove = axp20x_rsb_remove,
> +};
> +module_sunxi_rsb_driver(axp20x_rsb_driver);
> +
> +MODULE_DESCRIPTION("PMIC MFD sunXi RSB driver for AXP20X");
> +MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
> +MODULE_LICENSE("GPL v2");
> diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
> index 01f139856bf1..8057000da9d6 100644
> --- a/drivers/mfd/axp20x.c
> +++ b/drivers/mfd/axp20x.c
> @@ -32,6 +32,7 @@ static const char * const axp20x_model_names[] = {
>         "AXP202",
>         "AXP209",
>         "AXP221",
> +       "AXP223",
>         "AXP288",
>  };
>
> @@ -595,6 +596,7 @@ int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
>                 axp20x->regmap_irq_chip = &axp20x_regmap_irq_chip;
>                 break;
>         case AXP221_ID:
> +       case AXP223_ID:
>                 axp20x->nr_cells = ARRAY_SIZE(axp22x_cells);
>                 axp20x->cells = axp22x_cells;
>                 axp20x->regmap_cfg = &axp22x_regmap_config;
> diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h
> index 908f97f6e2d7..fef8dea18e66 100644
> --- a/include/linux/mfd/axp20x.h
> +++ b/include/linux/mfd/axp20x.h
> @@ -18,6 +18,7 @@ enum {
>         AXP202_ID,
>         AXP209_ID,
>         AXP221_ID,
> +       AXP223_ID,
>         AXP288_ID,
>         NR_AXP20X_VARIANTS,
>  };
> --
> 2.6.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/



-- 
With Best Regards,
Andy Shevchenko

[PATCH v4 3/6] mfd: axp20x: Add support for RSB based AXP223 PMIC

[Andy Shevchenko]

On Tue, Nov 24, 2015 at 5:48 AM, Chen-Yu Tsai <wens@csie.org> wrote:
> The AXP223 is a new PMIC commonly paired with Allwinner A23/A33 SoCs.
> It is functionally identical to AXP221; only the regulator default
> voltage/status and the external host interface are different.
>
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> ---
>  drivers/mfd/Kconfig        | 11 ++++++
>  drivers/mfd/Makefile       |  1 +
>  drivers/mfd/axp20x-rsb.c   | 93 ++++++++++++++++++++++++++++++++++++++++++++++
>  drivers/mfd/axp20x.c       |  2 +
>  include/linux/mfd/axp20x.h |  1 +
>  5 files changed, 108 insertions(+)
>  create mode 100644 drivers/mfd/axp20x-rsb.c
>
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> index 804cd3dcce32..13c565103e96 100644
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -107,6 +107,17 @@ config MFD_AXP20X_I2C
>           components like regulators or the PEK (Power Enable Key) under the
>           corresponding menus.
>
> +config MFD_AXP20X_RSB
> +       tristate "X-Powers AXP series PMICs with RSB"
> +       select MFD_AXP20X
> +       depends on SUNXI_RSB
> +       help
> +         If you say Y here you get support for the X-Powers AXP series power
> +         management ICs (PMICs) controlled with RSB.
> +         This driver include only the core APIs. You have to select individual
> +         components like regulators or the PEK (Power Enable Key) under the
> +         corresponding menus.
> +
>  config MFD_CROS_EC
>         tristate "ChromeOS Embedded Controller"
>         select MFD_CORE
> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
> index a6913007d667..caea6637d5e8 100644
> --- a/drivers/mfd/Makefile
> +++ b/drivers/mfd/Makefile
> @@ -108,6 +108,7 @@ obj-$(CONFIG_MFD_DA9052_SPI)        += da9052-spi.o
>  obj-$(CONFIG_MFD_DA9052_I2C)   += da9052-i2c.o
>  obj-$(CONFIG_MFD_AXP20X)       += axp20x.o
>  obj-$(CONFIG_MFD_AXP20X_I2C)   += axp20x-i2c.o
> +obj-$(CONFIG_MFD_AXP20X_RSB)   += axp20x-rsb.o
>
>  obj-$(CONFIG_MFD_LP3943)       += lp3943.o
>  obj-$(CONFIG_MFD_LP8788)       += lp8788.o lp8788-irq.o
> diff --git a/drivers/mfd/axp20x-rsb.c b/drivers/mfd/axp20x-rsb.c
> new file mode 100644
> index 000000000000..3ea0d5db37d0
> --- /dev/null
> +++ b/drivers/mfd/axp20x-rsb.c
> @@ -0,0 +1,93 @@
> +/*
> + * axp20x-rsb.c - RSB driver for the X-Powers' Power Management ICs
> + *
> + * AXP20x typically comprises an adaptive USB-Compatible PWM charger, BUCK DC-DC
> + * converters, LDOs, multiple 12-bit ADCs of voltage, current and temperature
> + * as well as configurable GPIOs.
> + *
> + * This driver supports the RSB variants.
> + *
> + * Author: Chen-Yu Tsai <wens@csie.org>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#include <linux/acpi.h>
> +#include <linux/err.h>
> +#include <linux/module.h>
> +#include <linux/mfd/axp20x.h>
> +#include <linux/of_device.h>
> +#include <linux/regmap.h>
> +#include <linux/slab.h>
> +#include <linux/sunxi-rsb.h>
> +
> +static const struct of_device_id axp20x_rsb_of_match[] = {
> +       { .compatible = "x-powers,axp223", .data = (void *) AXP223_ID },
> +       { },
> +};
> +MODULE_DEVICE_TABLE(of, axp20x_rsb_of_match);
> +
> +static int axp20x_rsb_match_device(struct axp20x_dev *axp20x,
> +                                        struct device *dev)

Same idea, drop away second parameter.

> +{
> +       const struct of_device_id *of_id;
> +
> +       of_id = of_match_device(axp20x_rsb_of_match, dev);
> +       if (!of_id) {
> +               dev_err(dev, "Unable to match OF ID\n");
> +               return -ENODEV;
> +       }
> +       axp20x->variant = (long) of_id->data;

Extra space.

> +
> +       return axp20x_match_device(axp20x, dev);
> +}
> +
> +static int axp20x_rsb_probe(struct sunxi_rsb_device *rdev)
> +{
> +       struct axp20x_dev *axp20x;
> +       int ret;
> +
> +       axp20x = devm_kzalloc(&rdev->dev, sizeof(*axp20x), GFP_KERNEL);
> +       if (!axp20x)
> +               return -ENOMEM;
> +
> +       ret = axp20x_rsb_match_device(axp20x, &rdev->dev);
> +       if (ret)
> +               return ret;
> +
> +       axp20x->dev = &rdev->dev;
> +       axp20x->irq = rdev->irq;
> +       sunxi_rsb_device_set_drvdata(rdev, axp20x);
> +
> +       axp20x->regmap = devm_regmap_init_sunxi_rsb(rdev, axp20x->regmap_cfg);
> +       if (IS_ERR(axp20x->regmap)) {
> +               ret = PTR_ERR(axp20x->regmap);
> +               dev_err(&rdev->dev, "regmap init failed: %d\n", ret);
> +               return ret;
> +       }
> +
> +       return axp20x_device_probe(axp20x);
> +}
> +
> +static int axp20x_rsb_remove(struct sunxi_rsb_device *rdev)
> +{
> +       struct axp20x_dev *axp20x = sunxi_rsb_device_get_drvdata(rdev);
> +
> +       return axp20x_device_remove(axp20x);
> +}
> +
> +static struct sunxi_rsb_driver axp20x_rsb_driver = {
> +       .driver = {
> +               .name   = "axp20x-rsb",
> +               .of_match_table = of_match_ptr(axp20x_rsb_of_match),
> +       },
> +       .probe  = axp20x_rsb_probe,
> +       .remove = axp20x_rsb_remove,
> +};
> +module_sunxi_rsb_driver(axp20x_rsb_driver);
> +
> +MODULE_DESCRIPTION("PMIC MFD sunXi RSB driver for AXP20X");
> +MODULE_AUTHOR("Chen-Yu Tsai <wens@csie.org>");
> +MODULE_LICENSE("GPL v2");
> diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
> index 01f139856bf1..8057000da9d6 100644
> --- a/drivers/mfd/axp20x.c
> +++ b/drivers/mfd/axp20x.c
> @@ -32,6 +32,7 @@ static const char * const axp20x_model_names[] = {
>         "AXP202",
>         "AXP209",
>         "AXP221",
> +       "AXP223",
>         "AXP288",
>  };
>
> @@ -595,6 +596,7 @@ int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
>                 axp20x->regmap_irq_chip = &axp20x_regmap_irq_chip;
>                 break;
>         case AXP221_ID:
> +       case AXP223_ID:
>                 axp20x->nr_cells = ARRAY_SIZE(axp22x_cells);
>                 axp20x->cells = axp22x_cells;
>                 axp20x->regmap_cfg = &axp22x_regmap_config;
> diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h
> index 908f97f6e2d7..fef8dea18e66 100644
> --- a/include/linux/mfd/axp20x.h
> +++ b/include/linux/mfd/axp20x.h
> @@ -18,6 +18,7 @@ enum {
>         AXP202_ID,
>         AXP209_ID,
>         AXP221_ID,
> +       AXP223_ID,
>         AXP288_ID,
>         NR_AXP20X_VARIANTS,
>  };
> --
> 2.6.2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/



-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH v4 2/6] mfd: axp20x: Split the driver into core and i2c bits

[Chen-Yu Tsai]

Hi,

On Tue, Nov 24, 2015 at 5:37 PM, Andy Shevchenko
<andy.shevchenko@gmail.com> wrote:
> On Tue, Nov 24, 2015 at 5:48 AM, Chen-Yu Tsai <wens@csie.org> wrote:
>> The axp20x driver assumes the device is i2c based. This is not the
>> case with later chips, which use a proprietary 2 wire serial bus
>> by Allwinner called "Reduced Serial Bus".
>>
>> This patch follows the example of mfd/wm831x and splits it into
>> an interface independent core, and an i2c specific glue layer.
>> MFD_AXP20X and the new MFD_AXP20X_I2C are changed to tristate
>> symbols, allowing the driver to be built as modules.
>>
>> Included but unused header files are removed as well.
>>
>> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
>> ---
>>  drivers/mfd/Kconfig        |  14 +++--
>>  drivers/mfd/Makefile       |   1 +
>>  drivers/mfd/axp20x-i2c.c   | 127 +++++++++++++++++++++++++++++++++++++++++++++
>>  drivers/mfd/axp20x.c       | 108 +++++---------------------------------
>>  include/linux/mfd/axp20x.h |  33 +++++++++++-
>>  5 files changed, 183 insertions(+), 100 deletions(-)
>>  create mode 100644 drivers/mfd/axp20x-i2c.c
>>
>> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
>> index 4d92df6ef9fe..804cd3dcce32 100644
>> --- a/drivers/mfd/Kconfig
>> +++ b/drivers/mfd/Kconfig
>> @@ -91,14 +91,18 @@ config MFD_BCM590XX
>>           Support for the BCM590xx PMUs from Broadcom
>>
>>  config MFD_AXP20X
>> -       bool "X-Powers AXP20X"
>> +       tristate
>>         select MFD_CORE
>> -       select REGMAP_I2C
>>         select REGMAP_IRQ
>> -       depends on I2C=y
>> +
>> +config MFD_AXP20X_I2C
>> +       tristate "X-Powers AXP series PMICs with I2C"
>> +       select MFD_AXP20X
>> +       select REGMAP_I2C
>> +       depends on I2C
>>         help
>> -         If you say Y here you get support for the X-Powers AXP202, AXP209 and
>> -         AXP288 power management IC (PMIC).
>> +         If you say Y here you get support for the X-Powers AXP series power
>> +         management ICs (PMICs) controlled with I2C.
>>           This driver include only the core APIs. You have to select individual
>>           components like regulators or the PEK (Power Enable Key) under the
>>           corresponding menus.
>> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
>> index a8b76b81b467..a6913007d667 100644
>> --- a/drivers/mfd/Makefile
>> +++ b/drivers/mfd/Makefile
>> @@ -107,6 +107,7 @@ obj-$(CONFIG_PMIC_DA9052)   += da9052-core.o
>>  obj-$(CONFIG_MFD_DA9052_SPI)   += da9052-spi.o
>>  obj-$(CONFIG_MFD_DA9052_I2C)   += da9052-i2c.o
>>  obj-$(CONFIG_MFD_AXP20X)       += axp20x.o
>> +obj-$(CONFIG_MFD_AXP20X_I2C)   += axp20x-i2c.o
>>
>>  obj-$(CONFIG_MFD_LP3943)       += lp3943.o
>>  obj-$(CONFIG_MFD_LP8788)       += lp8788.o lp8788-irq.o
>> diff --git a/drivers/mfd/axp20x-i2c.c b/drivers/mfd/axp20x-i2c.c
>> new file mode 100644
>> index 000000000000..75b247af2514
>> --- /dev/null
>> +++ b/drivers/mfd/axp20x-i2c.c
>> @@ -0,0 +1,127 @@
>> +/*
>> + * axp20x-i2c.c - I2C driver for the X-Powers' Power Management ICs
>> + *
>> + * AXP20x typically comprises an adaptive USB-Compatible PWM charger, BUCK DC-DC
>> + * converters, LDOs, multiple 12-bit ADCs of voltage, current and temperature
>> + * as well as configurable GPIOs.
>> + *
>> + * This driver supports the I2C variants.
>> + *
>> + * Author: Carlo Caione <carlo@caione.org>
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License version 2 as
>> + * published by the Free Software Foundation.
>> + */
>> +
>> +#include <linux/acpi.h>
>> +#include <linux/err.h>
>> +#include <linux/i2c.h>
>> +#include <linux/module.h>
>> +#include <linux/mfd/axp20x.h>
>> +#include <linux/of_device.h>
>> +#include <linux/regmap.h>
>> +#include <linux/slab.h>
>> +
>> +static const struct of_device_id axp20x_i2c_of_match[] = {
>> +       { .compatible = "x-powers,axp152", .data = (void *) AXP152_ID },
>> +       { .compatible = "x-powers,axp202", .data = (void *) AXP202_ID },
>> +       { .compatible = "x-powers,axp209", .data = (void *) AXP209_ID },
>> +       { .compatible = "x-powers,axp221", .data = (void *) AXP221_ID },
>> +       { },
>> +};
>> +MODULE_DEVICE_TABLE(of, axp20x_i2c_of_match);
>> +
>> +/*
>> + * This is useless for OF-enabled devices, but it is needed by I2C subsystem
>> + */
>> +static const struct i2c_device_id axp20x_i2c_id[] = {
>> +       { },
>> +};
>> +MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
>> +
>> +static const struct acpi_device_id axp20x_i2c_acpi_match[] = {
>> +       {
>> +               .id = "INT33F4",
>> +               .driver_data = AXP288_ID,
>> +       },
>> +       { },
>> +};
>> +MODULE_DEVICE_TABLE(acpi, axp20x_i2c_acpi_match);
>> +
>> +static int axp20x_i2c_match_device(struct axp20x_dev *axp20x,
>> +                                  struct device *dev)
>> +{
>> +       const struct acpi_device_id *acpi_id;
>> +       const struct of_device_id *of_id;
>> +
>> +       if (dev->of_node) {
>
> What about
>
> if (…of_node) {
>       const struct of_device_id *id;
> …
> } else if ACPI_COMPANION(…) {
>       const struct acpi_device_id *id;
> …
> } else {
>  return -ENODEV;
> }

I really don't want to change code that I'm just moving around.
Same goes for the other comments about this patch. I can do another
patch on top of this to fix the style issues if it really bothers
people.


Regards
ChenYu

>> +               of_id = of_match_device(axp20x_i2c_of_match, dev);
>> +               if (!of_id) {
>> +                       dev_err(dev, "Unable to match OF ID\n");
>> +                       return -ENODEV;
>> +               }
>> +               axp20x->variant = (long) of_id->data;
>
> Extra space after casting.
>
>> +       } else {
>> +               acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev);
>> +               if (!acpi_id || !acpi_id->driver_data) {
>> +                       dev_err(dev, "Unable to match ACPI ID and data\n");
>> +                       return -ENODEV;
>> +               }
>> +               axp20x->variant = (long) acpi_id->driver_data;
>
> Ditto.
>
>> +       }
>> +
>> +       return axp20x_match_device(axp20x, dev);
>> +}
>> +
>> +static int axp20x_i2c_probe(struct i2c_client *i2c,
>> +                           const struct i2c_device_id *id)
>> +{
>> +       struct axp20x_dev *axp20x;
>> +       int ret;
>> +
>> +       axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
>> +       if (!axp20x)
>> +               return -ENOMEM;
>> +
>> +       ret = axp20x_i2c_match_device(axp20x, &i2c->dev);
>> +       if (ret)
>> +               return ret;
>> +
>> +       axp20x->dev = &i2c->dev;
>> +       axp20x->irq = i2c->irq;
>
> If you move _match_device() here you will be able to drop away struct
> device * parameter.
>
>> +       dev_set_drvdata(axp20x->dev, axp20x);
>> +
>> +       axp20x->regmap = devm_regmap_init_i2c(i2c, axp20x->regmap_cfg);
>> +       if (IS_ERR(axp20x->regmap)) {
>> +               ret = PTR_ERR(axp20x->regmap);
>> +               dev_err(&i2c->dev, "regmap init failed: %d\n", ret);
>> +               return ret;
>> +       }
>> +
>> +       return axp20x_device_probe(axp20x);
>> +}
>> +
>> +static int axp20x_i2c_remove(struct i2c_client *i2c)
>> +{
>> +       struct axp20x_dev *axp20x = i2c_get_clientdata(i2c);
>> +
>> +       return axp20x_device_remove(axp20x);
>> +}
>> +
>> +static struct i2c_driver axp20x_i2c_driver = {
>> +       .driver = {
>> +               .name   = "axp20x",
>> +               .of_match_table = of_match_ptr(axp20x_i2c_of_match),
>> +               .acpi_match_table = ACPI_PTR(axp20x_i2c_acpi_match),
>> +       },
>> +       .probe          = axp20x_i2c_probe,
>> +       .remove         = axp20x_i2c_remove,
>> +       .id_table       = axp20x_i2c_id,
>> +};
>> +
>> +module_i2c_driver(axp20x_i2c_driver);
>> +
>> +MODULE_DESCRIPTION("PMIC MFD I2C driver for AXP20X");
>> +MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
>> +MODULE_LICENSE("GPL");
>> diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
>> index 9842199e2e6c..01f139856bf1 100644
>> --- a/drivers/mfd/axp20x.c
>> +++ b/drivers/mfd/axp20x.c
>> @@ -5,6 +5,8 @@
>>   * converters, LDOs, multiple 12-bit ADCs of voltage, current and temperature
>>   * as well as configurable GPIOs.
>>   *
>> + * This file contains the interface independent core functions.
>> + *
>>   * Author: Carlo Caione <carlo@caione.org>
>>   *
>>   * This program is free software; you can redistribute it and/or modify
>> @@ -13,18 +15,14 @@
>>   */
>>
>>  #include <linux/err.h>
>> -#include <linux/i2c.h>
>>  #include <linux/interrupt.h>
>>  #include <linux/kernel.h>
>>  #include <linux/module.h>
>>  #include <linux/pm_runtime.h>
>>  #include <linux/regmap.h>
>> -#include <linux/slab.h>
>>  #include <linux/regulator/consumer.h>
>>  #include <linux/mfd/axp20x.h>
>>  #include <linux/mfd/core.h>
>> -#include <linux/of_device.h>
>> -#include <linux/of_irq.h>
>>  #include <linux/acpi.h>
>>
>>  #define AXP20X_OFF     0x80
>> @@ -376,32 +374,6 @@ static const struct regmap_irq axp288_regmap_irqs[] = {
>>         INIT_REGMAP_IRQ(AXP288, BC_USB_CHNG,            5, 1),
>>  };
>>
>> -static const struct of_device_id axp20x_of_match[] = {
>> -       { .compatible = "x-powers,axp152", .data = (void *) AXP152_ID },
>> -       { .compatible = "x-powers,axp202", .data = (void *) AXP202_ID },
>> -       { .compatible = "x-powers,axp209", .data = (void *) AXP209_ID },
>> -       { .compatible = "x-powers,axp221", .data = (void *) AXP221_ID },
>> -       { },
>> -};
>> -MODULE_DEVICE_TABLE(of, axp20x_of_match);
>> -
>> -/*
>> - * This is useless for OF-enabled devices, but it is needed by I2C subsystem
>> - */
>> -static const struct i2c_device_id axp20x_i2c_id[] = {
>> -       { },
>> -};
>> -MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
>> -
>> -static const struct acpi_device_id axp20x_acpi_match[] = {
>> -       {
>> -               .id = "INT33F4",
>> -               .driver_data = AXP288_ID,
>> -       },
>> -       { },
>> -};
>> -MODULE_DEVICE_TABLE(acpi, axp20x_acpi_match);
>> -
>>  static const struct regmap_irq_chip axp152_regmap_irq_chip = {
>>         .name                   = "axp152_irq_chip",
>>         .status_base            = AXP152_IRQ1_STATE,
>> @@ -606,27 +578,8 @@ static void axp20x_power_off(void)
>>                      AXP20X_OFF);
>>  }
>>
>> -static int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
>> +int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
>>  {
>> -       const struct acpi_device_id *acpi_id;
>> -       const struct of_device_id *of_id;
>> -
>> -       if (dev->of_node) {
>> -               of_id = of_match_device(axp20x_of_match, dev);
>> -               if (!of_id) {
>> -                       dev_err(dev, "Unable to match OF ID\n");
>> -                       return -ENODEV;
>> -               }
>> -               axp20x->variant = (long) of_id->data;
>> -       } else {
>> -               acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev);
>> -               if (!acpi_id || !acpi_id->driver_data) {
>> -                       dev_err(dev, "Unable to match ACPI ID and data\n");
>> -                       return -ENODEV;
>> -               }
>> -               axp20x->variant = (long) acpi_id->driver_data;
>> -       }
>> -
>>         switch (axp20x->variant) {
>>         case AXP152_ID:
>>                 axp20x->nr_cells = ARRAY_SIZE(axp152_cells);
>> @@ -662,38 +615,18 @@ static int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
>>
>>         return 0;
>>  }
>> +EXPORT_SYMBOL(axp20x_match_device);
>>
>> -static int axp20x_i2c_probe(struct i2c_client *i2c,
>> -                        const struct i2c_device_id *id)
>> +int axp20x_device_probe(struct axp20x_dev *axp20x)
>>  {
>> -       struct axp20x_dev *axp20x;
>>         int ret;
>>
>> -       axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
>> -       if (!axp20x)
>> -               return -ENOMEM;
>> -
>> -       ret = axp20x_match_device(axp20x, &i2c->dev);
>> -       if (ret)
>> -               return ret;
>> -
>> -       axp20x->i2c_client = i2c;
>> -       axp20x->dev = &i2c->dev;
>> -       dev_set_drvdata(axp20x->dev, axp20x);
>> -
>> -       axp20x->regmap = devm_regmap_init_i2c(i2c, axp20x->regmap_cfg);
>> -       if (IS_ERR(axp20x->regmap)) {
>> -               ret = PTR_ERR(axp20x->regmap);
>> -               dev_err(&i2c->dev, "regmap init failed: %d\n", ret);
>> -               return ret;
>> -       }
>> -
>> -       ret = regmap_add_irq_chip(axp20x->regmap, i2c->irq,
>> +       ret = regmap_add_irq_chip(axp20x->regmap, axp20x->irq,
>>                                   IRQF_ONESHOT | IRQF_SHARED, -1,
>>                                   axp20x->regmap_irq_chip,
>>                                   &axp20x->regmap_irqc);
>>         if (ret) {
>> -               dev_err(&i2c->dev, "failed to add irq chip: %d\n", ret);
>> +               dev_err(axp20x->dev, "failed to add irq chip: %d\n", ret);
>>                 return ret;
>>         }
>>
>> @@ -701,8 +634,8 @@ static int axp20x_i2c_probe(struct i2c_client *i2c,
>>                         axp20x->nr_cells, NULL, 0, NULL);
>>
>>         if (ret) {
>> -               dev_err(&i2c->dev, "failed to add MFD devices: %d\n", ret);
>> -               regmap_del_irq_chip(i2c->irq, axp20x->regmap_irqc);
>> +               dev_err(axp20x->dev, "failed to add MFD devices: %d\n", ret);
>> +               regmap_del_irq_chip(axp20x->irq, axp20x->regmap_irqc);
>>                 return ret;
>>         }
>>
>> @@ -711,38 +644,25 @@ static int axp20x_i2c_probe(struct i2c_client *i2c,
>>                 pm_power_off = axp20x_power_off;
>>         }
>>
>> -       dev_info(&i2c->dev, "AXP20X driver loaded\n");
>> +       dev_info(axp20x->dev, "AXP20X driver loaded\n");
>>
>>         return 0;
>>  }
>> +EXPORT_SYMBOL(axp20x_device_probe);
>>
>> -static int axp20x_i2c_remove(struct i2c_client *i2c)
>> +int axp20x_device_remove(struct axp20x_dev *axp20x)
>>  {
>> -       struct axp20x_dev *axp20x = i2c_get_clientdata(i2c);
>> -
>>         if (axp20x == axp20x_pm_power_off) {
>>                 axp20x_pm_power_off = NULL;
>>                 pm_power_off = NULL;
>>         }
>>
>>         mfd_remove_devices(axp20x->dev);
>> -       regmap_del_irq_chip(axp20x->i2c_client->irq, axp20x->regmap_irqc);
>> +       regmap_del_irq_chip(axp20x->irq, axp20x->regmap_irqc);
>>
>>         return 0;
>>  }
>> -
>> -static struct i2c_driver axp20x_i2c_driver = {
>> -       .driver = {
>> -               .name   = "axp20x",
>> -               .of_match_table = of_match_ptr(axp20x_of_match),
>> -               .acpi_match_table = ACPI_PTR(axp20x_acpi_match),
>> -       },
>> -       .probe          = axp20x_i2c_probe,
>> -       .remove         = axp20x_i2c_remove,
>> -       .id_table       = axp20x_i2c_id,
>> -};
>> -
>> -module_i2c_driver(axp20x_i2c_driver);
>> +EXPORT_SYMBOL(axp20x_device_remove);
>>
>>  MODULE_DESCRIPTION("PMIC MFD core driver for AXP20X");
>>  MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
>> diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h
>> index b24c771cebd5..908f97f6e2d7 100644
>> --- a/include/linux/mfd/axp20x.h
>> +++ b/include/linux/mfd/axp20x.h
>> @@ -396,7 +396,7 @@ enum axp288_irqs {
>>
>>  struct axp20x_dev {
>>         struct device                   *dev;
>> -       struct i2c_client               *i2c_client;
>> +       int                             irq;
>>         struct regmap                   *regmap;
>>         struct regmap_irq_chip_data     *regmap_irqc;
>>         long                            variant;
>> @@ -462,4 +462,35 @@ static inline int axp20x_read_variable_width(struct regmap *regmap,
>>         return result;
>>  }
>>
>> +/**
>> + * axp20x_match_device(): Setup axp20x variant related fields
>> + *
>> + * @axp20x: axp20x device to setup (.variant field must be set)
>> + * @dev: device associated with this axp20x device
>> + *
>> + * This lets the axp20x core configure the mfd cells and register maps
>> + * for later use.
>> + */
>> +int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev);
>> +
>> +/**
>> + * axp20x_device_probe(): Probe a configured axp20x device
>> + *
>> + * @axp20x: axp20x device to probe (must be configured)
>> + *
>> + * This function lets the axp20x core register the axp20x mfd devices
>> + * and irqchip. The axp20x device passed in must be fully configured
>> + * with axp20x_match_device, its irq set, and regmap created.
>> + */
>> +int axp20x_device_probe(struct axp20x_dev *axp20x);
>> +
>> +/**
>> + * axp20x_device_probe(): Remove a axp20x device
>> + *
>> + * @axp20x: axp20x device to remove
>> + *
>> + * This tells the axp20x core to remove the associated mfd devices
>> + */
>> +int axp20x_device_remove(struct axp20x_dev *axp20x);
>> +
>>  #endif /* __LINUX_MFD_AXP20X_H */
>> --
>> 2.6.2
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at  http://www.tux.org/lkml/
>
>
>
> --
> With Best Regards,
> Andy Shevchenko

Re: [PATCH v4 2/6] mfd: axp20x: Split the driver into core and i2c bits

[Chen-Yu Tsai]

Hi,

On Tue, Nov 24, 2015 at 5:37 PM, Andy Shevchenko
<andy.shevchenko-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> On Tue, Nov 24, 2015 at 5:48 AM, Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org> wrote:
>> The axp20x driver assumes the device is i2c based. This is not the
>> case with later chips, which use a proprietary 2 wire serial bus
>> by Allwinner called "Reduced Serial Bus".
>>
>> This patch follows the example of mfd/wm831x and splits it into
>> an interface independent core, and an i2c specific glue layer.
>> MFD_AXP20X and the new MFD_AXP20X_I2C are changed to tristate
>> symbols, allowing the driver to be built as modules.
>>
>> Included but unused header files are removed as well.
>>
>> Signed-off-by: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>
>> ---
>>  drivers/mfd/Kconfig        |  14 +++--
>>  drivers/mfd/Makefile       |   1 +
>>  drivers/mfd/axp20x-i2c.c   | 127 +++++++++++++++++++++++++++++++++++++++++++++
>>  drivers/mfd/axp20x.c       | 108 +++++---------------------------------
>>  include/linux/mfd/axp20x.h |  33 +++++++++++-
>>  5 files changed, 183 insertions(+), 100 deletions(-)
>>  create mode 100644 drivers/mfd/axp20x-i2c.c
>>
>> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
>> index 4d92df6ef9fe..804cd3dcce32 100644
>> --- a/drivers/mfd/Kconfig
>> +++ b/drivers/mfd/Kconfig
>> @@ -91,14 +91,18 @@ config MFD_BCM590XX
>>           Support for the BCM590xx PMUs from Broadcom
>>
>>  config MFD_AXP20X
>> -       bool "X-Powers AXP20X"
>> +       tristate
>>         select MFD_CORE
>> -       select REGMAP_I2C
>>         select REGMAP_IRQ
>> -       depends on I2C=y
>> +
>> +config MFD_AXP20X_I2C
>> +       tristate "X-Powers AXP series PMICs with I2C"
>> +       select MFD_AXP20X
>> +       select REGMAP_I2C
>> +       depends on I2C
>>         help
>> -         If you say Y here you get support for the X-Powers AXP202, AXP209 and
>> -         AXP288 power management IC (PMIC).
>> +         If you say Y here you get support for the X-Powers AXP series power
>> +         management ICs (PMICs) controlled with I2C.
>>           This driver include only the core APIs. You have to select individual
>>           components like regulators or the PEK (Power Enable Key) under the
>>           corresponding menus.
>> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
>> index a8b76b81b467..a6913007d667 100644
>> --- a/drivers/mfd/Makefile
>> +++ b/drivers/mfd/Makefile
>> @@ -107,6 +107,7 @@ obj-$(CONFIG_PMIC_DA9052)   += da9052-core.o
>>  obj-$(CONFIG_MFD_DA9052_SPI)   += da9052-spi.o
>>  obj-$(CONFIG_MFD_DA9052_I2C)   += da9052-i2c.o
>>  obj-$(CONFIG_MFD_AXP20X)       += axp20x.o
>> +obj-$(CONFIG_MFD_AXP20X_I2C)   += axp20x-i2c.o
>>
>>  obj-$(CONFIG_MFD_LP3943)       += lp3943.o
>>  obj-$(CONFIG_MFD_LP8788)       += lp8788.o lp8788-irq.o
>> diff --git a/drivers/mfd/axp20x-i2c.c b/drivers/mfd/axp20x-i2c.c
>> new file mode 100644
>> index 000000000000..75b247af2514
>> --- /dev/null
>> +++ b/drivers/mfd/axp20x-i2c.c
>> @@ -0,0 +1,127 @@
>> +/*
>> + * axp20x-i2c.c - I2C driver for the X-Powers' Power Management ICs
>> + *
>> + * AXP20x typically comprises an adaptive USB-Compatible PWM charger, BUCK DC-DC
>> + * converters, LDOs, multiple 12-bit ADCs of voltage, current and temperature
>> + * as well as configurable GPIOs.
>> + *
>> + * This driver supports the I2C variants.
>> + *
>> + * Author: Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License version 2 as
>> + * published by the Free Software Foundation.
>> + */
>> +
>> +#include <linux/acpi.h>
>> +#include <linux/err.h>
>> +#include <linux/i2c.h>
>> +#include <linux/module.h>
>> +#include <linux/mfd/axp20x.h>
>> +#include <linux/of_device.h>
>> +#include <linux/regmap.h>
>> +#include <linux/slab.h>
>> +
>> +static const struct of_device_id axp20x_i2c_of_match[] = {
>> +       { .compatible = "x-powers,axp152", .data = (void *) AXP152_ID },
>> +       { .compatible = "x-powers,axp202", .data = (void *) AXP202_ID },
>> +       { .compatible = "x-powers,axp209", .data = (void *) AXP209_ID },
>> +       { .compatible = "x-powers,axp221", .data = (void *) AXP221_ID },
>> +       { },
>> +};
>> +MODULE_DEVICE_TABLE(of, axp20x_i2c_of_match);
>> +
>> +/*
>> + * This is useless for OF-enabled devices, but it is needed by I2C subsystem
>> + */
>> +static const struct i2c_device_id axp20x_i2c_id[] = {
>> +       { },
>> +};
>> +MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
>> +
>> +static const struct acpi_device_id axp20x_i2c_acpi_match[] = {
>> +       {
>> +               .id = "INT33F4",
>> +               .driver_data = AXP288_ID,
>> +       },
>> +       { },
>> +};
>> +MODULE_DEVICE_TABLE(acpi, axp20x_i2c_acpi_match);
>> +
>> +static int axp20x_i2c_match_device(struct axp20x_dev *axp20x,
>> +                                  struct device *dev)
>> +{
>> +       const struct acpi_device_id *acpi_id;
>> +       const struct of_device_id *of_id;
>> +
>> +       if (dev->of_node) {
>
> What about
>
> if (…of_node) {
>       const struct of_device_id *id;
> …
> } else if ACPI_COMPANION(…) {
>       const struct acpi_device_id *id;
> …
> } else {
>  return -ENODEV;
> }

I really don't want to change code that I'm just moving around.
Same goes for the other comments about this patch. I can do another
patch on top of this to fix the style issues if it really bothers
people.


Regards
ChenYu

>> +               of_id = of_match_device(axp20x_i2c_of_match, dev);
>> +               if (!of_id) {
>> +                       dev_err(dev, "Unable to match OF ID\n");
>> +                       return -ENODEV;
>> +               }
>> +               axp20x->variant = (long) of_id->data;
>
> Extra space after casting.
>
>> +       } else {
>> +               acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev);
>> +               if (!acpi_id || !acpi_id->driver_data) {
>> +                       dev_err(dev, "Unable to match ACPI ID and data\n");
>> +                       return -ENODEV;
>> +               }
>> +               axp20x->variant = (long) acpi_id->driver_data;
>
> Ditto.
>
>> +       }
>> +
>> +       return axp20x_match_device(axp20x, dev);
>> +}
>> +
>> +static int axp20x_i2c_probe(struct i2c_client *i2c,
>> +                           const struct i2c_device_id *id)
>> +{
>> +       struct axp20x_dev *axp20x;
>> +       int ret;
>> +
>> +       axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
>> +       if (!axp20x)
>> +               return -ENOMEM;
>> +
>> +       ret = axp20x_i2c_match_device(axp20x, &i2c->dev);
>> +       if (ret)
>> +               return ret;
>> +
>> +       axp20x->dev = &i2c->dev;
>> +       axp20x->irq = i2c->irq;
>
> If you move _match_device() here you will be able to drop away struct
> device * parameter.
>
>> +       dev_set_drvdata(axp20x->dev, axp20x);
>> +
>> +       axp20x->regmap = devm_regmap_init_i2c(i2c, axp20x->regmap_cfg);
>> +       if (IS_ERR(axp20x->regmap)) {
>> +               ret = PTR_ERR(axp20x->regmap);
>> +               dev_err(&i2c->dev, "regmap init failed: %d\n", ret);
>> +               return ret;
>> +       }
>> +
>> +       return axp20x_device_probe(axp20x);
>> +}
>> +
>> +static int axp20x_i2c_remove(struct i2c_client *i2c)
>> +{
>> +       struct axp20x_dev *axp20x = i2c_get_clientdata(i2c);
>> +
>> +       return axp20x_device_remove(axp20x);
>> +}
>> +
>> +static struct i2c_driver axp20x_i2c_driver = {
>> +       .driver = {
>> +               .name   = "axp20x",
>> +               .of_match_table = of_match_ptr(axp20x_i2c_of_match),
>> +               .acpi_match_table = ACPI_PTR(axp20x_i2c_acpi_match),
>> +       },
>> +       .probe          = axp20x_i2c_probe,
>> +       .remove         = axp20x_i2c_remove,
>> +       .id_table       = axp20x_i2c_id,
>> +};
>> +
>> +module_i2c_driver(axp20x_i2c_driver);
>> +
>> +MODULE_DESCRIPTION("PMIC MFD I2C driver for AXP20X");
>> +MODULE_AUTHOR("Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>");
>> +MODULE_LICENSE("GPL");
>> diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
>> index 9842199e2e6c..01f139856bf1 100644
>> --- a/drivers/mfd/axp20x.c
>> +++ b/drivers/mfd/axp20x.c
>> @@ -5,6 +5,8 @@
>>   * converters, LDOs, multiple 12-bit ADCs of voltage, current and temperature
>>   * as well as configurable GPIOs.
>>   *
>> + * This file contains the interface independent core functions.
>> + *
>>   * Author: Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>
>>   *
>>   * This program is free software; you can redistribute it and/or modify
>> @@ -13,18 +15,14 @@
>>   */
>>
>>  #include <linux/err.h>
>> -#include <linux/i2c.h>
>>  #include <linux/interrupt.h>
>>  #include <linux/kernel.h>
>>  #include <linux/module.h>
>>  #include <linux/pm_runtime.h>
>>  #include <linux/regmap.h>
>> -#include <linux/slab.h>
>>  #include <linux/regulator/consumer.h>
>>  #include <linux/mfd/axp20x.h>
>>  #include <linux/mfd/core.h>
>> -#include <linux/of_device.h>
>> -#include <linux/of_irq.h>
>>  #include <linux/acpi.h>
>>
>>  #define AXP20X_OFF     0x80
>> @@ -376,32 +374,6 @@ static const struct regmap_irq axp288_regmap_irqs[] = {
>>         INIT_REGMAP_IRQ(AXP288, BC_USB_CHNG,            5, 1),
>>  };
>>
>> -static const struct of_device_id axp20x_of_match[] = {
>> -       { .compatible = "x-powers,axp152", .data = (void *) AXP152_ID },
>> -       { .compatible = "x-powers,axp202", .data = (void *) AXP202_ID },
>> -       { .compatible = "x-powers,axp209", .data = (void *) AXP209_ID },
>> -       { .compatible = "x-powers,axp221", .data = (void *) AXP221_ID },
>> -       { },
>> -};
>> -MODULE_DEVICE_TABLE(of, axp20x_of_match);
>> -
>> -/*
>> - * This is useless for OF-enabled devices, but it is needed by I2C subsystem
>> - */
>> -static const struct i2c_device_id axp20x_i2c_id[] = {
>> -       { },
>> -};
>> -MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
>> -
>> -static const struct acpi_device_id axp20x_acpi_match[] = {
>> -       {
>> -               .id = "INT33F4",
>> -               .driver_data = AXP288_ID,
>> -       },
>> -       { },
>> -};
>> -MODULE_DEVICE_TABLE(acpi, axp20x_acpi_match);
>> -
>>  static const struct regmap_irq_chip axp152_regmap_irq_chip = {
>>         .name                   = "axp152_irq_chip",
>>         .status_base            = AXP152_IRQ1_STATE,
>> @@ -606,27 +578,8 @@ static void axp20x_power_off(void)
>>                      AXP20X_OFF);
>>  }
>>
>> -static int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
>> +int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
>>  {
>> -       const struct acpi_device_id *acpi_id;
>> -       const struct of_device_id *of_id;
>> -
>> -       if (dev->of_node) {
>> -               of_id = of_match_device(axp20x_of_match, dev);
>> -               if (!of_id) {
>> -                       dev_err(dev, "Unable to match OF ID\n");
>> -                       return -ENODEV;
>> -               }
>> -               axp20x->variant = (long) of_id->data;
>> -       } else {
>> -               acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev);
>> -               if (!acpi_id || !acpi_id->driver_data) {
>> -                       dev_err(dev, "Unable to match ACPI ID and data\n");
>> -                       return -ENODEV;
>> -               }
>> -               axp20x->variant = (long) acpi_id->driver_data;
>> -       }
>> -
>>         switch (axp20x->variant) {
>>         case AXP152_ID:
>>                 axp20x->nr_cells = ARRAY_SIZE(axp152_cells);
>> @@ -662,38 +615,18 @@ static int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
>>
>>         return 0;
>>  }
>> +EXPORT_SYMBOL(axp20x_match_device);
>>
>> -static int axp20x_i2c_probe(struct i2c_client *i2c,
>> -                        const struct i2c_device_id *id)
>> +int axp20x_device_probe(struct axp20x_dev *axp20x)
>>  {
>> -       struct axp20x_dev *axp20x;
>>         int ret;
>>
>> -       axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
>> -       if (!axp20x)
>> -               return -ENOMEM;
>> -
>> -       ret = axp20x_match_device(axp20x, &i2c->dev);
>> -       if (ret)
>> -               return ret;
>> -
>> -       axp20x->i2c_client = i2c;
>> -       axp20x->dev = &i2c->dev;
>> -       dev_set_drvdata(axp20x->dev, axp20x);
>> -
>> -       axp20x->regmap = devm_regmap_init_i2c(i2c, axp20x->regmap_cfg);
>> -       if (IS_ERR(axp20x->regmap)) {
>> -               ret = PTR_ERR(axp20x->regmap);
>> -               dev_err(&i2c->dev, "regmap init failed: %d\n", ret);
>> -               return ret;
>> -       }
>> -
>> -       ret = regmap_add_irq_chip(axp20x->regmap, i2c->irq,
>> +       ret = regmap_add_irq_chip(axp20x->regmap, axp20x->irq,
>>                                   IRQF_ONESHOT | IRQF_SHARED, -1,
>>                                   axp20x->regmap_irq_chip,
>>                                   &axp20x->regmap_irqc);
>>         if (ret) {
>> -               dev_err(&i2c->dev, "failed to add irq chip: %d\n", ret);
>> +               dev_err(axp20x->dev, "failed to add irq chip: %d\n", ret);
>>                 return ret;
>>         }
>>
>> @@ -701,8 +634,8 @@ static int axp20x_i2c_probe(struct i2c_client *i2c,
>>                         axp20x->nr_cells, NULL, 0, NULL);
>>
>>         if (ret) {
>> -               dev_err(&i2c->dev, "failed to add MFD devices: %d\n", ret);
>> -               regmap_del_irq_chip(i2c->irq, axp20x->regmap_irqc);
>> +               dev_err(axp20x->dev, "failed to add MFD devices: %d\n", ret);
>> +               regmap_del_irq_chip(axp20x->irq, axp20x->regmap_irqc);
>>                 return ret;
>>         }
>>
>> @@ -711,38 +644,25 @@ static int axp20x_i2c_probe(struct i2c_client *i2c,
>>                 pm_power_off = axp20x_power_off;
>>         }
>>
>> -       dev_info(&i2c->dev, "AXP20X driver loaded\n");
>> +       dev_info(axp20x->dev, "AXP20X driver loaded\n");
>>
>>         return 0;
>>  }
>> +EXPORT_SYMBOL(axp20x_device_probe);
>>
>> -static int axp20x_i2c_remove(struct i2c_client *i2c)
>> +int axp20x_device_remove(struct axp20x_dev *axp20x)
>>  {
>> -       struct axp20x_dev *axp20x = i2c_get_clientdata(i2c);
>> -
>>         if (axp20x == axp20x_pm_power_off) {
>>                 axp20x_pm_power_off = NULL;
>>                 pm_power_off = NULL;
>>         }
>>
>>         mfd_remove_devices(axp20x->dev);
>> -       regmap_del_irq_chip(axp20x->i2c_client->irq, axp20x->regmap_irqc);
>> +       regmap_del_irq_chip(axp20x->irq, axp20x->regmap_irqc);
>>
>>         return 0;
>>  }
>> -
>> -static struct i2c_driver axp20x_i2c_driver = {
>> -       .driver = {
>> -               .name   = "axp20x",
>> -               .of_match_table = of_match_ptr(axp20x_of_match),
>> -               .acpi_match_table = ACPI_PTR(axp20x_acpi_match),
>> -       },
>> -       .probe          = axp20x_i2c_probe,
>> -       .remove         = axp20x_i2c_remove,
>> -       .id_table       = axp20x_i2c_id,
>> -};
>> -
>> -module_i2c_driver(axp20x_i2c_driver);
>> +EXPORT_SYMBOL(axp20x_device_remove);
>>
>>  MODULE_DESCRIPTION("PMIC MFD core driver for AXP20X");
>>  MODULE_AUTHOR("Carlo Caione <carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org>");
>> diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h
>> index b24c771cebd5..908f97f6e2d7 100644
>> --- a/include/linux/mfd/axp20x.h
>> +++ b/include/linux/mfd/axp20x.h
>> @@ -396,7 +396,7 @@ enum axp288_irqs {
>>
>>  struct axp20x_dev {
>>         struct device                   *dev;
>> -       struct i2c_client               *i2c_client;
>> +       int                             irq;
>>         struct regmap                   *regmap;
>>         struct regmap_irq_chip_data     *regmap_irqc;
>>         long                            variant;
>> @@ -462,4 +462,35 @@ static inline int axp20x_read_variable_width(struct regmap *regmap,
>>         return result;
>>  }
>>
>> +/**
>> + * axp20x_match_device(): Setup axp20x variant related fields
>> + *
>> + * @axp20x: axp20x device to setup (.variant field must be set)
>> + * @dev: device associated with this axp20x device
>> + *
>> + * This lets the axp20x core configure the mfd cells and register maps
>> + * for later use.
>> + */
>> +int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev);
>> +
>> +/**
>> + * axp20x_device_probe(): Probe a configured axp20x device
>> + *
>> + * @axp20x: axp20x device to probe (must be configured)
>> + *
>> + * This function lets the axp20x core register the axp20x mfd devices
>> + * and irqchip. The axp20x device passed in must be fully configured
>> + * with axp20x_match_device, its irq set, and regmap created.
>> + */
>> +int axp20x_device_probe(struct axp20x_dev *axp20x);
>> +
>> +/**
>> + * axp20x_device_probe(): Remove a axp20x device
>> + *
>> + * @axp20x: axp20x device to remove
>> + *
>> + * This tells the axp20x core to remove the associated mfd devices
>> + */
>> +int axp20x_device_remove(struct axp20x_dev *axp20x);
>> +
>>  #endif /* __LINUX_MFD_AXP20X_H */
>> --
>> 2.6.2
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at  http://www.tux.org/lkml/
>
>
>
> --
> With Best Regards,
> Andy Shevchenko

-- 
You received this message because you are subscribed to the Google Groups "linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
For more options, visit https://groups.google.com/d/optout.

[PATCH v4 2/6] mfd: axp20x: Split the driver into core and i2c bits

[Chen-Yu Tsai]

Hi,

On Tue, Nov 24, 2015 at 5:37 PM, Andy Shevchenko
<andy.shevchenko@gmail.com> wrote:
> On Tue, Nov 24, 2015 at 5:48 AM, Chen-Yu Tsai <wens@csie.org> wrote:
>> The axp20x driver assumes the device is i2c based. This is not the
>> case with later chips, which use a proprietary 2 wire serial bus
>> by Allwinner called "Reduced Serial Bus".
>>
>> This patch follows the example of mfd/wm831x and splits it into
>> an interface independent core, and an i2c specific glue layer.
>> MFD_AXP20X and the new MFD_AXP20X_I2C are changed to tristate
>> symbols, allowing the driver to be built as modules.
>>
>> Included but unused header files are removed as well.
>>
>> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
>> ---
>>  drivers/mfd/Kconfig        |  14 +++--
>>  drivers/mfd/Makefile       |   1 +
>>  drivers/mfd/axp20x-i2c.c   | 127 +++++++++++++++++++++++++++++++++++++++++++++
>>  drivers/mfd/axp20x.c       | 108 +++++---------------------------------
>>  include/linux/mfd/axp20x.h |  33 +++++++++++-
>>  5 files changed, 183 insertions(+), 100 deletions(-)
>>  create mode 100644 drivers/mfd/axp20x-i2c.c
>>
>> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
>> index 4d92df6ef9fe..804cd3dcce32 100644
>> --- a/drivers/mfd/Kconfig
>> +++ b/drivers/mfd/Kconfig
>> @@ -91,14 +91,18 @@ config MFD_BCM590XX
>>           Support for the BCM590xx PMUs from Broadcom
>>
>>  config MFD_AXP20X
>> -       bool "X-Powers AXP20X"
>> +       tristate
>>         select MFD_CORE
>> -       select REGMAP_I2C
>>         select REGMAP_IRQ
>> -       depends on I2C=y
>> +
>> +config MFD_AXP20X_I2C
>> +       tristate "X-Powers AXP series PMICs with I2C"
>> +       select MFD_AXP20X
>> +       select REGMAP_I2C
>> +       depends on I2C
>>         help
>> -         If you say Y here you get support for the X-Powers AXP202, AXP209 and
>> -         AXP288 power management IC (PMIC).
>> +         If you say Y here you get support for the X-Powers AXP series power
>> +         management ICs (PMICs) controlled with I2C.
>>           This driver include only the core APIs. You have to select individual
>>           components like regulators or the PEK (Power Enable Key) under the
>>           corresponding menus.
>> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
>> index a8b76b81b467..a6913007d667 100644
>> --- a/drivers/mfd/Makefile
>> +++ b/drivers/mfd/Makefile
>> @@ -107,6 +107,7 @@ obj-$(CONFIG_PMIC_DA9052)   += da9052-core.o
>>  obj-$(CONFIG_MFD_DA9052_SPI)   += da9052-spi.o
>>  obj-$(CONFIG_MFD_DA9052_I2C)   += da9052-i2c.o
>>  obj-$(CONFIG_MFD_AXP20X)       += axp20x.o
>> +obj-$(CONFIG_MFD_AXP20X_I2C)   += axp20x-i2c.o
>>
>>  obj-$(CONFIG_MFD_LP3943)       += lp3943.o
>>  obj-$(CONFIG_MFD_LP8788)       += lp8788.o lp8788-irq.o
>> diff --git a/drivers/mfd/axp20x-i2c.c b/drivers/mfd/axp20x-i2c.c
>> new file mode 100644
>> index 000000000000..75b247af2514
>> --- /dev/null
>> +++ b/drivers/mfd/axp20x-i2c.c
>> @@ -0,0 +1,127 @@
>> +/*
>> + * axp20x-i2c.c - I2C driver for the X-Powers' Power Management ICs
>> + *
>> + * AXP20x typically comprises an adaptive USB-Compatible PWM charger, BUCK DC-DC
>> + * converters, LDOs, multiple 12-bit ADCs of voltage, current and temperature
>> + * as well as configurable GPIOs.
>> + *
>> + * This driver supports the I2C variants.
>> + *
>> + * Author: Carlo Caione <carlo@caione.org>
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License version 2 as
>> + * published by the Free Software Foundation.
>> + */
>> +
>> +#include <linux/acpi.h>
>> +#include <linux/err.h>
>> +#include <linux/i2c.h>
>> +#include <linux/module.h>
>> +#include <linux/mfd/axp20x.h>
>> +#include <linux/of_device.h>
>> +#include <linux/regmap.h>
>> +#include <linux/slab.h>
>> +
>> +static const struct of_device_id axp20x_i2c_of_match[] = {
>> +       { .compatible = "x-powers,axp152", .data = (void *) AXP152_ID },
>> +       { .compatible = "x-powers,axp202", .data = (void *) AXP202_ID },
>> +       { .compatible = "x-powers,axp209", .data = (void *) AXP209_ID },
>> +       { .compatible = "x-powers,axp221", .data = (void *) AXP221_ID },
>> +       { },
>> +};
>> +MODULE_DEVICE_TABLE(of, axp20x_i2c_of_match);
>> +
>> +/*
>> + * This is useless for OF-enabled devices, but it is needed by I2C subsystem
>> + */
>> +static const struct i2c_device_id axp20x_i2c_id[] = {
>> +       { },
>> +};
>> +MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
>> +
>> +static const struct acpi_device_id axp20x_i2c_acpi_match[] = {
>> +       {
>> +               .id = "INT33F4",
>> +               .driver_data = AXP288_ID,
>> +       },
>> +       { },
>> +};
>> +MODULE_DEVICE_TABLE(acpi, axp20x_i2c_acpi_match);
>> +
>> +static int axp20x_i2c_match_device(struct axp20x_dev *axp20x,
>> +                                  struct device *dev)
>> +{
>> +       const struct acpi_device_id *acpi_id;
>> +       const struct of_device_id *of_id;
>> +
>> +       if (dev->of_node) {
>
> What about
>
> if (?of_node) {
>       const struct of_device_id *id;
> ?
> } else if ACPI_COMPANION(?) {
>       const struct acpi_device_id *id;
> ?
> } else {
>  return -ENODEV;
> }

I really don't want to change code that I'm just moving around.
Same goes for the other comments about this patch. I can do another
patch on top of this to fix the style issues if it really bothers
people.


Regards
ChenYu

>> +               of_id = of_match_device(axp20x_i2c_of_match, dev);
>> +               if (!of_id) {
>> +                       dev_err(dev, "Unable to match OF ID\n");
>> +                       return -ENODEV;
>> +               }
>> +               axp20x->variant = (long) of_id->data;
>
> Extra space after casting.
>
>> +       } else {
>> +               acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev);
>> +               if (!acpi_id || !acpi_id->driver_data) {
>> +                       dev_err(dev, "Unable to match ACPI ID and data\n");
>> +                       return -ENODEV;
>> +               }
>> +               axp20x->variant = (long) acpi_id->driver_data;
>
> Ditto.
>
>> +       }
>> +
>> +       return axp20x_match_device(axp20x, dev);
>> +}
>> +
>> +static int axp20x_i2c_probe(struct i2c_client *i2c,
>> +                           const struct i2c_device_id *id)
>> +{
>> +       struct axp20x_dev *axp20x;
>> +       int ret;
>> +
>> +       axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
>> +       if (!axp20x)
>> +               return -ENOMEM;
>> +
>> +       ret = axp20x_i2c_match_device(axp20x, &i2c->dev);
>> +       if (ret)
>> +               return ret;
>> +
>> +       axp20x->dev = &i2c->dev;
>> +       axp20x->irq = i2c->irq;
>
> If you move _match_device() here you will be able to drop away struct
> device * parameter.
>
>> +       dev_set_drvdata(axp20x->dev, axp20x);
>> +
>> +       axp20x->regmap = devm_regmap_init_i2c(i2c, axp20x->regmap_cfg);
>> +       if (IS_ERR(axp20x->regmap)) {
>> +               ret = PTR_ERR(axp20x->regmap);
>> +               dev_err(&i2c->dev, "regmap init failed: %d\n", ret);
>> +               return ret;
>> +       }
>> +
>> +       return axp20x_device_probe(axp20x);
>> +}
>> +
>> +static int axp20x_i2c_remove(struct i2c_client *i2c)
>> +{
>> +       struct axp20x_dev *axp20x = i2c_get_clientdata(i2c);
>> +
>> +       return axp20x_device_remove(axp20x);
>> +}
>> +
>> +static struct i2c_driver axp20x_i2c_driver = {
>> +       .driver = {
>> +               .name   = "axp20x",
>> +               .of_match_table = of_match_ptr(axp20x_i2c_of_match),
>> +               .acpi_match_table = ACPI_PTR(axp20x_i2c_acpi_match),
>> +       },
>> +       .probe          = axp20x_i2c_probe,
>> +       .remove         = axp20x_i2c_remove,
>> +       .id_table       = axp20x_i2c_id,
>> +};
>> +
>> +module_i2c_driver(axp20x_i2c_driver);
>> +
>> +MODULE_DESCRIPTION("PMIC MFD I2C driver for AXP20X");
>> +MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
>> +MODULE_LICENSE("GPL");
>> diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
>> index 9842199e2e6c..01f139856bf1 100644
>> --- a/drivers/mfd/axp20x.c
>> +++ b/drivers/mfd/axp20x.c
>> @@ -5,6 +5,8 @@
>>   * converters, LDOs, multiple 12-bit ADCs of voltage, current and temperature
>>   * as well as configurable GPIOs.
>>   *
>> + * This file contains the interface independent core functions.
>> + *
>>   * Author: Carlo Caione <carlo@caione.org>
>>   *
>>   * This program is free software; you can redistribute it and/or modify
>> @@ -13,18 +15,14 @@
>>   */
>>
>>  #include <linux/err.h>
>> -#include <linux/i2c.h>
>>  #include <linux/interrupt.h>
>>  #include <linux/kernel.h>
>>  #include <linux/module.h>
>>  #include <linux/pm_runtime.h>
>>  #include <linux/regmap.h>
>> -#include <linux/slab.h>
>>  #include <linux/regulator/consumer.h>
>>  #include <linux/mfd/axp20x.h>
>>  #include <linux/mfd/core.h>
>> -#include <linux/of_device.h>
>> -#include <linux/of_irq.h>
>>  #include <linux/acpi.h>
>>
>>  #define AXP20X_OFF     0x80
>> @@ -376,32 +374,6 @@ static const struct regmap_irq axp288_regmap_irqs[] = {
>>         INIT_REGMAP_IRQ(AXP288, BC_USB_CHNG,            5, 1),
>>  };
>>
>> -static const struct of_device_id axp20x_of_match[] = {
>> -       { .compatible = "x-powers,axp152", .data = (void *) AXP152_ID },
>> -       { .compatible = "x-powers,axp202", .data = (void *) AXP202_ID },
>> -       { .compatible = "x-powers,axp209", .data = (void *) AXP209_ID },
>> -       { .compatible = "x-powers,axp221", .data = (void *) AXP221_ID },
>> -       { },
>> -};
>> -MODULE_DEVICE_TABLE(of, axp20x_of_match);
>> -
>> -/*
>> - * This is useless for OF-enabled devices, but it is needed by I2C subsystem
>> - */
>> -static const struct i2c_device_id axp20x_i2c_id[] = {
>> -       { },
>> -};
>> -MODULE_DEVICE_TABLE(i2c, axp20x_i2c_id);
>> -
>> -static const struct acpi_device_id axp20x_acpi_match[] = {
>> -       {
>> -               .id = "INT33F4",
>> -               .driver_data = AXP288_ID,
>> -       },
>> -       { },
>> -};
>> -MODULE_DEVICE_TABLE(acpi, axp20x_acpi_match);
>> -
>>  static const struct regmap_irq_chip axp152_regmap_irq_chip = {
>>         .name                   = "axp152_irq_chip",
>>         .status_base            = AXP152_IRQ1_STATE,
>> @@ -606,27 +578,8 @@ static void axp20x_power_off(void)
>>                      AXP20X_OFF);
>>  }
>>
>> -static int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
>> +int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
>>  {
>> -       const struct acpi_device_id *acpi_id;
>> -       const struct of_device_id *of_id;
>> -
>> -       if (dev->of_node) {
>> -               of_id = of_match_device(axp20x_of_match, dev);
>> -               if (!of_id) {
>> -                       dev_err(dev, "Unable to match OF ID\n");
>> -                       return -ENODEV;
>> -               }
>> -               axp20x->variant = (long) of_id->data;
>> -       } else {
>> -               acpi_id = acpi_match_device(dev->driver->acpi_match_table, dev);
>> -               if (!acpi_id || !acpi_id->driver_data) {
>> -                       dev_err(dev, "Unable to match ACPI ID and data\n");
>> -                       return -ENODEV;
>> -               }
>> -               axp20x->variant = (long) acpi_id->driver_data;
>> -       }
>> -
>>         switch (axp20x->variant) {
>>         case AXP152_ID:
>>                 axp20x->nr_cells = ARRAY_SIZE(axp152_cells);
>> @@ -662,38 +615,18 @@ static int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
>>
>>         return 0;
>>  }
>> +EXPORT_SYMBOL(axp20x_match_device);
>>
>> -static int axp20x_i2c_probe(struct i2c_client *i2c,
>> -                        const struct i2c_device_id *id)
>> +int axp20x_device_probe(struct axp20x_dev *axp20x)
>>  {
>> -       struct axp20x_dev *axp20x;
>>         int ret;
>>
>> -       axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
>> -       if (!axp20x)
>> -               return -ENOMEM;
>> -
>> -       ret = axp20x_match_device(axp20x, &i2c->dev);
>> -       if (ret)
>> -               return ret;
>> -
>> -       axp20x->i2c_client = i2c;
>> -       axp20x->dev = &i2c->dev;
>> -       dev_set_drvdata(axp20x->dev, axp20x);
>> -
>> -       axp20x->regmap = devm_regmap_init_i2c(i2c, axp20x->regmap_cfg);
>> -       if (IS_ERR(axp20x->regmap)) {
>> -               ret = PTR_ERR(axp20x->regmap);
>> -               dev_err(&i2c->dev, "regmap init failed: %d\n", ret);
>> -               return ret;
>> -       }
>> -
>> -       ret = regmap_add_irq_chip(axp20x->regmap, i2c->irq,
>> +       ret = regmap_add_irq_chip(axp20x->regmap, axp20x->irq,
>>                                   IRQF_ONESHOT | IRQF_SHARED, -1,
>>                                   axp20x->regmap_irq_chip,
>>                                   &axp20x->regmap_irqc);
>>         if (ret) {
>> -               dev_err(&i2c->dev, "failed to add irq chip: %d\n", ret);
>> +               dev_err(axp20x->dev, "failed to add irq chip: %d\n", ret);
>>                 return ret;
>>         }
>>
>> @@ -701,8 +634,8 @@ static int axp20x_i2c_probe(struct i2c_client *i2c,
>>                         axp20x->nr_cells, NULL, 0, NULL);
>>
>>         if (ret) {
>> -               dev_err(&i2c->dev, "failed to add MFD devices: %d\n", ret);
>> -               regmap_del_irq_chip(i2c->irq, axp20x->regmap_irqc);
>> +               dev_err(axp20x->dev, "failed to add MFD devices: %d\n", ret);
>> +               regmap_del_irq_chip(axp20x->irq, axp20x->regmap_irqc);
>>                 return ret;
>>         }
>>
>> @@ -711,38 +644,25 @@ static int axp20x_i2c_probe(struct i2c_client *i2c,
>>                 pm_power_off = axp20x_power_off;
>>         }
>>
>> -       dev_info(&i2c->dev, "AXP20X driver loaded\n");
>> +       dev_info(axp20x->dev, "AXP20X driver loaded\n");
>>
>>         return 0;
>>  }
>> +EXPORT_SYMBOL(axp20x_device_probe);
>>
>> -static int axp20x_i2c_remove(struct i2c_client *i2c)
>> +int axp20x_device_remove(struct axp20x_dev *axp20x)
>>  {
>> -       struct axp20x_dev *axp20x = i2c_get_clientdata(i2c);
>> -
>>         if (axp20x == axp20x_pm_power_off) {
>>                 axp20x_pm_power_off = NULL;
>>                 pm_power_off = NULL;
>>         }
>>
>>         mfd_remove_devices(axp20x->dev);
>> -       regmap_del_irq_chip(axp20x->i2c_client->irq, axp20x->regmap_irqc);
>> +       regmap_del_irq_chip(axp20x->irq, axp20x->regmap_irqc);
>>
>>         return 0;
>>  }
>> -
>> -static struct i2c_driver axp20x_i2c_driver = {
>> -       .driver = {
>> -               .name   = "axp20x",
>> -               .of_match_table = of_match_ptr(axp20x_of_match),
>> -               .acpi_match_table = ACPI_PTR(axp20x_acpi_match),
>> -       },
>> -       .probe          = axp20x_i2c_probe,
>> -       .remove         = axp20x_i2c_remove,
>> -       .id_table       = axp20x_i2c_id,
>> -};
>> -
>> -module_i2c_driver(axp20x_i2c_driver);
>> +EXPORT_SYMBOL(axp20x_device_remove);
>>
>>  MODULE_DESCRIPTION("PMIC MFD core driver for AXP20X");
>>  MODULE_AUTHOR("Carlo Caione <carlo@caione.org>");
>> diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h
>> index b24c771cebd5..908f97f6e2d7 100644
>> --- a/include/linux/mfd/axp20x.h
>> +++ b/include/linux/mfd/axp20x.h
>> @@ -396,7 +396,7 @@ enum axp288_irqs {
>>
>>  struct axp20x_dev {
>>         struct device                   *dev;
>> -       struct i2c_client               *i2c_client;
>> +       int                             irq;
>>         struct regmap                   *regmap;
>>         struct regmap_irq_chip_data     *regmap_irqc;
>>         long                            variant;
>> @@ -462,4 +462,35 @@ static inline int axp20x_read_variable_width(struct regmap *regmap,
>>         return result;
>>  }
>>
>> +/**
>> + * axp20x_match_device(): Setup axp20x variant related fields
>> + *
>> + * @axp20x: axp20x device to setup (.variant field must be set)
>> + * @dev: device associated with this axp20x device
>> + *
>> + * This lets the axp20x core configure the mfd cells and register maps
>> + * for later use.
>> + */
>> +int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev);
>> +
>> +/**
>> + * axp20x_device_probe(): Probe a configured axp20x device
>> + *
>> + * @axp20x: axp20x device to probe (must be configured)
>> + *
>> + * This function lets the axp20x core register the axp20x mfd devices
>> + * and irqchip. The axp20x device passed in must be fully configured
>> + * with axp20x_match_device, its irq set, and regmap created.
>> + */
>> +int axp20x_device_probe(struct axp20x_dev *axp20x);
>> +
>> +/**
>> + * axp20x_device_probe(): Remove a axp20x device
>> + *
>> + * @axp20x: axp20x device to remove
>> + *
>> + * This tells the axp20x core to remove the associated mfd devices
>> + */
>> +int axp20x_device_remove(struct axp20x_dev *axp20x);
>> +
>>  #endif /* __LINUX_MFD_AXP20X_H */
>> --
>> 2.6.2
>>
>> --
>> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
>> the body of a message to majordomo at vger.kernel.org
>> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>> Please read the FAQ at  http://www.tux.org/lkml/
>
>
>
> --
> With Best Regards,
> Andy Shevchenko

Re: [PATCH v4 2/6] mfd: axp20x: Split the driver into core and i2c bits

[Andy Shevchenko]

On Tue, Nov 24, 2015 at 1:28 PM, Chen-Yu Tsai <wens@csie.org> wrote:
> Hi,
>
> On Tue, Nov 24, 2015 at 5:37 PM, Andy Shevchenko
> <andy.shevchenko@gmail.com> wrote:
>> On Tue, Nov 24, 2015 at 5:48 AM, Chen-Yu Tsai <wens@csie.org> wrote:
>>> The axp20x driver assumes the device is i2c based. This is not the
>>> case with later chips, which use a proprietary 2 wire serial bus
>>> by Allwinner called "Reduced Serial Bus".
>>>
>>> This patch follows the example of mfd/wm831x and splits it into
>>> an interface independent core, and an i2c specific glue layer.
>>> MFD_AXP20X and the new MFD_AXP20X_I2C are changed to tristate
>>> symbols, allowing the driver to be built as modules.
>>>
>>> Included but unused header files are removed as well.

So…

>>> +       if (dev->of_node) {
>>
>> What about
>>
>> if (…of_node) {
>>       const struct of_device_id *id;
>> …
>> } else if ACPI_COMPANION(…) {

This should be has_acpi_companion().

>>       const struct acpi_device_id *id;
>> …
>> } else {
>>  return -ENODEV;
>> }
>
> I really don't want to change code that I'm just moving around.
> Same goes for the other comments about this patch. I can do another
> patch on top of this to fix the style issues if it really bothers
> people.

Fair enough.
My comments mostly about unnecessity of second parameter in the functions.

So,  you already did some clean up in this patch (above), what about
to do another? I also prefer separate patch *before* you do a split.

>>> +       axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
>>> +       if (!axp20x)
>>> +               return -ENOMEM;
>>> +
>>> +       ret = axp20x_i2c_match_device(axp20x, &i2c->dev);
>>> +       if (ret)
>>> +               return ret;
>>> +
>>> +       axp20x->dev = &i2c->dev;
>>> +       axp20x->irq = i2c->irq;
>>
>> If you move _match_device() here you will be able to drop away struct
>> device * parameter.

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH v4 2/6] mfd: axp20x: Split the driver into core and i2c bits

[Andy Shevchenko]

On Tue, Nov 24, 2015 at 1:28 PM, Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org> wrote:
> Hi,
>
> On Tue, Nov 24, 2015 at 5:37 PM, Andy Shevchenko
> <andy.shevchenko-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
>> On Tue, Nov 24, 2015 at 5:48 AM, Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org> wrote:
>>> The axp20x driver assumes the device is i2c based. This is not the
>>> case with later chips, which use a proprietary 2 wire serial bus
>>> by Allwinner called "Reduced Serial Bus".
>>>
>>> This patch follows the example of mfd/wm831x and splits it into
>>> an interface independent core, and an i2c specific glue layer.
>>> MFD_AXP20X and the new MFD_AXP20X_I2C are changed to tristate
>>> symbols, allowing the driver to be built as modules.
>>>
>>> Included but unused header files are removed as well.

So…

>>> +       if (dev->of_node) {
>>
>> What about
>>
>> if (…of_node) {
>>       const struct of_device_id *id;
>> …
>> } else if ACPI_COMPANION(…) {

This should be has_acpi_companion().

>>       const struct acpi_device_id *id;
>> …
>> } else {
>>  return -ENODEV;
>> }
>
> I really don't want to change code that I'm just moving around.
> Same goes for the other comments about this patch. I can do another
> patch on top of this to fix the style issues if it really bothers
> people.

Fair enough.
My comments mostly about unnecessity of second parameter in the functions.

So,  you already did some clean up in this patch (above), what about
to do another? I also prefer separate patch *before* you do a split.

>>> +       axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
>>> +       if (!axp20x)
>>> +               return -ENOMEM;
>>> +
>>> +       ret = axp20x_i2c_match_device(axp20x, &i2c->dev);
>>> +       if (ret)
>>> +               return ret;
>>> +
>>> +       axp20x->dev = &i2c->dev;
>>> +       axp20x->irq = i2c->irq;
>>
>> If you move _match_device() here you will be able to drop away struct
>> device * parameter.

-- 
With Best Regards,
Andy Shevchenko
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v4 2/6] mfd: axp20x: Split the driver into core and i2c bits

[Andy Shevchenko]

On Tue, Nov 24, 2015 at 1:28 PM, Chen-Yu Tsai <wens@csie.org> wrote:
> Hi,
>
> On Tue, Nov 24, 2015 at 5:37 PM, Andy Shevchenko
> <andy.shevchenko@gmail.com> wrote:
>> On Tue, Nov 24, 2015 at 5:48 AM, Chen-Yu Tsai <wens@csie.org> wrote:
>>> The axp20x driver assumes the device is i2c based. This is not the
>>> case with later chips, which use a proprietary 2 wire serial bus
>>> by Allwinner called "Reduced Serial Bus".
>>>
>>> This patch follows the example of mfd/wm831x and splits it into
>>> an interface independent core, and an i2c specific glue layer.
>>> MFD_AXP20X and the new MFD_AXP20X_I2C are changed to tristate
>>> symbols, allowing the driver to be built as modules.
>>>
>>> Included but unused header files are removed as well.

So?

>>> +       if (dev->of_node) {
>>
>> What about
>>
>> if (?of_node) {
>>       const struct of_device_id *id;
>> ?
>> } else if ACPI_COMPANION(?) {

This should be has_acpi_companion().

>>       const struct acpi_device_id *id;
>> ?
>> } else {
>>  return -ENODEV;
>> }
>
> I really don't want to change code that I'm just moving around.
> Same goes for the other comments about this patch. I can do another
> patch on top of this to fix the style issues if it really bothers
> people.

Fair enough.
My comments mostly about unnecessity of second parameter in the functions.

So,  you already did some clean up in this patch (above), what about
to do another? I also prefer separate patch *before* you do a split.

>>> +       axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
>>> +       if (!axp20x)
>>> +               return -ENOMEM;
>>> +
>>> +       ret = axp20x_i2c_match_device(axp20x, &i2c->dev);
>>> +       if (ret)
>>> +               return ret;
>>> +
>>> +       axp20x->dev = &i2c->dev;
>>> +       axp20x->irq = i2c->irq;
>>
>> If you move _match_device() here you will be able to drop away struct
>> device * parameter.

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH v4 2/6] mfd: axp20x: Split the driver into core and i2c bits

[Chen-Yu Tsai]

On Tue, Nov 24, 2015 at 8:35 PM, Andy Shevchenko
<andy.shevchenko@gmail.com> wrote:
> On Tue, Nov 24, 2015 at 1:28 PM, Chen-Yu Tsai <wens@csie.org> wrote:
>> Hi,
>>
>> On Tue, Nov 24, 2015 at 5:37 PM, Andy Shevchenko
>> <andy.shevchenko@gmail.com> wrote:
>>> On Tue, Nov 24, 2015 at 5:48 AM, Chen-Yu Tsai <wens@csie.org> wrote:
>>>> The axp20x driver assumes the device is i2c based. This is not the
>>>> case with later chips, which use a proprietary 2 wire serial bus
>>>> by Allwinner called "Reduced Serial Bus".
>>>>
>>>> This patch follows the example of mfd/wm831x and splits it into
>>>> an interface independent core, and an i2c specific glue layer.
>>>> MFD_AXP20X and the new MFD_AXP20X_I2C are changed to tristate
>>>> symbols, allowing the driver to be built as modules.
>>>>
>>>> Included but unused header files are removed as well.
>
> So…
>
>>>> +       if (dev->of_node) {
>>>
>>> What about
>>>
>>> if (…of_node) {
>>>       const struct of_device_id *id;
>>> …
>>> } else if ACPI_COMPANION(…) {
>
> This should be has_acpi_companion().

I don't think the "else if" is necessary. There's only 2 possible ways
the device gets probed, either device tree or ACPI.

>>>       const struct acpi_device_id *id;
>>> …
>>> } else {
>>>  return -ENODEV;
>>> }
>>
>> I really don't want to change code that I'm just moving around.
>> Same goes for the other comments about this patch. I can do another
>> patch on top of this to fix the style issues if it really bothers
>> people.
>
> Fair enough.
> My comments mostly about unnecessity of second parameter in the functions.
>
> So,  you already did some clean up in this patch (above), what about
> to do another? I also prefer separate patch *before* you do a split.

Sure. I'll do a patch or 2 before the split. Would you mind if I add your
Suggested-by tag?


Regards
ChenYu

>>>> +       axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
>>>> +       if (!axp20x)
>>>> +               return -ENOMEM;
>>>> +
>>>> +       ret = axp20x_i2c_match_device(axp20x, &i2c->dev);
>>>> +       if (ret)
>>>> +               return ret;
>>>> +
>>>> +       axp20x->dev = &i2c->dev;
>>>> +       axp20x->irq = i2c->irq;
>>>
>>> If you move _match_device() here you will be able to drop away struct
>>> device * parameter.
>
> --
> With Best Regards,
> Andy Shevchenko

Re: [PATCH v4 2/6] mfd: axp20x: Split the driver into core and i2c bits

[Chen-Yu Tsai]

On Tue, Nov 24, 2015 at 8:35 PM, Andy Shevchenko
<andy.shevchenko-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> On Tue, Nov 24, 2015 at 1:28 PM, Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org> wrote:
>> Hi,
>>
>> On Tue, Nov 24, 2015 at 5:37 PM, Andy Shevchenko
>> <andy.shevchenko-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
>>> On Tue, Nov 24, 2015 at 5:48 AM, Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org> wrote:
>>>> The axp20x driver assumes the device is i2c based. This is not the
>>>> case with later chips, which use a proprietary 2 wire serial bus
>>>> by Allwinner called "Reduced Serial Bus".
>>>>
>>>> This patch follows the example of mfd/wm831x and splits it into
>>>> an interface independent core, and an i2c specific glue layer.
>>>> MFD_AXP20X and the new MFD_AXP20X_I2C are changed to tristate
>>>> symbols, allowing the driver to be built as modules.
>>>>
>>>> Included but unused header files are removed as well.
>
> So…
>
>>>> +       if (dev->of_node) {
>>>
>>> What about
>>>
>>> if (…of_node) {
>>>       const struct of_device_id *id;
>>> …
>>> } else if ACPI_COMPANION(…) {
>
> This should be has_acpi_companion().

I don't think the "else if" is necessary. There's only 2 possible ways
the device gets probed, either device tree or ACPI.

>>>       const struct acpi_device_id *id;
>>> …
>>> } else {
>>>  return -ENODEV;
>>> }
>>
>> I really don't want to change code that I'm just moving around.
>> Same goes for the other comments about this patch. I can do another
>> patch on top of this to fix the style issues if it really bothers
>> people.
>
> Fair enough.
> My comments mostly about unnecessity of second parameter in the functions.
>
> So,  you already did some clean up in this patch (above), what about
> to do another? I also prefer separate patch *before* you do a split.

Sure. I'll do a patch or 2 before the split. Would you mind if I add your
Suggested-by tag?


Regards
ChenYu

>>>> +       axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
>>>> +       if (!axp20x)
>>>> +               return -ENOMEM;
>>>> +
>>>> +       ret = axp20x_i2c_match_device(axp20x, &i2c->dev);
>>>> +       if (ret)
>>>> +               return ret;
>>>> +
>>>> +       axp20x->dev = &i2c->dev;
>>>> +       axp20x->irq = i2c->irq;
>>>
>>> If you move _match_device() here you will be able to drop away struct
>>> device * parameter.
>
> --
> With Best Regards,
> Andy Shevchenko

-- 
You received this message because you are subscribed to the Google Groups "linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
For more options, visit https://groups.google.com/d/optout.

[PATCH v4 2/6] mfd: axp20x: Split the driver into core and i2c bits

[Chen-Yu Tsai]

On Tue, Nov 24, 2015 at 8:35 PM, Andy Shevchenko
<andy.shevchenko@gmail.com> wrote:
> On Tue, Nov 24, 2015 at 1:28 PM, Chen-Yu Tsai <wens@csie.org> wrote:
>> Hi,
>>
>> On Tue, Nov 24, 2015 at 5:37 PM, Andy Shevchenko
>> <andy.shevchenko@gmail.com> wrote:
>>> On Tue, Nov 24, 2015 at 5:48 AM, Chen-Yu Tsai <wens@csie.org> wrote:
>>>> The axp20x driver assumes the device is i2c based. This is not the
>>>> case with later chips, which use a proprietary 2 wire serial bus
>>>> by Allwinner called "Reduced Serial Bus".
>>>>
>>>> This patch follows the example of mfd/wm831x and splits it into
>>>> an interface independent core, and an i2c specific glue layer.
>>>> MFD_AXP20X and the new MFD_AXP20X_I2C are changed to tristate
>>>> symbols, allowing the driver to be built as modules.
>>>>
>>>> Included but unused header files are removed as well.
>
> So?
>
>>>> +       if (dev->of_node) {
>>>
>>> What about
>>>
>>> if (?of_node) {
>>>       const struct of_device_id *id;
>>> ?
>>> } else if ACPI_COMPANION(?) {
>
> This should be has_acpi_companion().

I don't think the "else if" is necessary. There's only 2 possible ways
the device gets probed, either device tree or ACPI.

>>>       const struct acpi_device_id *id;
>>> ?
>>> } else {
>>>  return -ENODEV;
>>> }
>>
>> I really don't want to change code that I'm just moving around.
>> Same goes for the other comments about this patch. I can do another
>> patch on top of this to fix the style issues if it really bothers
>> people.
>
> Fair enough.
> My comments mostly about unnecessity of second parameter in the functions.
>
> So,  you already did some clean up in this patch (above), what about
> to do another? I also prefer separate patch *before* you do a split.

Sure. I'll do a patch or 2 before the split. Would you mind if I add your
Suggested-by tag?


Regards
ChenYu

>>>> +       axp20x = devm_kzalloc(&i2c->dev, sizeof(*axp20x), GFP_KERNEL);
>>>> +       if (!axp20x)
>>>> +               return -ENOMEM;
>>>> +
>>>> +       ret = axp20x_i2c_match_device(axp20x, &i2c->dev);
>>>> +       if (ret)
>>>> +               return ret;
>>>> +
>>>> +       axp20x->dev = &i2c->dev;
>>>> +       axp20x->irq = i2c->irq;
>>>
>>> If you move _match_device() here you will be able to drop away struct
>>> device * parameter.
>
> --
> With Best Regards,
> Andy Shevchenko

Re: [PATCH v4 2/6] mfd: axp20x: Split the driver into core and i2c bits

[Andy Shevchenko]

On Tue, Nov 24, 2015 at 5:09 PM, Chen-Yu Tsai <wens@csie.org> wrote:
> On Tue, Nov 24, 2015 at 8:35 PM, Andy Shevchenko
> <andy.shevchenko@gmail.com> wrote:
>> On Tue, Nov 24, 2015 at 1:28 PM, Chen-Yu Tsai <wens@csie.org> wrote:
>>> On Tue, Nov 24, 2015 at 5:37 PM, Andy Shevchenko
>>> <andy.shevchenko@gmail.com> wrote:
>>>> On Tue, Nov 24, 2015 at 5:48 AM, Chen-Yu Tsai <wens@csie.org> wrote:
>>>>> The axp20x driver assumes the device is i2c based. This is not the
>>>>> case with later chips, which use a proprietary 2 wire serial bus
>>>>> by Allwinner called "Reduced Serial Bus".
>>>>>
>>>>> This patch follows the example of mfd/wm831x and splits it into
>>>>> an interface independent core, and an i2c specific glue layer.
>>>>> MFD_AXP20X and the new MFD_AXP20X_I2C are changed to tristate
>>>>> symbols, allowing the driver to be built as modules.
>>>>>
>>>>> Included but unused header files are removed as well.
>>
>> So…
>>
>>>>> +       if (dev->of_node) {
>>>>
>>>> What about
>>>>
>>>> if (…of_node) {
>>>>       const struct of_device_id *id;
>>>> …
>>>> } else if ACPI_COMPANION(…) {
>>
>> This should be has_acpi_companion().
>
> I don't think the "else if" is necessary. There's only 2 possible ways
> the device gets probed, either device tree or ACPI.

OK.

It would be ideal to move to unified device properties API at some
point, but it's out of scope of this series anyway.

>
>>>>       const struct acpi_device_id *id;
>>>> …
>>>> } else {
>>>>  return -ENODEV;
>>>> }
>>>
>>> I really don't want to change code that I'm just moving around.
>>> Same goes for the other comments about this patch. I can do another
>>> patch on top of this to fix the style issues if it really bothers
>>> people.
>>
>> Fair enough.
>> My comments mostly about unnecessity of second parameter in the functions.
>>
>> So,  you already did some clean up in this patch (above), what about
>> to do another? I also prefer separate patch *before* you do a split.
>
> Sure. I'll do a patch or 2 before the split. Would you mind if I add your
> Suggested-by tag?

I would not.

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH v4 2/6] mfd: axp20x: Split the driver into core and i2c bits

[Andy Shevchenko]

On Tue, Nov 24, 2015 at 5:09 PM, Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org> wrote:
> On Tue, Nov 24, 2015 at 8:35 PM, Andy Shevchenko
> <andy.shevchenko-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
>> On Tue, Nov 24, 2015 at 1:28 PM, Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org> wrote:
>>> On Tue, Nov 24, 2015 at 5:37 PM, Andy Shevchenko
>>> <andy.shevchenko-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
>>>> On Tue, Nov 24, 2015 at 5:48 AM, Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org> wrote:
>>>>> The axp20x driver assumes the device is i2c based. This is not the
>>>>> case with later chips, which use a proprietary 2 wire serial bus
>>>>> by Allwinner called "Reduced Serial Bus".
>>>>>
>>>>> This patch follows the example of mfd/wm831x and splits it into
>>>>> an interface independent core, and an i2c specific glue layer.
>>>>> MFD_AXP20X and the new MFD_AXP20X_I2C are changed to tristate
>>>>> symbols, allowing the driver to be built as modules.
>>>>>
>>>>> Included but unused header files are removed as well.
>>
>> So…
>>
>>>>> +       if (dev->of_node) {
>>>>
>>>> What about
>>>>
>>>> if (…of_node) {
>>>>       const struct of_device_id *id;
>>>> …
>>>> } else if ACPI_COMPANION(…) {
>>
>> This should be has_acpi_companion().
>
> I don't think the "else if" is necessary. There's only 2 possible ways
> the device gets probed, either device tree or ACPI.

OK.

It would be ideal to move to unified device properties API at some
point, but it's out of scope of this series anyway.

>
>>>>       const struct acpi_device_id *id;
>>>> …
>>>> } else {
>>>>  return -ENODEV;
>>>> }
>>>
>>> I really don't want to change code that I'm just moving around.
>>> Same goes for the other comments about this patch. I can do another
>>> patch on top of this to fix the style issues if it really bothers
>>> people.
>>
>> Fair enough.
>> My comments mostly about unnecessity of second parameter in the functions.
>>
>> So,  you already did some clean up in this patch (above), what about
>> to do another? I also prefer separate patch *before* you do a split.
>
> Sure. I'll do a patch or 2 before the split. Would you mind if I add your
> Suggested-by tag?

I would not.

-- 
With Best Regards,
Andy Shevchenko

-- 
You received this message because you are subscribed to the Google Groups "linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
For more options, visit https://groups.google.com/d/optout.

[PATCH v4 2/6] mfd: axp20x: Split the driver into core and i2c bits

[Andy Shevchenko]

On Tue, Nov 24, 2015 at 5:09 PM, Chen-Yu Tsai <wens@csie.org> wrote:
> On Tue, Nov 24, 2015 at 8:35 PM, Andy Shevchenko
> <andy.shevchenko@gmail.com> wrote:
>> On Tue, Nov 24, 2015 at 1:28 PM, Chen-Yu Tsai <wens@csie.org> wrote:
>>> On Tue, Nov 24, 2015 at 5:37 PM, Andy Shevchenko
>>> <andy.shevchenko@gmail.com> wrote:
>>>> On Tue, Nov 24, 2015 at 5:48 AM, Chen-Yu Tsai <wens@csie.org> wrote:
>>>>> The axp20x driver assumes the device is i2c based. This is not the
>>>>> case with later chips, which use a proprietary 2 wire serial bus
>>>>> by Allwinner called "Reduced Serial Bus".
>>>>>
>>>>> This patch follows the example of mfd/wm831x and splits it into
>>>>> an interface independent core, and an i2c specific glue layer.
>>>>> MFD_AXP20X and the new MFD_AXP20X_I2C are changed to tristate
>>>>> symbols, allowing the driver to be built as modules.
>>>>>
>>>>> Included but unused header files are removed as well.
>>
>> So?
>>
>>>>> +       if (dev->of_node) {
>>>>
>>>> What about
>>>>
>>>> if (?of_node) {
>>>>       const struct of_device_id *id;
>>>> ?
>>>> } else if ACPI_COMPANION(?) {
>>
>> This should be has_acpi_companion().
>
> I don't think the "else if" is necessary. There's only 2 possible ways
> the device gets probed, either device tree or ACPI.

OK.

It would be ideal to move to unified device properties API at some
point, but it's out of scope of this series anyway.

>
>>>>       const struct acpi_device_id *id;
>>>> ?
>>>> } else {
>>>>  return -ENODEV;
>>>> }
>>>
>>> I really don't want to change code that I'm just moving around.
>>> Same goes for the other comments about this patch. I can do another
>>> patch on top of this to fix the style issues if it really bothers
>>> people.
>>
>> Fair enough.
>> My comments mostly about unnecessity of second parameter in the functions.
>>
>> So,  you already did some clean up in this patch (above), what about
>> to do another? I also prefer separate patch *before* you do a split.
>
> Sure. I'll do a patch or 2 before the split. Would you mind if I add your
> Suggested-by tag?

I would not.

-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH v4 1/6] mfd: axp20x: Add AXP223 to list of supported PMICs in DT bindings

[Lee Jones]

On Tue, 24 Nov 2015, Chen-Yu Tsai wrote:

> The AXP223 is a new PMIC commonly paired with Allwinner A23/A33 SoCs.
> It is functionally identical to AXP221; only the regulator default
> voltage/status and the external host interface are different.
> 
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Acked-by: Rob Herring <robh@kernel.org>
> ---
>  Documentation/devicetree/bindings/mfd/axp20x.txt | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)

For my own reference:
  Acked-by: Lee Jones <lee.jones@linaro.org>

> diff --git a/Documentation/devicetree/bindings/mfd/axp20x.txt b/Documentation/devicetree/bindings/mfd/axp20x.txt
> index a474359dd206..fd39fa54571b 100644
> --- a/Documentation/devicetree/bindings/mfd/axp20x.txt
> +++ b/Documentation/devicetree/bindings/mfd/axp20x.txt
> @@ -5,11 +5,12 @@ axp152 (X-Powers)
>  axp202 (X-Powers)
>  axp209 (X-Powers)
>  axp221 (X-Powers)
> +axp223 (X-Powers)
>  
>  Required properties:
>  - compatible: "x-powers,axp152", "x-powers,axp202", "x-powers,axp209",
> -	      "x-powers,axp221"
> -- reg: The I2C slave address for the AXP chip
> +	      "x-powers,axp221", "x-powers,axp223"
> +- reg: The I2C slave address or RSB hardware address for the AXP chip
>  - interrupt-parent: The parent interrupt controller
>  - interrupts: SoC NMI / GPIO interrupt connected to the PMIC's IRQ pin
>  - interrupt-controller: The PMIC has its own internal IRQs
> @@ -51,7 +52,7 @@ LDO3		: LDO		: ldo3in-supply
>  LDO4		: LDO		: ldo24in-supply	: shared supply
>  LDO5		: LDO		: ldo5in-supply
>  
> -AXP221 regulators, type, and corresponding input supply names:
> +AXP221/AXP223 regulators, type, and corresponding input supply names:
>  
>  Regulator	  Type		  Supply Name		  Notes
>  ---------	  ----		  -----------		  -----

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

Re: [PATCH v4 1/6] mfd: axp20x: Add AXP223 to list of supported PMICs in DT bindings

[Lee Jones]

On Tue, 24 Nov 2015, Chen-Yu Tsai wrote:

> The AXP223 is a new PMIC commonly paired with Allwinner A23/A33 SoCs.
> It is functionally identical to AXP221; only the regulator default
> voltage/status and the external host interface are different.
> 
> Signed-off-by: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>
> Acked-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
> Acked-by: Rob Herring <robh-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>
> ---
>  Documentation/devicetree/bindings/mfd/axp20x.txt | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)

For my own reference:
  Acked-by: Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>

> diff --git a/Documentation/devicetree/bindings/mfd/axp20x.txt b/Documentation/devicetree/bindings/mfd/axp20x.txt
> index a474359dd206..fd39fa54571b 100644
> --- a/Documentation/devicetree/bindings/mfd/axp20x.txt
> +++ b/Documentation/devicetree/bindings/mfd/axp20x.txt
> @@ -5,11 +5,12 @@ axp152 (X-Powers)
>  axp202 (X-Powers)
>  axp209 (X-Powers)
>  axp221 (X-Powers)
> +axp223 (X-Powers)
>  
>  Required properties:
>  - compatible: "x-powers,axp152", "x-powers,axp202", "x-powers,axp209",
> -	      "x-powers,axp221"
> -- reg: The I2C slave address for the AXP chip
> +	      "x-powers,axp221", "x-powers,axp223"
> +- reg: The I2C slave address or RSB hardware address for the AXP chip
>  - interrupt-parent: The parent interrupt controller
>  - interrupts: SoC NMI / GPIO interrupt connected to the PMIC's IRQ pin
>  - interrupt-controller: The PMIC has its own internal IRQs
> @@ -51,7 +52,7 @@ LDO3		: LDO		: ldo3in-supply
>  LDO4		: LDO		: ldo24in-supply	: shared supply
>  LDO5		: LDO		: ldo5in-supply
>  
> -AXP221 regulators, type, and corresponding input supply names:
> +AXP221/AXP223 regulators, type, and corresponding input supply names:
>  
>  Regulator	  Type		  Supply Name		  Notes
>  ---------	  ----		  -----------		  -----

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

-- 
You received this message because you are subscribed to the Google Groups "linux-sunxi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org
For more options, visit https://groups.google.com/d/optout.

[PATCH v4 1/6] mfd: axp20x: Add AXP223 to list of supported PMICs in DT bindings

[Lee Jones]

On Tue, 24 Nov 2015, Chen-Yu Tsai wrote:

> The AXP223 is a new PMIC commonly paired with Allwinner A23/A33 SoCs.
> It is functionally identical to AXP221; only the regulator default
> voltage/status and the external host interface are different.
> 
> Signed-off-by: Chen-Yu Tsai <wens@csie.org>
> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com>
> Acked-by: Rob Herring <robh@kernel.org>
> ---
>  Documentation/devicetree/bindings/mfd/axp20x.txt | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)

For my own reference:
  Acked-by: Lee Jones <lee.jones@linaro.org>

> diff --git a/Documentation/devicetree/bindings/mfd/axp20x.txt b/Documentation/devicetree/bindings/mfd/axp20x.txt
> index a474359dd206..fd39fa54571b 100644
> --- a/Documentation/devicetree/bindings/mfd/axp20x.txt
> +++ b/Documentation/devicetree/bindings/mfd/axp20x.txt
> @@ -5,11 +5,12 @@ axp152 (X-Powers)
>  axp202 (X-Powers)
>  axp209 (X-Powers)
>  axp221 (X-Powers)
> +axp223 (X-Powers)
>  
>  Required properties:
>  - compatible: "x-powers,axp152", "x-powers,axp202", "x-powers,axp209",
> -	      "x-powers,axp221"
> -- reg: The I2C slave address for the AXP chip
> +	      "x-powers,axp221", "x-powers,axp223"
> +- reg: The I2C slave address or RSB hardware address for the AXP chip
>  - interrupt-parent: The parent interrupt controller
>  - interrupts: SoC NMI / GPIO interrupt connected to the PMIC's IRQ pin
>  - interrupt-controller: The PMIC has its own internal IRQs
> @@ -51,7 +52,7 @@ LDO3		: LDO		: ldo3in-supply
>  LDO4		: LDO		: ldo24in-supply	: shared supply
>  LDO5		: LDO		: ldo5in-supply
>  
> -AXP221 regulators, type, and corresponding input supply names:
> +AXP221/AXP223 regulators, type, and corresponding input supply names:
>  
>  Regulator	  Type		  Supply Name		  Notes
>  ---------	  ----		  -----------		  -----

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