Hi Mark,
Regulator Driver for Dialog Semiconductor DA9052 PMICs.
Changes made since last submission:
. Change the regulator registration method
. Ported the driver to Linux kernel 2.6.38.2
Linux Kernel Version: 2.6.38.2
Signed-off-by: D. Chen <[email protected]>
---
diff -Naur linux-2.6.38.2/drivers/regulator/da9052-regulator.c wrk_linux-2.6.38.2/drivers/regulator/da9052-regulator.c
--- linux-2.6.38.2/drivers/regulator/da9052-regulator.c 1970-01-01 05:00:00.000000000 +0500
+++ wrk_linux-2.6.38.2/drivers/regulator/da9052-regulator.c 2011-04-13 13:04:03.000000000 +0500
@@ -0,0 +1,431 @@
+/*
+* Regulator driver for DA9052
+*
+* Copyright(c) 2009 Dialog Semiconductor Ltd.
+*
+*Author: Dajun Chen <[email protected]>
+*
+* 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/module.h>
+#include <linux/moduleparam.h>
+#include <linux/init.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/driver.h>
+#include <linux/regulator/machine.h>
+
+#include <linux/mfd/da9052/da9052.h>
+#include <linux/mfd/da9052/pdata.h>
+#include <linux/mfd/da9052/reg.h>
+
+/* LDO and Buck index */
+#define DA9052_BUCK_CORE 0
+#define DA9052_BUCK_PRO 1
+#define DA9052_BUCK_MEM 2
+#define DA9052_BUCK_PERI 3
+
+#define DA9052_LDO2 5
+#define DA9052_LDO3 6
+
+/* Buck step size Macros */
+#define DA9052_BUCK_PERI_3uV_STEP 100000
+#define DA9052_BUCK_PERI_REG_MAP_UPTO_3uV 24
+#define DA9052_CONST_3uV 3000000
+
+static struct regulator_ops da9052_regulator_ops;
+
+static struct regulator_consumer_supply da9052_vddarm_consumers[] = {
+ {
+ .supply = "vcc",
+ }
+};
+
+#define DA9052_BUCKCORE_INIT(max, min) \
+{\
+ .constraints = {\
+ .max_uV = (max) * 1000,\
+ .min_uV = (min) * 1000,\
+ .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE\
+ |REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_MODE,\
+ .valid_modes_mask = REGULATOR_MODE_NORMAL,\
+ },\
+ .num_consumer_supplies = ARRAY_SIZE(da9052_vddarm_consumers),\
+ .consumer_supplies = da9052_vddarm_consumers,\
+}
+
+
+#define DA9052_REGULATOR_INIT(max, min) \
+{\
+ .constraints = {\
+ .max_uV = (max) * 1000,\
+ .min_uV = (min) * 1000,\
+ .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE\
+ |REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_MODE,\
+ .valid_modes_mask = REGULATOR_MODE_NORMAL,\
+ },\
+}
+
+struct regulator_init_data da9052_regulators_init[] = {
+ /* BUCKS */
+ DA9052_BUCKCORE_INIT(2075, 500),
+ DA9052_REGULATOR_INIT(2075, 500),
+ DA9052_REGULATOR_INIT(2500, 925),
+ DA9052_REGULATOR_INIT(3600, 1800),
+ /* LDO */
+ DA9052_REGULATOR_INIT(1800, 600),
+ DA9052_REGULATOR_INIT(1800, 600),
+ DA9052_REGULATOR_INIT(3300, 1725),
+ DA9052_REGULATOR_INIT(3300, 1725),
+ DA9052_REGULATOR_INIT(3600, 1200),
+ DA9052_REGULATOR_INIT(3600, 1200),
+ DA9052_REGULATOR_INIT(3600, 1200),
+ DA9052_REGULATOR_INIT(3600, 1200),
+ DA9052_REGULATOR_INIT(3650, 1250),
+ DA9052_REGULATOR_INIT(3600, 1200),
+
+};
+
+#define DA9052_LDO(_id, step, sbits, ebits, mbits) \
+{\
+ .reg_desc = {\
+ .name = "LDO" #_id,\
+ .ops = &da9052_regulator_ops,\
+ .type = REGULATOR_VOLTAGE,\
+ .id = _id,\
+ .owner = THIS_MODULE,\
+ },\
+ .step_uV = (step) * 1000,\
+ .volt_shift = (sbits),\
+ .enable_bit = (ebits),\
+ .supply_v_mask = (mbits),\
+}
+
+#define DA9052_DCDC(_id, step, sbits, ebits, mbits) \
+{\
+ .reg_desc = {\
+ .name = "BUCK" #_id,\
+ .ops = &da9052_regulator_ops,\
+ .type = REGULATOR_VOLTAGE,\
+ .id = _id,\
+ .owner = THIS_MODULE,\
+ },\
+ .step_uV = (step) * 1000,\
+ .volt_shift = (sbits),\
+ .enable_bit = (ebits),\
+ .supply_v_mask = (mbits),\
+}
+
+struct da9052_regulator_info {
+ struct regulator_desc reg_desc;
+ int step_uV;
+ unsigned char volt_shift;
+ unsigned char enable_bit;
+ unsigned char supply_v_mask;
+
+};
+
+struct da9052_regulator {
+ struct da9052 *da9052;
+ struct regulator_dev *regulators[];
+};
+
+struct da9052_regulator_info da9052_regulator_info[] = {
+ /* Buck1 - 4*/
+ DA9052_DCDC(0, 25, 6, 6, DA9052_SUPPLY_VBCOREGO),
+ DA9052_DCDC(1, 25, 6, 6, DA9052_SUPPLY_VBPROGO),
+ DA9052_DCDC(2, 25, 6, 6, DA9052_SUPPLY_VBMEMGO),
+ DA9052_DCDC(3, 50, 5, 6, 0),
+ /* LD01 - LDO10*/
+ DA9052_LDO(4, 50, 5, 6, 0),
+ DA9052_LDO(5, 25, 6, 6, DA9052_SUPPLY_VLDO2GO),
+ DA9052_LDO(6, 25, 6, 6, DA9052_SUPPLY_VLDO3GO),
+ DA9052_LDO(7, 25, 6, 6, 0),
+ DA9052_LDO(8, 50, 6, 6, 0),
+ DA9052_LDO(9, 50, 6, 6, 0),
+ DA9052_LDO(10, 50, 6, 6, 0),
+ DA9052_LDO(11, 50, 6, 6, 0),
+ DA9052_LDO(12, 50, 6, 6, 0),
+ DA9052_LDO(13, 50, 6, 6, 0),
+};
+
+static inline struct da9052 *to_da9052(struct regulator_dev *rdev)
+{
+ return dev_get_drvdata(rdev_get_dev(rdev)->parent->parent);
+
+}
+
+static int da9052_regulator_uvolts_to_regVal(struct regulator_dev *rdev,
+ unsigned int val)
+{
+ struct regulation_constraints *constraints = rdev->constraints;
+ int offset = rdev_get_id(rdev);
+ int reg_val = 0;
+
+ /* Care for the varying step size of BUCK PERI */
+ if ((offset == DA9052_BUCK_PERI) && (val >= DA9052_CONST_3uV)) {
+ reg_val = (DA9052_CONST_3uV - constraints->min_uV)/
+ (da9052_regulator_info[offset].step_uV);
+ reg_val += ((val - DA9052_CONST_3uV) /
+ (DA9052_BUCK_PERI_3uV_STEP));
+ } else{
+ reg_val = (val - constraints->min_uV)/
+ (da9052_regulator_info[offset].step_uV);
+
+ /* Validate reg_val */
+ if ((reg_val * da9052_regulator_info[offset].step_uV) +
+ constraints->min_uV > constraints->max_uV)
+ return -EINVAL;
+ }
+
+ return reg_val;
+
+}
+
+static int da9052_regulator_val_to_uvolts(struct regulator_dev *rdev,
+ unsigned int regval)
+{
+ struct regulation_constraints *constraints = rdev->constraints;
+ int offset = rdev_get_id(rdev);
+ int regval_uV = 0;
+
+ if (offset == DA9052_BUCK_PERI) {
+ if (regval >= DA9052_BUCK_PERI_REG_MAP_UPTO_3uV) {
+ regval_uV = ((DA9052_BUCK_PERI_REG_MAP_UPTO_3uV *
+ da9052_regulator_info[offset].step_uV)
+ + constraints->min_uV);
+ regval_uV += (regval -
+ DA9052_BUCK_PERI_REG_MAP_UPTO_3uV)
+ *(DA9052_BUCK_PERI_3uV_STEP);
+ } else {
+ regval_uV =
+ (regval * da9052_regulator_info[offset].step_uV)
+ + constraints->min_uV;
+ }
+ } else {
+ regval_uV = (regval * da9052_regulator_info[offset].step_uV) +
+ constraints->min_uV;
+ }
+
+ return regval_uV;
+}
+
+static int da9052_regulator_enable(struct regulator_dev *rdev)
+{
+ struct da9052_regulator_info *info = rdev_get_drvdata(rdev);
+ struct da9052 *da9052 = to_da9052(rdev);
+ int offset = rdev_get_id(rdev);
+ int ret;
+
+ ret = da9052_reg_update(da9052, DA9052_BUCKCORE_REG + offset,
+ 1 << info->enable_bit, 1 << info->enable_bit);
+ if (ret < 0)
+ return -EIO;
+
+ return 0;
+}
+
+static int da9052_regulator_disable(struct regulator_dev *rdev)
+{
+ struct da9052_regulator_info *info = rdev_get_drvdata(rdev);
+ struct da9052 *da9052 = to_da9052(rdev);
+ int offset = rdev_get_id(rdev);
+ int ret = 0;
+
+ ret = da9052_reg_update(da9052, DA9052_BUCKCORE_REG + offset,
+ 1 << info->enable_bit, 0);
+ if (ret < 0)
+ return -EIO;
+
+ return 0;
+}
+
+static int da9052_regulator_is_enabled(struct regulator_dev *rdev)
+{
+ struct da9052 *da9052 = to_da9052(rdev);
+ int offset = rdev_get_id(rdev);
+ int ret;
+
+ ret = da9052_reg_read(da9052, DA9052_BUCKCORE_REG + offset);
+
+ if (ret < 0)
+ return -EIO;
+
+ return ret & (1 << da9052_regulator_info[offset].enable_bit);
+
+}
+
+static int da9052_regulator_set_voltage(struct regulator_dev *rdev, int min_uV,
+ int max_uV, unsigned *selector)
+{
+ struct da9052 *da9052 = to_da9052(rdev);
+ int offset = rdev_get_id(rdev);
+ int ret;
+ int reg_val = 0;
+
+ reg_val = da9052_regulator_uvolts_to_regVal(rdev, min_uV);
+
+ ret = da9052_reg_update(da9052, DA9052_BUCKCORE_REG + offset,
+ (1 << da9052_regulator_info[offset].volt_shift) - 1,
+ reg_val);
+ if (ret < 0)
+ return -EIO;
+
+ /* Set the GO LDO/BUCk bits so that the voltage changes */
+ if (da9052_regulator_info[offset].supply_v_mask != 0) {
+ ret = da9052_reg_update(da9052, DA9052_SUPPLY_REG, 0,
+ da9052_regulator_info[offset].supply_v_mask);
+ if (ret < 0)
+ return -EIO;
+ }
+
+ return ret;
+}
+
+static int da9052_regulator_get_voltage(struct regulator_dev *rdev)
+{
+ struct da9052 *da9052 = to_da9052(rdev);
+ int offset = rdev_get_id(rdev);
+ int ret;
+
+ ret = da9052_reg_read(da9052, DA9052_BUCKCORE_REG + offset);
+ if (ret < 0)
+ return -EIO;
+
+ return da9052_regulator_val_to_uvolts(rdev,
+ ret &
+ ((1 << da9052_regulator_info[offset].volt_shift) - 1));
+}
+
+static int da9052_list_voltage(struct regulator_dev *rdev, unsigned selector)
+{
+ struct regulation_constraints *constraints = rdev->constraints;
+ struct da9052_regulator_info *info = rdev_get_drvdata(rdev);
+ int ret;
+
+ ret = constraints->min_uV + info->step_uV * selector;
+ if (ret > constraints->max_uV)
+ return -EINVAL;
+
+ return ret;
+}
+
+static struct regulator_ops da9052_regulator_ops = {
+ .is_enabled = da9052_regulator_is_enabled,
+ .enable = da9052_regulator_enable,
+ .disable = da9052_regulator_disable,
+ .get_voltage = da9052_regulator_get_voltage,
+ .set_voltage = da9052_regulator_set_voltage,
+ .list_voltage = da9052_list_voltage,
+};
+
+static int __remove_subdev(struct device *dev, void *unused)
+{
+ platform_device_unregister(to_platform_device(dev));
+ return 0;
+}
+
+
+void da9052_add_regulator_devices(struct da9052 *da9052,
+ struct da9052_pdata *pdata)
+{
+ struct platform_device *pdev;
+ int i, ret = 0;
+
+ for (i = 0; i < pdata->num_subdevs; i++) {
+
+ pdev = platform_device_alloc("da9052-regulator", i);
+ if (!pdev) {
+ ret = -ENOMEM;
+ goto failed;
+ }
+ pdev->dev.parent = da9052->dev;
+ ret = platform_device_add(pdev);
+ if (ret) {
+ platform_device_put(pdev);
+ goto failed;
+ }
+ }
+ return;
+
+failed:
+ device_for_each_child(da9052->dev, NULL, __remove_subdev);
+ return;
+}
+EXPORT_SYMBOL(da9052_add_regulator_devices);
+
+
+static inline struct da9052_regulator_info *find_regulator_info(int id)
+{
+ struct da9052_regulator_info *ri;
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(da9052_regulator_info); i++) {
+ ri = &da9052_regulator_info[i];
+ if (ri->reg_desc.id == id)
+ return ri;
+ }
+ return NULL;
+}
+
+static int __devinit da9052_regulator_probe(struct platform_device *pdev)
+{
+ struct regulator_dev *rdev;
+ struct da9052_regulator_info *ri = NULL;
+
+ ri = find_regulator_info(pdev->id);
+ if (ri == NULL) {
+ dev_err(&pdev->dev, "invalid regulator ID specified\n");
+ return -EINVAL;
+ }
+
+ rdev = regulator_register(&ri->reg_desc, &pdev->dev,
+ pdev->dev.platform_data, ri);
+ if (IS_ERR(rdev)) {
+ dev_err(&pdev->dev, "failed to register regulator %s\n",
+ ri->reg_desc.name);
+ return PTR_ERR(rdev);
+ }
+
+ platform_set_drvdata(pdev, rdev);
+
+ return 0;
+
+}
+
+static int __devexit da9052_regulator_remove(struct platform_device *pdev)
+{
+ struct regulator_dev *rdev = platform_get_drvdata(pdev);
+
+ regulator_unregister(rdev);
+ return 0;
+}
+
+static struct platform_driver da9052_regulator_driver = {
+ .driver.name = "da9052-regulator",
+ .driver.owner = THIS_MODULE,
+ .probe = da9052_regulator_probe,
+ .remove = __devexit_p(da9052_regulator_remove),
+};
+
+static int __init da9052_regulator_init(void)
+{
+ return platform_driver_register(&da9052_regulator_driver);
+}
+subsys_initcall(da9052_regulator_init);
+
+static void __exit da9052_regulator_exit(void)
+{
+ platform_driver_unregister(&da9052_regulator_driver);
+}
+module_exit(da9052_regulator_exit);
+
+MODULE_AUTHOR("David Dajun Chen <[email protected]>");
+MODULE_DESCRIPTION("Power Regulator driver for Dialog DA9052 PMIC");
+MODULE_LICENSE("GPL v2");
diff -Naur linux-2.6.38.2/drivers/regulator/Kconfig wrk_linux-2.6.38.2/drivers/regulator/Kconfig
--- linux-2.6.38.2/drivers/regulator/Kconfig 2011-03-27 23:37:20.000000000 +0500
+++ wrk_linux-2.6.38.2/drivers/regulator/Kconfig 2011-04-13 13:04:34.000000000 +0500
@@ -158,6 +158,13 @@
Say y here to support the BUCKs and LDOs regulators found on
Dialog Semiconductor DA9030/DA9034 PMIC.
+config REGULATOR_DA9052
+ tristate "Dialog DA9052 regulators"
+ depends on PMIC_DA9052
+ help
+ Say y here to support the BUCKs and LDOs regulators found on
+ Dialog Semiconductor DA9052 PMIC.
+
config REGULATOR_PCF50633
tristate "PCF50633 regulator driver"
depends on MFD_PCF50633
diff -Naur linux-2.6.38.2/drivers/regulator/Makefile wrk_linux-2.6.38.2/drivers/regulator/Makefile
--- linux-2.6.38.2/drivers/regulator/Makefile 2011-03-27 23:37:20.000000000 +0500
+++ wrk_linux-2.6.38.2/drivers/regulator/Makefile 2011-04-13 13:04:27.000000000 +0500
@@ -27,6 +27,7 @@
obj-$(CONFIG_REGULATOR_WM8994) += wm8994-regulator.o
obj-$(CONFIG_REGULATOR_TPS6586X) += tps6586x-regulator.o
obj-$(CONFIG_REGULATOR_DA903X) += da903x.o
+obj-$(CONFIG_REGULATOR_DA9052) += da9052-regulator.o
obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o
obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o
obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o
Regards,
Ashish J
????{.n?+???????+%?????ݶ??w??{.n?+????{??G?????{ay? ʇڙ?,j??f???h?????????z_??(?階?ݢj"???m??????G????????????&???~???iO???z??v?^?m???? ????????I?
On Wed, 2011-04-13 at 17:42 +0530, Ashish Jangam wrote:
> Hi Mark,
>
> Regulator Driver for Dialog Semiconductor DA9052 PMICs.
>
> Changes made since last submission:
> . Change the regulator registration method
> . Ported the driver to Linux kernel 2.6.38.2
>
Please don't use V1 as the patch version if you have made changes since
the previous version. This makes it more difficult to review and track
the patches.
> Linux Kernel Version: 2.6.38.2
I'm sure Mark has mentioned this before but please do make sure you
create your patches (especially a large series like this that touches
multiple subsystems) against linux-next. This makes it far easier for
maintainers to apply.
some minor formatting issues below :-
>
> Signed-off-by: D. Chen <[email protected]>
> ---
> diff -Naur linux-2.6.38.2/drivers/regulator/da9052-regulator.c wrk_linux-2.6.38.2/drivers/regulator/da9052-regulator.c
> --- linux-2.6.38.2/drivers/regulator/da9052-regulator.c 1970-01-01 05:00:00.000000000 +0500
> +++ wrk_linux-2.6.38.2/drivers/regulator/da9052-regulator.c 2011-04-13 13:04:03.000000000 +0500
> @@ -0,0 +1,431 @@
> +/*
> +* Regulator driver for DA9052
> +*
> +* Copyright(c) 2009 Dialog Semiconductor Ltd.
> +*
> +*Author: Dajun Chen <[email protected]>
> +*
> +* 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/module.h>
> +#include <linux/moduleparam.h>
> +#include <linux/init.h>
> +#include <linux/err.h>
> +#include <linux/platform_device.h>
> +#include <linux/regulator/driver.h>
> +#include <linux/regulator/machine.h>
> +
> +#include <linux/mfd/da9052/da9052.h>
> +#include <linux/mfd/da9052/pdata.h>
> +#include <linux/mfd/da9052/reg.h>
> +
> +/* LDO and Buck index */
> +#define DA9052_BUCK_CORE 0
> +#define DA9052_BUCK_PRO 1
> +#define DA9052_BUCK_MEM 2
> +#define DA9052_BUCK_PERI 3
> +
> +#define DA9052_LDO2 5
> +#define DA9052_LDO3 6
> +
> +/* Buck step size Macros */
> +#define DA9052_BUCK_PERI_3uV_STEP 100000
> +#define DA9052_BUCK_PERI_REG_MAP_UPTO_3uV 24
> +#define DA9052_CONST_3uV 3000000
> +
> +static struct regulator_ops da9052_regulator_ops;
> +
> +static struct regulator_consumer_supply da9052_vddarm_consumers[] = {
> + {
> + .supply = "vcc",
> + }
> +};
> +
> +#define DA9052_BUCKCORE_INIT(max, min) \
> +{\
> + .constraints = {\
> + .max_uV = (max) * 1000,\
> + .min_uV = (min) * 1000,\
> + .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE\
> + |REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_MODE,\
> + .valid_modes_mask = REGULATOR_MODE_NORMAL,\
> + },\
> + .num_consumer_supplies = ARRAY_SIZE(da9052_vddarm_consumers),\
> + .consumer_supplies = da9052_vddarm_consumers,\
> +}
> +
> +
> +#define DA9052_REGULATOR_INIT(max, min) \
> +{\
> + .constraints = {\
> + .max_uV = (max) * 1000,\
> + .min_uV = (min) * 1000,\
> + .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE\
> + |REGULATOR_CHANGE_STATUS | REGULATOR_CHANGE_MODE,\
> + .valid_modes_mask = REGULATOR_MODE_NORMAL,\
> + },\
> +}
> +
> +struct regulator_init_data da9052_regulators_init[] = {
> + /* BUCKS */
> + DA9052_BUCKCORE_INIT(2075, 500),
> + DA9052_REGULATOR_INIT(2075, 500),
> + DA9052_REGULATOR_INIT(2500, 925),
> + DA9052_REGULATOR_INIT(3600, 1800),
> + /* LDO */
> + DA9052_REGULATOR_INIT(1800, 600),
> + DA9052_REGULATOR_INIT(1800, 600),
> + DA9052_REGULATOR_INIT(3300, 1725),
> + DA9052_REGULATOR_INIT(3300, 1725),
> + DA9052_REGULATOR_INIT(3600, 1200),
> + DA9052_REGULATOR_INIT(3600, 1200),
> + DA9052_REGULATOR_INIT(3600, 1200),
> + DA9052_REGULATOR_INIT(3600, 1200),
> + DA9052_REGULATOR_INIT(3650, 1250),
> + DA9052_REGULATOR_INIT(3600, 1200),
> +
> +};
> +
> +#define DA9052_LDO(_id, step, sbits, ebits, mbits) \
> +{\
> + .reg_desc = {\
> + .name = "LDO" #_id,\
> + .ops = &da9052_regulator_ops,\
> + .type = REGULATOR_VOLTAGE,\
> + .id = _id,\
> + .owner = THIS_MODULE,\
> + },\
> + .step_uV = (step) * 1000,\
> + .volt_shift = (sbits),\
> + .enable_bit = (ebits),\
> + .supply_v_mask = (mbits),\
The formatting looks a little odd here in relation to the last }.
> +}
> +
> +#define DA9052_DCDC(_id, step, sbits, ebits, mbits) \
> +{\
> + .reg_desc = {\
> + .name = "BUCK" #_id,\
> + .ops = &da9052_regulator_ops,\
> + .type = REGULATOR_VOLTAGE,\
> + .id = _id,\
> + .owner = THIS_MODULE,\
> + },\
> + .step_uV = (step) * 1000,\
> + .volt_shift = (sbits),\
> + .enable_bit = (ebits),\
> + .supply_v_mask = (mbits),\
ditto
> +}
> +
> +struct da9052_regulator_info {
> + struct regulator_desc reg_desc;
> + int step_uV;
> + unsigned char volt_shift;
> + unsigned char enable_bit;
> + unsigned char supply_v_mask;
> +
remove newline here.
> +};
> +
> +struct da9052_regulator {
> + struct da9052 *da9052;
> + struct regulator_dev *regulators[];
> +};
> +
> +struct da9052_regulator_info da9052_regulator_info[] = {
> + /* Buck1 - 4*/
> + DA9052_DCDC(0, 25, 6, 6, DA9052_SUPPLY_VBCOREGO),
> + DA9052_DCDC(1, 25, 6, 6, DA9052_SUPPLY_VBPROGO),
> + DA9052_DCDC(2, 25, 6, 6, DA9052_SUPPLY_VBMEMGO),
> + DA9052_DCDC(3, 50, 5, 6, 0),
> + /* LD01 - LDO10*/
> + DA9052_LDO(4, 50, 5, 6, 0),
> + DA9052_LDO(5, 25, 6, 6, DA9052_SUPPLY_VLDO2GO),
> + DA9052_LDO(6, 25, 6, 6, DA9052_SUPPLY_VLDO3GO),
> + DA9052_LDO(7, 25, 6, 6, 0),
> + DA9052_LDO(8, 50, 6, 6, 0),
> + DA9052_LDO(9, 50, 6, 6, 0),
> + DA9052_LDO(10, 50, 6, 6, 0),
> + DA9052_LDO(11, 50, 6, 6, 0),
> + DA9052_LDO(12, 50, 6, 6, 0),
> + DA9052_LDO(13, 50, 6, 6, 0),
> +};
> +
> +static inline struct da9052 *to_da9052(struct regulator_dev *rdev)
> +{
> + return dev_get_drvdata(rdev_get_dev(rdev)->parent->parent);
> +
> +}
> +
> +static int da9052_regulator_uvolts_to_regVal(struct regulator_dev *rdev,
> + unsigned int val)
> +{
> + struct regulation_constraints *constraints = rdev->constraints;
> + int offset = rdev_get_id(rdev);
> + int reg_val = 0;
> +
> + /* Care for the varying step size of BUCK PERI */
> + if ((offset == DA9052_BUCK_PERI) && (val >= DA9052_CONST_3uV)) {
> + reg_val = (DA9052_CONST_3uV - constraints->min_uV)/
> + (da9052_regulator_info[offset].step_uV);
> + reg_val += ((val - DA9052_CONST_3uV) /
> + (DA9052_BUCK_PERI_3uV_STEP));
> + } else{
space after else
Regards
Liam
On Wed, Apr 13, 2011 at 05:42:08PM +0530, Ashish Jangam wrote:
> Changes made since last submission:
> . Change the regulator registration method
> . Ported the driver to Linux kernel 2.6.38.2
> Linux Kernel Version: 2.6.38.2
As I've repeatedly told you you should submit patches against -next.
Please stop doing this, it's getting repetitive. A few comments from a
breif scan through:
> +static struct regulator_consumer_supply da9052_vddarm_consumers[] = {
> + {
> + .supply = "vcc",
> + }
> +};
Supplies are connected to regulators using the machine driver not
drivers for specific regulators.
> + if (offset == DA9052_BUCK_PERI) {
> + if (regval >= DA9052_BUCK_PERI_REG_MAP_UPTO_3uV) {
> + regval_uV = ((DA9052_BUCK_PERI_REG_MAP_UPTO_3uV *
> + da9052_regulator_info[offset].step_uV)
> + + constraints->min_uV);
> + regval_uV += (regval -
> + DA9052_BUCK_PERI_REG_MAP_UPTO_3uV)
> + *(DA9052_BUCK_PERI_3uV_STEP);
> + } else {
> + regval_uV =
> + (regval * da9052_regulator_info[offset].step_uV)
> + + constraints->min_uV;
> + }
Given this and the number of other differences it seems like you should
just define separate ops for BUCK_PERI.
> +static int da9052_regulator_set_voltage(struct regulator_dev *rdev, int min_uV,
> + int max_uV, unsigned *selector)
> +{
> + struct da9052 *da9052 = to_da9052(rdev);
> + int offset = rdev_get_id(rdev);
> + int ret;
> + int reg_val = 0;
> +
> + reg_val = da9052_regulator_uvolts_to_regVal(rdev, min_uV);
You're completely ignoring the max_uV constraint here.
> +static int da9052_list_voltage(struct regulator_dev *rdev, unsigned selector)
> +{
> + struct regulation_constraints *constraints = rdev->constraints;
> + struct da9052_regulator_info *info = rdev_get_drvdata(rdev);
> + int ret;
> +
> + ret = constraints->min_uV + info->step_uV * selector;
> + if (ret > constraints->max_uV)
> + return -EINVAL;
This looks *very* broken. Why are you looking at the constraints to
determine what the selector means?