lkml.org 
[lkml]   [2012]   [May]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH v4 2/3] regulator: MAX77686: Add Maxim 77686 regulator driver
    On Mon, 21 May 2012, Jonghwa Lee wrote:

    > diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
    > index 36db5a4..8e2ebad 100644
    > --- a/drivers/regulator/Kconfig
    > +++ b/drivers/regulator/Kconfig
    > @@ -195,6 +195,14 @@ config REGULATOR_MAX8998
    > via I2C bus. The provided regulator is suitable for S3C6410
    > and S5PC1XX chips to control VCC_CORE and VCC_USIM voltages.
    >
    > +config REGULATOR_MAX77686
    > + tristate "Maxim 77686 regulator"
    > + depends on MFD_MAX77686
    > + help
    > + This driver controls a Maxim 77686 regulator
    > + via I2C bus. The provided regulator is suitable for
    > + Exynos-4 chips to control VARM and VINT voltages.
    > +
    > config REGULATOR_PCAP
    > tristate "Motorola PCAP2 regulator driver"
    > depends on EZX_PCAP
    > diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
    > index 94b5274..008931b 100644
    > --- a/drivers/regulator/Makefile
    > +++ b/drivers/regulator/Makefile
    > @@ -30,6 +30,7 @@ obj-$(CONFIG_REGULATOR_MAX8925) += max8925-regulator.o
    > obj-$(CONFIG_REGULATOR_MAX8952) += max8952.o
    > obj-$(CONFIG_REGULATOR_MAX8997) += max8997.o
    > obj-$(CONFIG_REGULATOR_MAX8998) += max8998.o
    > +obj-$(CONFIG_REGULATOR_MAX77686) += max77686.o
    > obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o
    > obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
    > obj-$(CONFIG_REGULATOR_MC13XXX_CORE) += mc13xxx-regulator-core.o
    > diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686.c
    > new file mode 100644
    > index 0000000..cb8ec6c
    > --- /dev/null
    > +++ b/drivers/regulator/max77686.c
    > @@ -0,0 +1,438 @@
    > +/*
    > + * max77686.c - Regulator driver for the Maxim 77686
    > + *
    > + * Copyright (C) 2012 Samsung Electronics
    > + * Chiwoong Byun <woong.byun@smasung.com>
    > + * Jonghwa Lee <jonghwa3.lee@samsung.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.
    > + *
    > + * You should have received a copy of the GNU General Public License
    > + * along with this program; if not, write to the Free Software
    > + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
    > + *
    > + * This driver is based on max8997.c
    > + */
    > +#define pr_fmt(fmt) "%s: " fmt, __func__
    > +
    > +#include <linux/bug.h>
    > +#include <linux/delay.h>
    > +#include <linux/err.h>
    > +#include <linux/gpio.h>
    > +#include <linux/slab.h>
    > +#include <linux/platform_device.h>
    > +#include <linux/regulator/driver.h>
    > +#include <linux/regulator/machine.h>
    > +#include <linux/mfd/max77686.h>
    > +#include <linux/mfd/max77686-private.h>
    > +
    > +#define MAX77686_LDO_MINUV 800000
    > +#define MAX77686_LDO_UVSTEP 50000
    > +#define MAX77686_LDO_LOW_MINUV 800000
    > +#define MAX77686_LDO_LOW_UVSTEP 25000
    > +#define MAX77686_BUCK_MINUV 750000
    > +#define MAX77686_BUCK_UVSTEP 50000
    > +#define MAX77686_DVS_MINUV 600000
    > +#define MAX77686_DVS_UVSTEP 12500
    > +
    > +#define MAX77686_OPMODE_SHIFT 6
    > +#define MAX77686_OPMODE_BUCK234_SHIFT 4
    > +#define MAX77686_OPMODE_MASK 0x3
    > +
    > +#define MAX77686_VSEL_MASK 0x3f
    > +#define MAX77686_DVS_VSEL_MASK 0xff
    > +
    > +#define MAX77686_RAMP_RATE 100
    > +
    > +#define MAX77686_REGULATORS 35
    > +#define MAX77686_LDOS 26
    > +
    > +struct max77686_data {
    > + struct device *dev;
    > + struct max77686_dev *iodev;
    > + int num_regulators;
    > + struct regulator_dev **rdev;
    > + int ramp_delay; /* in mV/us */
    > +
    > + struct max77686_opmode_data *opmode_data;
    > +
    > + u8 buck2_vol[8];
    > + u8 buck3_vol[8];
    > + u8 buck4_vol[8];
    > +};
    > +
    > +static int max77686_get_enable_register(int rid, unsigned int *reg,
    > + unsigned int *mask)
    > +{
    > + switch (rid) {
    > + case MAX77686_LDO1 ... MAX77686_LDO26:
    > + *reg = MAX77686_REG_LDO1CTRL1 + (rid - MAX77686_LDO1);
    > + *mask = MAX77686_OPMODE_MASK << MAX77686_OPMODE_SHIFT;
    > + break;
    > + case MAX77686_BUCK1:
    > + *reg = MAX77686_REG_BUCK1CTRL;
    > + *mask = MAX77686_OPMODE_MASK;
    > + break;
    > + case MAX77686_BUCK2:
    > + case MAX77686_BUCK3:
    > + case MAX77686_BUCK4:
    > + *reg = MAX77686_REG_BUCK2CTRL1 + (rid - MAX77686_BUCK2) * 10;
    > + *mask = MAX77686_OPMODE_MASK << MAX77686_OPMODE_BUCK234_SHIFT;
    > + break;
    > + case MAX77686_BUCK5 ... MAX77686_BUCK9:
    > + *reg = MAX77686_REG_BUCK5CTRL + (rid - MAX77686_BUCK5) * 2;
    > + *mask = MAX77686_OPMODE_MASK;
    > + break;
    > + case MAX77686_EN32KHZ_AP ... MAX77686_P32KH:
    > + *reg = MAX77686_REG_32KHZ;
    > + *mask = 0x01 << (rid - MAX77686_EN32KHZ_AP);
    > + break;
    > + default:
    > + return -EINVAL;
    > + }
    > +
    > + return 0;
    > +}
    > +
    > +static int max77686_get_voltage_register(int rid, unsigned int *_reg,
    > + unsigned int *_mask)
    > +{
    > + int reg, mask = MAX77686_VSEL_MASK;
    > +
    > + switch (rid) {
    > + case MAX77686_LDO1 ... MAX77686_LDO26:
    > + reg = MAX77686_REG_LDO1CTRL1 + (rid - MAX77686_LDO1);
    > + break;
    > + case MAX77686_BUCK1:
    > + reg = MAX77686_REG_BUCK1OUT;
    > + break;
    > + case MAX77686_BUCK2:
    > + reg = MAX77686_REG_BUCK2DVS1;
    > + mask = MAX77686_DVS_VSEL_MASK;
    > + break;
    > + case MAX77686_BUCK3:
    > + reg = MAX77686_REG_BUCK3DVS1;
    > + mask = MAX77686_DVS_VSEL_MASK;
    > + break;
    > + case MAX77686_BUCK4:
    > + reg = MAX77686_REG_BUCK4DVS1;
    > + mask = MAX77686_DVS_VSEL_MASK;
    > + break;
    > + case MAX77686_BUCK5 ... MAX77686_BUCK9:
    > + reg = MAX77686_REG_BUCK5OUT + (rid - MAX77686_BUCK5) * 2;
    > + break;
    > + default:
    > + return -EINVAL;
    > + }
    > +
    > + *_reg = reg;
    > + *_mask = mask;
    > +
    > + return 0;
    > +}
    > +
    > +static int max77686_set_voltage_time_sel(struct regulator_dev *rdev,
    > + unsigned int old_selector, unsigned int new_selector)
    > +{
    > + struct max77686_data *max77686 = rdev_get_drvdata(rdev);
    > + int rid = rdev_get_id(rdev);
    > +
    > + switch (rid) {
    > + case MAX77686_BUCK2 ... MAX77686_BUCK4:
    > + if (old_selector < new_selector)
    > + return (DIV_ROUND_UP(rdev->desc->uV_step
    > + * (new_selector - old_selector),
    > + max77686->ramp_delay * 1000));
    > + case MAX77686_BUCK1:
    > + case MAX77686_BUCK5 ... MAX77686_BUCK9:
    > + /* Unconditionally 100 mV/us */
    > + if (old_selector < new_selector)
    > + return (DIV_ROUND_UP(rdev->desc->uV_step
    > + * (new_selector - old_selector), 100000));
    > + default:
    > + return 0;
    > + }
    > +}
    > +
    > +static struct regulator_ops max77686_ldo_ops = {
    > + .list_voltage = regulator_list_voltage_linear,
    > + .is_enabled = regulator_is_enabled_regmap,
    > + .enable = regulator_enable_regmap,
    > + .disable = regulator_disable_regmap,
    > + .get_voltage_sel = regulator_get_voltage_sel_regmap,
    > + .set_voltage_sel = regulator_set_voltage_sel_regmap,
    > + .set_voltage_time_sel = max77686_set_voltage_time_sel,
    > +};
    > +
    > +static struct regulator_ops max77686_buck_ops = {
    > + .list_voltage = regulator_list_voltage_linear,
    > + .is_enabled = regulator_is_enabled_regmap,
    > + .enable = regulator_enable_regmap,
    > + .disable = regulator_disable_regmap,
    > + .get_voltage_sel = regulator_get_voltage_sel_regmap,
    > + .set_voltage_sel = regulator_set_voltage_sel_regmap,
    > + .set_voltage_time_sel = max77686_set_voltage_time_sel,
    > +};
    > +
    > +static struct regulator_ops max77686_fixedvolt_ops = {
    > + .list_voltage = regulator_list_voltage_linear,
    > + .is_enabled = regulator_is_enabled_regmap,
    > + .enable = regulator_enable_regmap,
    > + .disable = regulator_disable_regmap,
    > +};
    > +
    > +#define regulator_desc_ldo(num) { \
    > + .name = "LDO"#num, \
    > + .id = MAX77686_LDO##num, \
    > + .ops = &max77686_ldo_ops, \
    > + .type = REGULATOR_VOLTAGE, \
    > + .owner = THIS_MODULE, \
    > + .min_uV = MAX77686_LDO_MINUV, \
    > + .uV_step = MAX77686_LDO_UVSTEP, \
    > + .n_voltages = MAX77686_VSEL_MASK + 1, \
    > +}
    > +#define regulator_desc_ldo_low(num) { \
    > + .name = "LDO"#num, \
    > + .id = MAX77686_LDO##num, \
    > + .ops = &max77686_ldo_ops, \
    > + .type = REGULATOR_VOLTAGE, \
    > + .owner = THIS_MODULE, \
    > + .min_uV = MAX77686_LDO_LOW_MINUV, \
    > + .uV_step = MAX77686_LDO_LOW_UVSTEP, \
    > + .n_voltages = MAX77686_VSEL_MASK + 1, \
    > +}
    > +#define regulator_desc_buck(num) { \
    > + .name = "BUCK"#num, \
    > + .id = MAX77686_BUCK##num, \
    > + .ops = &max77686_buck_ops, \
    > + .type = REGULATOR_VOLTAGE, \
    > + .owner = THIS_MODULE, \
    > + .min_uV = MAX77686_BUCK_MINUV, \
    > + .uV_step = MAX77686_BUCK_UVSTEP, \
    > + .n_voltages = MAX77686_VSEL_MASK + 1, \
    > +}
    > +#define regulator_desc_buck_dvs(num) { \
    > + .name = "BUCK"#num, \
    > + .id = MAX77686_BUCK##num, \
    > + .ops = &max77686_buck_ops, \
    > + .type = REGULATOR_VOLTAGE, \
    > + .owner = THIS_MODULE, \
    > + .min_uV = MAX77686_DVS_MINUV, \
    > + .uV_step = MAX77686_DVS_UVSTEP, \
    > + .n_voltages = MAX77686_DVS_VSEL_MASK + 1, \
    > +}
    > +static struct regulator_desc regulators[] = {
    > + regulator_desc_ldo_low(1),
    > + regulator_desc_ldo_low(2),
    > + regulator_desc_ldo(3),
    > + regulator_desc_ldo(4),
    > + regulator_desc_ldo(5),
    > + regulator_desc_ldo_low(6),
    > + regulator_desc_ldo_low(7),
    > + regulator_desc_ldo_low(8),
    > + regulator_desc_ldo(9),
    > + regulator_desc_ldo(10),
    > + regulator_desc_ldo(11),
    > + regulator_desc_ldo(12),
    > + regulator_desc_ldo(13),
    > + regulator_desc_ldo(14),
    > + regulator_desc_ldo_low(15),
    > + regulator_desc_ldo(16),
    > + regulator_desc_ldo(17),
    > + regulator_desc_ldo(18),
    > + regulator_desc_ldo(19),
    > + regulator_desc_ldo(20),
    > + regulator_desc_ldo(21),
    > + regulator_desc_ldo(22),
    > + regulator_desc_ldo(23),
    > + regulator_desc_ldo(24),
    > + regulator_desc_ldo(25),
    > + regulator_desc_ldo(26),
    > + regulator_desc_buck(1),
    > + regulator_desc_buck_dvs(2),
    > + regulator_desc_buck_dvs(3),
    > + regulator_desc_buck_dvs(4),
    > + regulator_desc_buck(5),
    > + regulator_desc_buck(6),
    > + regulator_desc_buck(7),
    > + regulator_desc_buck(8),
    > + regulator_desc_buck(9),
    > +};
    > +
    > +static __devinit int max77686_pmic_probe(struct platform_device *pdev)
    > +{
    > + struct max77686_dev *iodev = dev_get_drvdata(pdev->dev.parent);
    > + struct max77686_platform_data *pdata = dev_get_platdata(iodev->dev);
    > + struct regulator_dev **rdev;
    > + struct max77686_data *max77686;
    > + struct regulator_init_data **init_data;
    > + int i, size;
    > + int ret = 0;
    > + struct regulator_config config;
    > + unsigned int data = 0;
    > +
    > + dev_dbg(&pdev->dev, "%s\n", __func__);
    > +
    > + max77686 = devm_kzalloc(&pdev->dev, sizeof(struct max77686_data),
    > + GFP_KERNEL);
    > + if (!max77686)
    > + return -ENOMEM;
    > +
    > + size = sizeof(struct regulator_dev *) * MAX77686_REGULATORS;
    > + max77686->rdev = devm_kzalloc(&pdev->dev, size, GFP_KERNEL);
    > + if (!max77686->rdev)
    > + return -ENOMEM;

    Does this leak max77686?

    > +
    > + rdev = max77686->rdev;
    > + max77686->dev = &pdev->dev;
    > + max77686->iodev = iodev;
    > + if (pdata)
    > + max77686->num_regulators = pdata->num_regulators;
    > + platform_set_drvdata(pdev, max77686);
    > + init_data = devm_kzalloc(&pdev->dev,
    > + sizeof(struct regulator_init_data *)
    > + * MAX77686_REGULATORS, GFP_KERNEL);

    No error handling, which will cause a NULL pointer later when you use this
    array.

    > + config.dev = max77686->dev;
    > + config.regmap = iodev->regmap;
    > + config.driver_data = max77686;
    > +
    > + if (pdata)
    > + max77686->opmode_data = pdata->opmode_data;
    > +
    > + max77686->ramp_delay = MAX77686_RAMP_RATE; /* Set 0x3 for RAMP */
    > + regmap_update_bits(max77686->iodev->regmap,
    > + MAX77686_REG_BUCK2CTRL1, 0xC0, 0xC0);
    > + regmap_update_bits(max77686->iodev->regmap,
    > + MAX77686_REG_BUCK3CTRL1, 0xC0, 0xC0);
    > + regmap_update_bits(max77686->iodev->regmap,
    > + MAX77686_REG_BUCK4CTRL1, 0xC0, 0xC0);
    > +
    > + regmap_read(max77686->iodev->regmap, MAX77686_REG_DEVICE_ID, &data);
    > +
    > + for (i = 0; i < MAX77686_REGULATORS; i++) {
    > + if (pdata)
    > + init_data[pdata->regulators[i].id] =
    > + pdata->regulators[i].initdata;
    > +
    > + max77686_get_enable_register(regulators[i].id,
    > + &regulators[i].enable_reg, &regulators[i].enable_mask);
    > + max77686_get_voltage_register(regulators[i].id,
    > + &regulators[i].vsel_reg, &regulators[i].vsel_mask);
    > +
    > + config.init_data = init_data[i];
    > + rdev[i] = regulator_register(&regulators[i], &config);
    > +
    > + if (IS_ERR(rdev[i])) {
    > + ret = PTR_ERR(rdev[i]);
    > + dev_err(max77686->dev,
    > + "regulator init failed for %d\n", i);
    > + rdev[i] = NULL;
    > + goto err;
    > + }
    > + }
    > +
    > + for (i = 0; i < 8; i++) {
    > + if (pdata->buck2_voltage[i] > 0)
    > + ret = regulator_map_voltage_linear(
    > + rdev[MAX77686_LDOS+1],
    > + pdata->buck2_voltage[i],
    > + pdata->buck2_voltage[i]
    > + + MAX77686_DVS_UVSTEP);
    > + /* 1.1V as default for safety */
    > + if (pdata->buck2_voltage[i] <= 0 || ret < 0)
    > + max77686->buck2_vol[i] = 0x28;
    > + else
    > + max77686->buck2_vol[i] = ret;
    > + regmap_write(max77686->iodev->regmap,
    > + MAX77686_REG_BUCK2DVS1 + i, max77686->buck2_vol[i]);
    > +
    > + if (pdata->buck3_voltage[i] > 0)
    > + ret = regulator_map_voltage_linear(
    > + rdev[MAX77686_LDOS+1],
    > + pdata->buck3_voltage[i],
    > + pdata->buck3_voltage[i]
    > + + MAX77686_DVS_UVSTEP);
    > + /* 1.1V as default for safety */
    > + if (pdata->buck3_voltage[i] <= 0 || ret < 0)
    > + max77686->buck3_vol[i] = 0x28;
    > + else
    > + max77686->buck3_vol[i] = ret;
    > + regmap_write(max77686->iodev->regmap,
    > + MAX77686_REG_BUCK3DVS1 + i, max77686->buck3_vol[i]);
    > +
    > + if (pdata->buck4_voltage[i] > 0)
    > + ret = regulator_map_voltage_linear(
    > + rdev[MAX77686_LDOS+1],
    > + pdata->buck4_voltage[i],
    > + pdata->buck4_voltage[i]
    > + + MAX77686_DVS_UVSTEP);
    > + /* 1.1V as default for safety */
    > + if (pdata->buck4_voltage[i] <= 0 || ret < 0)
    > + max77686->buck4_vol[i] = 0x28;
    > + else
    > + max77686->buck4_vol[i] = ret;
    > + regmap_write(max77686->iodev->regmap,
    > + MAX77686_REG_BUCK4DVS1 + i, max77686->buck4_vol[i]);
    > + }
    > +
    > + return 0;
    > +err:
    > + for (i = 0; i < MAX77686_REGULATORS; i++) {
    > + if (rdev[i])
    > + regulator_unregister(rdev[i]);
    > + }
    > + return ret;
    > +}
    > +
    > +static int __devexit max77686_pmic_remove(struct platform_device *pdev)
    > +{
    > + struct max77686_data *max77686 = platform_get_drvdata(pdev);
    > + struct regulator_dev **rdev = max77686->rdev;
    > + int i;
    > +
    > + for (i = 0; i < MAX77686_REGULATORS; i++)
    > + if (rdev[i])
    > + regulator_unregister(rdev[i]);
    > +
    > + return 0;
    > +}
    > +
    > +static const struct platform_device_id max77686_pmic_id[] = {
    > + { "max77686-pmic", 0},
    > + { },
    > +};
    > +MODULE_DEVICE_TABLE(platform, max77686_pmic_id);
    > +
    > +static struct platform_driver max77686_pmic_driver = {
    > + .driver = {
    > + .name = "max77686-pmic",
    > + .owner = THIS_MODULE,
    > + },
    > + .probe = max77686_pmic_probe,
    > + .remove = __devexit_p(max77686_pmic_remove),
    > + .id_table = max77686_pmic_id,
    > +};
    > +
    > +static int __init max77686_pmic_init(void)
    > +{
    > + return platform_driver_register(&max77686_pmic_driver);
    > +}
    > +subsys_initcall(max77686_pmic_init);
    > +
    > +static void __exit max77686_pmic_cleanup(void)
    > +{
    > + platform_driver_unregister(&max77686_pmic_driver);
    > +}
    > +module_exit(max77686_pmic_cleanup);
    > +
    > +MODULE_DESCRIPTION("MAXIM 77686 Regulator Driver");
    > +MODULE_AUTHOR("Chiwoong Byun <woong.byun@samsung.com>");
    > +MODULE_LICENSE("GPL");


    \
     
     \ /
      Last update: 2012-05-21 23:41    [W:0.091 / U:120.528 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site