diff mbox

[1/2] regulator: act8945a: add regulator driver for ACT8945A

Message ID 1452218938-10621-2-git-send-email-wenyou.yang@atmel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Wenyou Yang Jan. 8, 2016, 2:08 a.m. UTC
This patch adds new regulator driver to support ACT8945A MFD
chip's regulators.

The ACT8945A has three step-down DC/DC converters and four
low-dropout regulators.

Signed-off-by: Wenyou Yang <wenyou.yang@atmel.com>
---

 drivers/regulator/Kconfig              |    7 +
 drivers/regulator/Makefile             |    1 +
 drivers/regulator/act8945a-regulator.c |  299 ++++++++++++++++++++++++++++++++
 3 files changed, 307 insertions(+)
 create mode 100644 drivers/regulator/act8945a-regulator.c

Comments

Mark Brown Jan. 15, 2016, 5:57 p.m. UTC | #1
On Fri, Jan 08, 2016 at 10:08:57AM +0800, Wenyou Yang wrote:

> +	np = of_get_child_by_name(pdev->dev.of_node, "regulators");
> +	if (!np) {
> +		dev_err(&pdev->dev, "regulator node not found\n");
> +		return -EINVAL;
> +	}
> +
> +	matches = act8945a_matches;
> +	num_matches = ARRAY_SIZE(act8945a_matches);
> +
> +	ret = of_regulator_match(&pdev->dev, np, matches, num_matches);

Don't open code this, use the core regulators_node and of_match
implementation instead.

> +		dev_info(act8945a_dev->dev, "%s regulator registered\n",
> +			desc->name);

This is just noise, please remove it - let the core handle notifying
users.

> +static int __init act8945a_pmic_init(void)
> +{
> +	return platform_driver_register(&act8945a_pmic_driver);
> +}
> +subsys_initcall(act8945a_pmic_init);

Please use module_platform_driver() unless there is a strong reason to
do otherwise.
Wenyou Yang Jan. 20, 2016, 7:12 a.m. UTC | #2
Hi Mark,

Thank you for your review.

> -----Original Message-----

> From: Mark Brown [mailto:broonie@kernel.org]

> Sent: 2016?1?16? 1:58

> To: Yang, Wenyou <Wenyou.Yang@atmel.com>

> Cc: Liam Girdwood <lgirdwood@gmail.com>; Rob Herring <robh+dt@kernel.org>;

> Pawel Moll <pawel.moll@arm.com>; Mark Rutland <mark.rutland@arm.com>; Ian

> Campbell <ijc+devicetree@hellion.org.uk>; Kumar Gala <galak@codeaurora.org>;

> Ferre, Nicolas <Nicolas.FERRE@atmel.com>; linux-arm-

> kernel@lists.infradead.org; linux-kernel@vger.kernel.org;

> devicetree@vger.kernel.org

> Subject: Re: [PATCH 1/2] regulator: act8945a: add regulator driver for ACT8945A

> 

> On Fri, Jan 08, 2016 at 10:08:57AM +0800, Wenyou Yang wrote:

> 

> > +	np = of_get_child_by_name(pdev->dev.of_node, "regulators");

> > +	if (!np) {

> > +		dev_err(&pdev->dev, "regulator node not found\n");

> > +		return -EINVAL;

> > +	}

> > +

> > +	matches = act8945a_matches;

> > +	num_matches = ARRAY_SIZE(act8945a_matches);

> > +

> > +	ret = of_regulator_match(&pdev->dev, np, matches, num_matches);

> 

> Don't open code this, use the core regulators_node and of_match implementation

> instead.


Good. In the next version, I use the code implementation, and remove the redundant code.

Thank you for your advice.

> 

> > +		dev_info(act8945a_dev->dev, "%s regulator registered\n",

> > +			desc->name);

> 

> This is just noise, please remove it - let the core handle notifying users.


It is fixed in version 2.

> 

> > +static int __init act8945a_pmic_init(void) {

> > +	return platform_driver_register(&act8945a_pmic_driver);

> > +}

> > +subsys_initcall(act8945a_pmic_init);

> 

> Please use module_platform_driver() unless there is a strong reason to do

> otherwise.


It is fixed in version 2 too.


Best Regards,
Wenyou Yang
diff mbox

Patch

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 3904dc0..9a5c950 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -78,6 +78,13 @@  config REGULATOR_ACT8865
 	  This driver controls a active-semi act8865 voltage output
 	  regulator via I2C bus.
 
+config REGULATOR_ACT8945A
+	tristate "Active-semi ACT8945A voltage regulator"
+	depends on MFD_ACT8945A
+	help
+	  This driver controls a active-semi ACT8945A voltage regulator
+	  via I2C bus.
+
 config REGULATOR_AD5398
 	tristate "Analog Devices AD5398/AD5821 regulators"
 	depends on I2C
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 980b194..348cfd7 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -15,6 +15,7 @@  obj-$(CONFIG_REGULATOR_AAT2870) += aat2870-regulator.o
 obj-$(CONFIG_REGULATOR_AB3100) += ab3100.o
 obj-$(CONFIG_REGULATOR_AB8500)	+= ab8500-ext.o ab8500.o
 obj-$(CONFIG_REGULATOR_ACT8865) += act8865-regulator.o
+obj-$(CONFIG_REGULATOR_ACT8945A) += act8945a-regulator.o
 obj-$(CONFIG_REGULATOR_AD5398) += ad5398.o
 obj-$(CONFIG_REGULATOR_ANATOP) += anatop-regulator.o
 obj-$(CONFIG_REGULATOR_ARIZONA) += arizona-micsupp.o arizona-ldo1.o
diff --git a/drivers/regulator/act8945a-regulator.c b/drivers/regulator/act8945a-regulator.c
new file mode 100644
index 0000000..3912ea3
--- /dev/null
+++ b/drivers/regulator/act8945a-regulator.c
@@ -0,0 +1,299 @@ 
+/*
+ * Voltage regulation driver for active-semi ACT8945A PMICs
+ *
+ * Copyright (C) 2015 Atmel Corporation
+ *		      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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/mfd/act8945a.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/driver.h>
+#include <linux/regulator/machine.h>
+#include <linux/regulator/of_regulator.h>
+
+/**
+ * ACT8945A Global Register Map.
+ */
+#define	ACT8945A_SYS_MODE	0x00
+#define	ACT8945A_SYS_CTRL	0x01
+#define	ACT8945A_DCDC1_VSET1	0x20
+#define	ACT8945A_DCDC1_VSET2	0x21
+#define	ACT8945A_DCDC1_CTRL	0x22
+#define	ACT8945A_DCDC2_VSET1	0x30
+#define	ACT8945A_DCDC2_VSET2	0x31
+#define	ACT8945A_DCDC2_CTRL	0x32
+#define	ACT8945A_DCDC3_VSET1	0x40
+#define	ACT8945A_DCDC3_VSET2	0x41
+#define	ACT8945A_DCDC3_CTRL	0x42
+#define	ACT8945A_LDO1_VSET	0x50
+#define	ACT8945A_LDO1_CTRL	0x51
+#define	ACT8945A_LDO2_VSET	0x54
+#define	ACT8945A_LDO2_CTRL	0x55
+#define	ACT8945A_LDO3_VSET	0x60
+#define	ACT8945A_LDO3_CTRL	0x61
+#define	ACT8945A_LDO4_VSET	0x64
+#define	ACT8945A_LDO4_CTRL	0x65
+
+/**
+ * Field Definitions.
+ */
+#define	ACT8945A_ENA		0x80	/* ON - [7] */
+#define	ACT8945A_VSEL_MASK	0x3F	/* VSET - [5:0] */
+
+/**
+ * ACT8945A voltage number
+ */
+#define	ACT8945A_VOLTAGE_NUM	64
+
+enum {
+	ACT8945A_ID_DCDC1,
+	ACT8945A_ID_DCDC2,
+	ACT8945A_ID_DCDC3,
+	ACT8945A_ID_LDO1,
+	ACT8945A_ID_LDO2,
+	ACT8945A_ID_LDO3,
+	ACT8945A_ID_LDO4,
+	ACT8945A_REG_NUM,
+};
+
+struct act8945a_regulator_init_data {
+	int id;
+	const char *name;
+	struct regulator_init_data *init_data;
+};
+
+struct act8945a_pmic_data {
+	int num_regulators;
+	struct act8945a_regulator_init_data *regulators;
+};
+
+struct act8945a_pmic {
+	struct act8945a_dev *mfd;
+};
+
+static const struct regulator_linear_range act8945a_voltage_ranges[] = {
+	REGULATOR_LINEAR_RANGE(600000, 0, 23, 25000),
+	REGULATOR_LINEAR_RANGE(1200000, 24, 47, 50000),
+	REGULATOR_LINEAR_RANGE(2400000, 48, 63, 100000),
+};
+
+static struct regulator_ops act8945a_ops = {
+	.list_voltage		= regulator_list_voltage_linear_range,
+	.map_voltage		= regulator_map_voltage_linear_range,
+	.get_voltage_sel	= regulator_get_voltage_sel_regmap,
+	.set_voltage_sel	= regulator_set_voltage_sel_regmap,
+	.enable			= regulator_enable_regmap,
+	.disable		= regulator_disable_regmap,
+	.is_enabled		= regulator_is_enabled_regmap,
+};
+
+#define ACT89xx_REG(_name, _family, _id, _vsel_reg, _supply)		\
+	[_family##_ID_##_id] = {					\
+		.name			= _name,			\
+		.supply_name		= _supply,			\
+		.id			= _family##_ID_##_id,		\
+		.type			= REGULATOR_VOLTAGE,		\
+		.ops			= &act8945a_ops,			\
+		.n_voltages		= ACT8945A_VOLTAGE_NUM,		\
+		.linear_ranges		= act8945a_voltage_ranges,	\
+		.n_linear_ranges	= ARRAY_SIZE(act8945a_voltage_ranges), \
+		.vsel_reg		= _family##_##_id##_##_vsel_reg, \
+		.vsel_mask		= ACT8945A_VSEL_MASK,		\
+		.enable_reg		= _family##_##_id##_CTRL,	\
+		.enable_mask		= ACT8945A_ENA,			\
+		.owner			= THIS_MODULE,			\
+	}
+
+static const struct regulator_desc act8945a_regulators[] = {
+	ACT89xx_REG("DCDC_REG1", ACT8945A, DCDC1, VSET1, "vp1"),
+	ACT89xx_REG("DCDC_REG2", ACT8945A, DCDC2, VSET1, "vp2"),
+	ACT89xx_REG("DCDC_REG3", ACT8945A, DCDC3, VSET1, "vp3"),
+	ACT89xx_REG("LDO_REG1", ACT8945A, LDO1, VSET, "inl45"),
+	ACT89xx_REG("LDO_REG2", ACT8945A, LDO2, VSET, "inl45"),
+	ACT89xx_REG("LDO_REG3", ACT8945A, LDO3, VSET, "inl67"),
+	ACT89xx_REG("LDO_REG4", ACT8945A, LDO4, VSET, "inl67"),
+};
+
+static const struct regulator_desc act8945a_alt_regulators[] = {
+	ACT89xx_REG("DCDC_REG1", ACT8945A, DCDC1, VSET2, "vp1"),
+	ACT89xx_REG("DCDC_REG2", ACT8945A, DCDC2, VSET2, "vp2"),
+	ACT89xx_REG("DCDC_REG3", ACT8945A, DCDC3, VSET2, "vp3"),
+	ACT89xx_REG("LDO_REG1", ACT8945A, LDO1, VSET, "inl45"),
+	ACT89xx_REG("LDO_REG2", ACT8945A, LDO2, VSET, "inl45"),
+	ACT89xx_REG("LDO_REG3", ACT8945A, LDO3, VSET, "inl67"),
+	ACT89xx_REG("LDO_REG4", ACT8945A, LDO4, VSET, "inl67"),
+};
+
+static struct of_regulator_match act8945a_matches[] = {
+	[ACT8945A_ID_DCDC1]	= { .name = "DCDC_REG1"},
+	[ACT8945A_ID_DCDC2]	= { .name = "DCDC_REG2"},
+	[ACT8945A_ID_DCDC3]	= { .name = "DCDC_REG3"},
+	[ACT8945A_ID_LDO1]	= { .name = "LDO_REG1"},
+	[ACT8945A_ID_LDO2]	= { .name = "LDO_REG2"},
+	[ACT8945A_ID_LDO3]	= { .name = "LDO_REG3"},
+	[ACT8945A_ID_LDO4]	= { .name = "LDO_REG4"},
+};
+
+static int act8945a_parse_dt_reg_data(struct platform_device *pdev,
+			struct act8945a_pmic_data *pdata,
+			struct of_regulator_match **act8945a_reg_matches)
+{
+	struct device_node *np;
+	struct of_regulator_match *matches;
+	struct act8945a_regulator_init_data *regulator;
+	unsigned int i, num_matches;
+	int ret;
+
+	np = of_get_child_by_name(pdev->dev.of_node, "regulators");
+	if (!np) {
+		dev_err(&pdev->dev, "regulator node not found\n");
+		return -EINVAL;
+	}
+
+	matches = act8945a_matches;
+	num_matches = ARRAY_SIZE(act8945a_matches);
+
+	ret = of_regulator_match(&pdev->dev, np, matches, num_matches);
+	of_node_put(np);
+	if (ret < 0) {
+		dev_err(&pdev->dev, "Error parsing regulator init data: %d\n",
+			ret);
+		return -EINVAL;
+	}
+
+	*act8945a_reg_matches = matches;
+
+	pdata->regulators = devm_kzalloc(&pdev->dev,
+		sizeof(struct act8945a_regulator_init_data) * num_matches,
+		GFP_KERNEL);
+	if (!pdata->regulators)
+		return -ENOMEM;
+
+	pdata->num_regulators = num_matches;
+	regulator = pdata->regulators;
+
+	for (i = 0; i < num_matches; i++) {
+		regulator->id = i;
+		regulator->name = matches[i].name;
+		regulator->init_data = matches[i].init_data;
+		regulator++;
+	}
+
+	return 0;
+}
+
+static struct regulator_init_data *act8945a_get_init_data(int id,
+				struct act8945a_pmic_data *pdata)
+{
+	int i;
+
+	if (!pdata)
+		return NULL;
+
+	for (i = 0; i < pdata->num_regulators; i++) {
+		if (pdata->regulators[i].id == id)
+			return pdata->regulators[i].init_data;
+	}
+
+	return NULL;
+}
+
+static int act8945a_pmic_probe(struct platform_device *pdev)
+{
+	struct act8945a_dev *act8945a_dev = dev_get_drvdata(pdev->dev.parent);
+	struct act8945a_pmic *act8945a_pmic;
+	struct of_regulator_match *act8945a_reg_matches = NULL;
+	struct regulator_config config = { };
+	const struct regulator_desc *regulators, *desc;
+	struct regulator_dev *rdev;
+	struct act8945a_pmic_data pmic_data, *pdata;
+	int i, num_regulators;
+	int voltage_select = 0;
+	int ret;
+
+	act8945a_pmic = devm_kzalloc(&pdev->dev,
+				     sizeof(*act8945a_pmic), GFP_KERNEL);
+	if (!act8945a_pmic)
+		return -ENOMEM;
+
+	act8945a_pmic->mfd = act8945a_dev;
+
+	ret = act8945a_parse_dt_reg_data(pdev, &pmic_data,
+					 &act8945a_reg_matches);
+	if (ret < 0)
+		return ret;
+
+	pdata = &pmic_data;
+
+	voltage_select = !!of_get_property(pdev->dev.of_node,
+					   "active-semi,vsel-high", NULL);
+
+	if (voltage_select) {
+		regulators = act8945a_alt_regulators;
+		num_regulators = ARRAY_SIZE(act8945a_alt_regulators);
+	} else {
+		regulators = act8945a_regulators;
+		num_regulators = ARRAY_SIZE(act8945a_regulators);
+	}
+
+	for (i = 0; i < num_regulators; i++) {
+		desc = &regulators[i];
+
+		config.dev = act8945a_dev->dev;
+		config.init_data = act8945a_get_init_data(desc->id, pdata);
+		config.driver_data = act8945a_pmic;
+		config.regmap = act8945a_dev->regmap;
+		if (act8945a_reg_matches)
+			config.of_node = act8945a_reg_matches[i].of_node;
+
+		rdev = devm_regulator_register(&pdev->dev, desc, &config);
+		if (IS_ERR(rdev)) {
+			dev_err(act8945a_dev->dev,
+				"failed to register %s regulator\n",
+				desc->name);
+			return PTR_ERR(rdev);
+		}
+
+		dev_info(act8945a_dev->dev, "%s regulator registered\n",
+			desc->name);
+	}
+
+	platform_set_drvdata(pdev, act8945a_dev);
+
+	return 0;
+}
+
+static struct platform_driver act8945a_pmic_driver = {
+	.driver = {
+		.name = "act8945a-pmic",
+	},
+	.probe = act8945a_pmic_probe,
+};
+
+static int __init act8945a_pmic_init(void)
+{
+	return platform_driver_register(&act8945a_pmic_driver);
+}
+subsys_initcall(act8945a_pmic_init);
+
+static void __exit act8945a_pmic_cleanup(void)
+{
+	platform_driver_unregister(&act8945a_pmic_driver);
+}
+module_exit(act8945a_pmic_cleanup);
+
+MODULE_DESCRIPTION("Active-semi ACT8945A voltage regulator driver");
+MODULE_AUTHOR("Wenyou Yang <wenyou.yang@atmel.com>");
+MODULE_LICENSE("GPL v2");