[PATCH v8 0/2] mfd: act8945a: add Active-semi ACT8945A PMIC MFD driver

This patch set adds support for the Active-semi ACT8945A PMIC
MFD driver. It is a Multi Function Device with the following
subdevices:
 - Regulator
 - Charger

It is interfaced to the host controller using I2C interface,
ACT8945A is a child device of the I2C.

Changes in v8:
 - change the subdevice's name "act8945a-pmic" to "act8945a-regulator".

Changes in v7:
 - remove struct act8945a_dev to .c file.
 - remove unused .h file.
 - collect Acked-by from Lee Jones

Changes in v6:
 - change MFD_ACT8945A type from bool to tristate.
 - revert depends on to 'I2C'.
 - change the regulator name.

Changes in v5:
 - change depends on to 'I2C=y'.

Changes in v4:
 - add a space before .compatible.
 - collect Reviewed-by from Krzysztof Kozlowski.

Changes in v3:
 - fix the tabbing errors in Example.
 - use "pmic at 5b" label, not "act8945a at 5b" in Example.
 - collect Acked-by from Rob.

Changes in v2:
 - add more help information in Kconfig.
 - update the file header with short version license and author line.
 - remove unused structure members (dev, i2c_client) of stuct act8945a_dev.
 - use define "PLATFORM_DEVID_NONE" for mfd_add_devices(), instead of '-1'.
 - use more explicit info to indicate the failure to add sub devices.
 - remove the unnecessary print out.
 - substitute MODULE_LICENSE("GPL") for MODULE_LICENSE("GPL v2").
 - use more specific label in Example.
 - add pmic and charger nodes in Example.

Wenyou Yang (2):
  mfd: act8945a: add Active-semi ACT8945A PMIC MFD driver
  mfd: add documentation for ACT8945A DT bindings

 Documentation/devicetree/bindings/mfd/act8945a.txt |   82 ++++++++++++++
 drivers/mfd/Kconfig                                |   11 ++
 drivers/mfd/Makefile                               |    1 +
 drivers/mfd/act8945a.c                             |  112 ++++++++++++++++++++
 4 files changed, 206 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/mfd/act8945a.txt
 create mode 100644 drivers/mfd/act8945a.c

-- 
1.7.9.5

This patch adds support for the Active-semi ACT8945A PMIC.
It is a Multi Function Device with the following subdevices:
 - Regulator
 - Charger

It is interfaced to the host controller using I2C interface,
ACT8945A is a child device of the I2C.

Signed-off-by: Wenyou Yang <redacted>
Reviewed-by: Krzysztof Kozlowski <redacted>
---

Changes in v8:
 - change the subdevice's name "act8945a-pmic" to "act8945a-regulator".

Changes in v7:
 - remove struct act8945a_dev to .c file.
 - remove unused .h file.

Changes in v6:
 - change MFD_ACT8945A type from bool to tristate.
 - revert depends on to 'I2C'.

Changes in v5:
 - change depends on to 'I2C=y'.

Changes in v4:
 - add a space before .compatible.
 - collect Reviewed-by from Krzysztof Kozlowski.

Changes in v3: None
Changes in v2:
 - add more help information in Kconfig.
 - update the file header with short version license and author line.
 - remove unused structure members (dev, i2c_client) of stuct act8945a_dev.
 - use define "PLATFORM_DEVID_NONE" for mfd_add_devices(), instead of '-1'.
 - use more explicit info to indicate the failure to add sub devices.
 - remove the unnecessary print out.
 - substitute MODULE_LICENSE("GPL") for MODULE_LICENSE("GPL v2").

 drivers/mfd/Kconfig    |   11 +++++
 drivers/mfd/Makefile   |    1 +
 drivers/mfd/act8945a.c |  112 ++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 124 insertions(+)
 create mode 100644 drivers/mfd/act8945a.c

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 6c4ebd9..38994bb 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig

@@ -18,6 +18,17 @@ config MFD_CS5535
 	  This is the core driver for CS5535/CS5536 MFD functions.  This is
           necessary for using the board's GPIO and MFGPT functionality.
 
+config MFD_ACT8945A
+	tristate "Active-semi ACT8945A"
+	select MFD_CORE
+	select REGMAP_I2C
+	depends on I2C && OF
+	help
+	  Support for the ACT8945A PMIC from Active-semi. This device
+	  features three step-down DC/DC converters and four low-dropout
+	  linear regulators, along with a complete ActivePath battery
+	  charger.
+
 config MFD_AS3711
 	bool "AMS AS3711"
 	select MFD_CORE

diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 0f230a6..2f1ca82 100644
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile

@@ -6,6 +6,7 @@
 obj-$(CONFIG_MFD_88PM860X)	+= 88pm860x.o
 obj-$(CONFIG_MFD_88PM800)	+= 88pm800.o 88pm80x.o
 obj-$(CONFIG_MFD_88PM805)	+= 88pm805.o 88pm80x.o
+obj-$(CONFIG_MFD_ACT8945A)	+= act8945a.o
 obj-$(CONFIG_MFD_SM501)		+= sm501.o
 obj-$(CONFIG_MFD_ASIC3)		+= asic3.o tmio_core.o
 obj-$(CONFIG_MFD_BCM590XX)	+= bcm590xx.o

diff --git a/drivers/mfd/act8945a.c b/drivers/mfd/act8945a.c
new file mode 100644
index 0000000..3a37611
--- /dev/null
+++ b/drivers/mfd/act8945a.c

@@ -0,0 +1,112 @@
+/*
+ * MFD driver for Active-semi ACT8945a PMIC
+ *
+ * Copyright (C) 2015 Atmel Corporation.
+ *
+ * Author: Wenyou Yang <wenyou.yang@atmel.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under  the terms of the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/i2c.h>
+#include <linux/mfd/core.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/regmap.h>
+
+struct act8945a_dev {
+	struct regmap *regmap;
+};
+
+static const struct mfd_cell act8945a_devs[] = {
+	{
+		.name = "act8945a-regulator",
+		.of_compatible = "active-semi,act8945a-regulator",
+	},
+	{
+		.name = "act8945a-charger",
+		.of_compatible = "active-semi,act8945a-charger",
+	},
+};
+
+static const struct regmap_config act8945a_regmap_config = {
+	.reg_bits = 8,
+	.val_bits = 8,
+};
+
+static int act8945a_i2c_probe(struct i2c_client *i2c,
+			      const struct i2c_device_id *id)
+{
+	struct act8945a_dev *act8945a;
+	int ret;
+
+	act8945a = devm_kzalloc(&i2c->dev, sizeof(*act8945a), GFP_KERNEL);
+	if (!act8945a)
+		return -ENOMEM;
+
+	i2c_set_clientdata(i2c, act8945a);
+
+	act8945a->regmap = devm_regmap_init_i2c(i2c, &act8945a_regmap_config);
+	if (IS_ERR(act8945a->regmap)) {
+		ret = PTR_ERR(act8945a->regmap);
+		dev_err(&i2c->dev, "regmap init failed: %d\n", ret);
+		return ret;
+	}
+
+	ret = mfd_add_devices(&i2c->dev, PLATFORM_DEVID_NONE, act8945a_devs,
+			      ARRAY_SIZE(act8945a_devs), NULL, 0, NULL);
+	if (ret) {
+		dev_err(&i2c->dev, "Failed to add sub devices\n");
+		return ret;
+	}
+
+	return 0;
+}
+
+static int act8945a_i2c_remove(struct i2c_client *i2c)
+{
+	mfd_remove_devices(&i2c->dev);
+
+	return 0;
+}
+
+static const struct i2c_device_id act8945a_i2c_id[] = {
+	{ "act8945a", 0 },
+	{}
+};
+MODULE_DEVICE_TABLE(i2c, act8945a_i2c_id);
+
+static const struct of_device_id act8945a_of_match[] = {
+	{ .compatible = "active-semi,act8945a", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, act8945a_of_match);
+
+static struct i2c_driver act8945a_i2c_driver = {
+	.driver = {
+		   .name = "act8945a",
+		   .of_match_table = of_match_ptr(act8945a_of_match),
+	},
+	.probe = act8945a_i2c_probe,
+	.remove = act8945a_i2c_remove,
+	.id_table = act8945a_i2c_id,
+};
+
+static int __init act8945a_i2c_init(void)
+{
+	return i2c_add_driver(&act8945a_i2c_driver);
+}
+subsys_initcall(act8945a_i2c_init);
+
+static void __exit act8945a_i2c_exit(void)
+{
+	i2c_del_driver(&act8945a_i2c_driver);
+}
+module_exit(act8945a_i2c_exit);
+
+MODULE_DESCRIPTION("ACT8945A PMIC multi-function driver");
+MODULE_AUTHOR("Wenyou Yang <wenyou.yang@atmel.com>");
+MODULE_LICENSE("GPL");

-- 
1.7.9.5

The Active-semi ACT8945A PMIC is a Multi-Function Device, it has
two subdevices:
 - Regulator
 - Charger

This patch adds documentation for ACT8945A DT bindings.

Signed-off-by: Wenyou Yang <redacted>
Acked-by: Rob Herring <robh@kernel.org>
Acked-by: Lee Jones <redacted>
---

Changes in v8: None
Changes in v7:
 - collect Acked-by from Lee Jones

Changes in v6:
 - change the regulator name.

Changes in v5: None
Changes in v4: None
Changes in v3:
 - fix the tabbing errors in Example.
 - use "pmic at 5b" label, not "act8945a at 5b" in Example.
 - collect Acked-by from Rob.

Changes in v2:
 - use more specific label in Example.
 - add pmic and charger nodes in Example.

 Documentation/devicetree/bindings/mfd/act8945a.txt |   82 ++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/mfd/act8945a.txt

diff --git a/Documentation/devicetree/bindings/mfd/act8945a.txt b/Documentation/devicetree/bindings/mfd/act8945a.txt
new file mode 100644
index 0000000..f2a8387
--- /dev/null
+++ b/Documentation/devicetree/bindings/mfd/act8945a.txt

@@ -0,0 +1,82 @@
+Device-Tree bindings for Active-semi ACT8945A MFD driver
+
+Required properties:
+ - compatible: "active-semi,act8945a".
+ - reg: the I2C slave address for the ACT8945A chip
+
+The chip exposes two subdevices:
+ - a regulators: see ../regulator/act8945a-regulator.txt
+ - a charger: see ../power/act8945a-charger.txt
+
+Example:
+	pmic at 5b {
+		compatible = "active-semi,act8945a";
+		reg = <0x5b>;
+		status = "okay";
+
+		pmic {
+			compatible = "active-semi,act8945a-regulator";
+			active-semi,vsel-high;
+
+			regulators {
+				vdd_1v35_reg: REG_DCDC1 {
+					regulator-name = "VDD_1V35";
+					regulator-min-microvolt = <1350000>;
+					regulator-max-microvolt = <1350000>;
+					regulator-always-on;
+				};
+
+				vdd_1v2_reg: REG_DCDC2 {
+					regulator-name = "VDD_1V2";
+					regulator-min-microvolt = <1100000>;
+					regulator-max-microvolt = <1300000>;
+					regulator-always-on;
+				};
+
+				vdd_3v3_reg: REG_DCDC3 {
+					regulator-name = "VDD_3V3";
+					regulator-min-microvolt = <3300000>;
+					regulator-max-microvolt = <3300000>;
+					regulator-always-on;
+				};
+
+				vdd_fuse_reg: REG_LDO1 {
+					regulator-name = "VDD_FUSE";
+					regulator-min-microvolt = <2500000>;
+					regulator-max-microvolt = <2500000>;
+					regulator-always-on;
+				};
+
+				vdd_3v3_lp_reg: REG_LDO2 {
+					regulator-name = "VDD_3V3_LP";
+					regulator-min-microvolt = <3300000>;
+					regulator-max-microvolt = <3300000>;
+					regulator-always-on;
+				};
+
+				vdd_led_reg: REG_LDO3 {
+					regulator-name = "VDD_LED";
+					regulator-min-microvolt = <3300000>;
+					regulator-max-microvolt = <3300000>;
+					regulator-always-on;
+				};
+
+				vdd_sdhc_1v8_reg: REG_LDO4 {
+					regulator-name = "VDD_SDHC_1V8";
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <1800000>;
+					regulator-always-on;
+				};
+			};
+		};
+
+		charger {
+			compatible = "active-semi,act8945a-charger";
+			pinctrl-names = "default";
+			pinctrl-0 = <&pinctrl_charger_chglev>;
+			active-semi,chglev-gpio = <&pioA 12 GPIO_ACTIVE_HIGH>;
+			active-semi,input_voltage_threshold = <6600>;
+			active-semi,precondition_timeout = <40>;
+			active-semi,total_timeout = <3>;
+		};
+	};

-- 
1.7.9.5

On Wed, 27 Jan 2016, Wenyou Yang wrote:

This patch adds support for the Active-semi ACT8945A PMIC.
It is a Multi Function Device with the following subdevices:
 - Regulator
 - Charger

It is interfaced to the host controller using I2C interface,
ACT8945A is a child device of the I2C.

Signed-off-by: Wenyou Yang <redacted>
Reviewed-by: Krzysztof Kozlowski <redacted>

Can I take the MFD patches in separately?

For my own reference:
  Acked-by: Lee Jones [off-list ref]

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

Hi Lee,

-----Original Message-----
From: Lee Jones [mailto:lee.jones at linaro.org]
Sent: 2016?1?27? 15:28
To: Yang, Wenyou <redacted>
Cc: Rob Herring <robh+dt@kernel.org>; Pawel Moll <redacted>;
Mark Rutland [off-list ref]; Ian Campbell
[off-list ref]; Kumar Gala [off-list ref]; Javier
Martinez Canillas [off-list ref]; Krzysztof Kozlowski
[off-list ref]; Peter Korsgaard [off-list ref]; Ferre,
Nicolas [off-list ref]; linux-arm-kernel at lists.infradead.org;
linux-kernel at vger.kernel.org; devicetree at vger.kernel.org
Subject: Re: [PATCH v8 1/2] mfd: act8945a: add Active-semi ACT8945A PMIC
MFD driver

On Wed, 27 Jan 2016, Wenyou Yang wrote:

quoted

This patch adds support for the Active-semi ACT8945A PMIC.
It is a Multi Function Device with the following subdevices:
 - Regulator
 - Charger

It is interfaced to the host controller using I2C interface, ACT8945A
is a child device of the I2C.

Signed-off-by: Wenyou Yang <redacted>
Reviewed-by: Krzysztof Kozlowski <redacted>

Can I take the MFD patches in separately?

Yes, you can, I think.

For my own reference:
  Acked-by: Lee Jones [off-list ref]

Thank you for your Acked.

quoted

---

Changes in v8:
 - change the subdevice's name "act8945a-pmic" to "act8945a-regulator".

Changes in v7:
 - remove struct act8945a_dev to .c file.
 - remove unused .h file.

Changes in v6:
 - change MFD_ACT8945A type from bool to tristate.
 - revert depends on to 'I2C'.

Changes in v5:
 - change depends on to 'I2C=y'.

Changes in v4:
 - add a space before .compatible.
 - collect Reviewed-by from Krzysztof Kozlowski.

Changes in v3: None
Changes in v2:
 - add more help information in Kconfig.
 - update the file header with short version license and author line.
 - remove unused structure members (dev, i2c_client) of stuct act8945a_dev.
 - use define "PLATFORM_DEVID_NONE" for mfd_add_devices(), instead of '-1'.
 - use more explicit info to indicate the failure to add sub devices.
 - remove the unnecessary print out.
 - substitute MODULE_LICENSE("GPL") for MODULE_LICENSE("GPL v2").

 drivers/mfd/Kconfig    |   11 +++++
 drivers/mfd/Makefile   |    1 +
 drivers/mfd/act8945a.c |  112
++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 124 insertions(+)
 create mode 100644 drivers/mfd/act8945a.c

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index

6c4ebd9..38994bb 100644

--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig

@@ -18,6 +18,17 @@ config MFD_CS5535
 	  This is the core driver for CS5535/CS5536 MFD functions.  This is
           necessary for using the board's GPIO and MFGPT functionality.

+config MFD_ACT8945A
+	tristate "Active-semi ACT8945A"
+	select MFD_CORE
+	select REGMAP_I2C
+	depends on I2C && OF
+	help
+	  Support for the ACT8945A PMIC from Active-semi. This device
+	  features three step-down DC/DC converters and four low-dropout
+	  linear regulators, along with a complete ActivePath battery
+	  charger.
+
 config MFD_AS3711
 	bool "AMS AS3711"
 	select MFD_CORE

diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index

0f230a6..2f1ca82 100644

--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile

@@ -6,6 +6,7 @@
 obj-$(CONFIG_MFD_88PM860X)	+= 88pm860x.o
 obj-$(CONFIG_MFD_88PM800)	+= 88pm800.o 88pm80x.o
 obj-$(CONFIG_MFD_88PM805)	+= 88pm805.o 88pm80x.o
+obj-$(CONFIG_MFD_ACT8945A)	+= act8945a.o
 obj-$(CONFIG_MFD_SM501)		+= sm501.o
 obj-$(CONFIG_MFD_ASIC3)		+= asic3.o tmio_core.o
 obj-$(CONFIG_MFD_BCM590XX)	+= bcm590xx.o

diff --git a/drivers/mfd/act8945a.c b/drivers/mfd/act8945a.c new file

mode 100644 index 0000000..3a37611

--- /dev/null
+++ b/drivers/mfd/act8945a.c

@@ -0,0 +1,112 @@
+/*
+ * MFD driver for Active-semi ACT8945a PMIC
+ *
+ * Copyright (C) 2015 Atmel Corporation.
+ *
+ * Author: Wenyou Yang <wenyou.yang@atmel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+modify it
+ * under  the terms of the GNU General  Public License as published
+by the
+ * Free Software Foundation;  either version 2 of the License, or (at
+your
+ * option) any later version.
+ */
+
+#include <linux/i2c.h>
+#include <linux/mfd/core.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/regmap.h>
+
+struct act8945a_dev {
+	struct regmap *regmap;
+};
+
+static const struct mfd_cell act8945a_devs[] = {
+	{
+		.name = "act8945a-regulator",
+		.of_compatible = "active-semi,act8945a-regulator",
+	},
+	{
+		.name = "act8945a-charger",
+		.of_compatible = "active-semi,act8945a-charger",
+	},
+};
+
+static const struct regmap_config act8945a_regmap_config = {
+	.reg_bits = 8,
+	.val_bits = 8,
+};
+
+static int act8945a_i2c_probe(struct i2c_client *i2c,
+			      const struct i2c_device_id *id) {
+	struct act8945a_dev *act8945a;
+	int ret;
+
+	act8945a = devm_kzalloc(&i2c->dev, sizeof(*act8945a), GFP_KERNEL);
+	if (!act8945a)
+		return -ENOMEM;
+
+	i2c_set_clientdata(i2c, act8945a);
+
+	act8945a->regmap = devm_regmap_init_i2c(i2c,

&act8945a_regmap_config);

quoted

+	if (IS_ERR(act8945a->regmap)) {
+		ret = PTR_ERR(act8945a->regmap);
+		dev_err(&i2c->dev, "regmap init failed: %d\n", ret);
+		return ret;
+	}
+
+	ret = mfd_add_devices(&i2c->dev, PLATFORM_DEVID_NONE,

act8945a_devs,

quoted

+			      ARRAY_SIZE(act8945a_devs), NULL, 0, NULL);
+	if (ret) {
+		dev_err(&i2c->dev, "Failed to add sub devices\n");
+		return ret;
+	}
+
+	return 0;
+}
+
+static int act8945a_i2c_remove(struct i2c_client *i2c) {
+	mfd_remove_devices(&i2c->dev);
+
+	return 0;
+}
+
+static const struct i2c_device_id act8945a_i2c_id[] = {
+	{ "act8945a", 0 },
+	{}
+};
+MODULE_DEVICE_TABLE(i2c, act8945a_i2c_id);
+
+static const struct of_device_id act8945a_of_match[] = {
+	{ .compatible = "active-semi,act8945a", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, act8945a_of_match);
+
+static struct i2c_driver act8945a_i2c_driver = {
+	.driver = {
+		   .name = "act8945a",
+		   .of_match_table = of_match_ptr(act8945a_of_match),
+	},
+	.probe = act8945a_i2c_probe,
+	.remove = act8945a_i2c_remove,
+	.id_table = act8945a_i2c_id,
+};
+
+static int __init act8945a_i2c_init(void) {
+	return i2c_add_driver(&act8945a_i2c_driver);
+}
+subsys_initcall(act8945a_i2c_init);
+
+static void __exit act8945a_i2c_exit(void) {
+	i2c_del_driver(&act8945a_i2c_driver);
+}
+module_exit(act8945a_i2c_exit);
+
+MODULE_DESCRIPTION("ACT8945A PMIC multi-function driver");
+MODULE_AUTHOR("Wenyou Yang <wenyou.yang@atmel.com>");
+MODULE_LICENSE("GPL");

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

Best Regards,
Wenyou Yang

On Wed, 27 Jan 2016, Yang, Wenyou wrote:

Hi Lee,

quoted

-----Original Message-----
From: Lee Jones [mailto:lee.jones at linaro.org]
Sent: 2016?1?27? 15:28
To: Yang, Wenyou <redacted>
Cc: Rob Herring <robh+dt@kernel.org>; Pawel Moll <redacted>;
Mark Rutland [off-list ref]; Ian Campbell
[off-list ref]; Kumar Gala [off-list ref]; Javier
Martinez Canillas [off-list ref]; Krzysztof Kozlowski
[off-list ref]; Peter Korsgaard [off-list ref]; Ferre,
Nicolas [off-list ref]; linux-arm-kernel at lists.infradead.org;
linux-kernel at vger.kernel.org; devicetree at vger.kernel.org
Subject: Re: [PATCH v8 1/2] mfd: act8945a: add Active-semi ACT8945A PMIC
MFD driver

On Wed, 27 Jan 2016, Wenyou Yang wrote:

quoted

This patch adds support for the Active-semi ACT8945A PMIC.
It is a Multi Function Device with the following subdevices:
 - Regulator
 - Charger

It is interfaced to the host controller using I2C interface, ACT8945A
is a child device of the I2C.

Signed-off-by: Wenyou Yang <redacted>
Reviewed-by: Krzysztof Kozlowski <redacted>

Can I take the MFD patches in separately?

Yes, you can, I think.

quoted

For my own reference:
  Acked-by: Lee Jones [off-list ref]

Thank you for your Acked.

Please re-submit with the changes Peter suggested and I'll apply.

quoted

quoted

---

Changes in v8:
 - change the subdevice's name "act8945a-pmic" to "act8945a-regulator".

Changes in v7:
 - remove struct act8945a_dev to .c file.
 - remove unused .h file.

Changes in v6:
 - change MFD_ACT8945A type from bool to tristate.
 - revert depends on to 'I2C'.

Changes in v5:
 - change depends on to 'I2C=y'.

Changes in v4:
 - add a space before .compatible.
 - collect Reviewed-by from Krzysztof Kozlowski.

Changes in v3: None
Changes in v2:
 - add more help information in Kconfig.
 - update the file header with short version license and author line.
 - remove unused structure members (dev, i2c_client) of stuct act8945a_dev.
 - use define "PLATFORM_DEVID_NONE" for mfd_add_devices(), instead of '-1'.
 - use more explicit info to indicate the failure to add sub devices.
 - remove the unnecessary print out.
 - substitute MODULE_LICENSE("GPL") for MODULE_LICENSE("GPL v2").

 drivers/mfd/Kconfig    |   11 +++++
 drivers/mfd/Makefile   |    1 +
 drivers/mfd/act8945a.c |  112
++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 124 insertions(+)
 create mode 100644 drivers/mfd/act8945a.c

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index

6c4ebd9..38994bb 100644

--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig

@@ -18,6 +18,17 @@ config MFD_CS5535
 	  This is the core driver for CS5535/CS5536 MFD functions.  This is
           necessary for using the board's GPIO and MFGPT functionality.

+config MFD_ACT8945A
+	tristate "Active-semi ACT8945A"
+	select MFD_CORE
+	select REGMAP_I2C
+	depends on I2C && OF
+	help
+	  Support for the ACT8945A PMIC from Active-semi. This device
+	  features three step-down DC/DC converters and four low-dropout
+	  linear regulators, along with a complete ActivePath battery
+	  charger.
+
 config MFD_AS3711
 	bool "AMS AS3711"
 	select MFD_CORE

diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index

0f230a6..2f1ca82 100644

--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile

@@ -6,6 +6,7 @@
 obj-$(CONFIG_MFD_88PM860X)	+= 88pm860x.o
 obj-$(CONFIG_MFD_88PM800)	+= 88pm800.o 88pm80x.o
 obj-$(CONFIG_MFD_88PM805)	+= 88pm805.o 88pm80x.o
+obj-$(CONFIG_MFD_ACT8945A)	+= act8945a.o
 obj-$(CONFIG_MFD_SM501)		+= sm501.o
 obj-$(CONFIG_MFD_ASIC3)		+= asic3.o tmio_core.o
 obj-$(CONFIG_MFD_BCM590XX)	+= bcm590xx.o

diff --git a/drivers/mfd/act8945a.c b/drivers/mfd/act8945a.c new file

mode 100644 index 0000000..3a37611

--- /dev/null
+++ b/drivers/mfd/act8945a.c

@@ -0,0 +1,112 @@
+/*
+ * MFD driver for Active-semi ACT8945a PMIC
+ *
+ * Copyright (C) 2015 Atmel Corporation.
+ *
+ * Author: Wenyou Yang <wenyou.yang@atmel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+modify it
+ * under  the terms of the GNU General  Public License as published
+by the
+ * Free Software Foundation;  either version 2 of the License, or (at
+your
+ * option) any later version.
+ */
+
+#include <linux/i2c.h>
+#include <linux/mfd/core.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/regmap.h>
+
+struct act8945a_dev {
+	struct regmap *regmap;
+};
+
+static const struct mfd_cell act8945a_devs[] = {
+	{
+		.name = "act8945a-regulator",
+		.of_compatible = "active-semi,act8945a-regulator",
+	},
+	{
+		.name = "act8945a-charger",
+		.of_compatible = "active-semi,act8945a-charger",
+	},
+};
+
+static const struct regmap_config act8945a_regmap_config = {
+	.reg_bits = 8,
+	.val_bits = 8,
+};
+
+static int act8945a_i2c_probe(struct i2c_client *i2c,
+			      const struct i2c_device_id *id) {
+	struct act8945a_dev *act8945a;
+	int ret;
+
+	act8945a = devm_kzalloc(&i2c->dev, sizeof(*act8945a), GFP_KERNEL);
+	if (!act8945a)
+		return -ENOMEM;
+
+	i2c_set_clientdata(i2c, act8945a);
+
+	act8945a->regmap = devm_regmap_init_i2c(i2c,

&act8945a_regmap_config);

quoted

+	if (IS_ERR(act8945a->regmap)) {
+		ret = PTR_ERR(act8945a->regmap);
+		dev_err(&i2c->dev, "regmap init failed: %d\n", ret);
+		return ret;
+	}
+
+	ret = mfd_add_devices(&i2c->dev, PLATFORM_DEVID_NONE,

act8945a_devs,

quoted

+			      ARRAY_SIZE(act8945a_devs), NULL, 0, NULL);
+	if (ret) {
+		dev_err(&i2c->dev, "Failed to add sub devices\n");
+		return ret;
+	}
+
+	return 0;
+}
+
+static int act8945a_i2c_remove(struct i2c_client *i2c) {
+	mfd_remove_devices(&i2c->dev);
+
+	return 0;
+}
+
+static const struct i2c_device_id act8945a_i2c_id[] = {
+	{ "act8945a", 0 },
+	{}
+};
+MODULE_DEVICE_TABLE(i2c, act8945a_i2c_id);
+
+static const struct of_device_id act8945a_of_match[] = {
+	{ .compatible = "active-semi,act8945a", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, act8945a_of_match);
+
+static struct i2c_driver act8945a_i2c_driver = {
+	.driver = {
+		   .name = "act8945a",
+		   .of_match_table = of_match_ptr(act8945a_of_match),
+	},
+	.probe = act8945a_i2c_probe,
+	.remove = act8945a_i2c_remove,
+	.id_table = act8945a_i2c_id,
+};
+
+static int __init act8945a_i2c_init(void) {
+	return i2c_add_driver(&act8945a_i2c_driver);
+}
+subsys_initcall(act8945a_i2c_init);
+
+static void __exit act8945a_i2c_exit(void) {
+	i2c_del_driver(&act8945a_i2c_driver);
+}
+module_exit(act8945a_i2c_exit);
+
+MODULE_DESCRIPTION("ACT8945A PMIC multi-function driver");
+MODULE_AUTHOR("Wenyou Yang <wenyou.yang@atmel.com>");
+MODULE_LICENSE("GPL");

Best Regards,
Wenyou Yang

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