Merge remote-tracking branches 'regulator/topic/as3711', 'regulator/topic/axp20x', 'regulator/topic/bcm590xx' and 'regulator/topic/da9211' into regulator-next
This commit is contained in:
Mark Brown
commit
95528a55db
8 changed files with 260 additions and 71 deletions
63
Documentation/devicetree/bindings/regulator/da9211.txt
Normal file
63
Documentation/devicetree/bindings/regulator/da9211.txt
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
* Dialog Semiconductor DA9211/DA9213 Voltage Regulator
|
||||
|
||||
Required properties:
|
||||
- compatible: "dlg,da9211" or "dlg,da9213".
|
||||
- reg: I2C slave address, usually 0x68.
|
||||
- interrupts: the interrupt outputs of the controller
|
||||
- regulators: A node that houses a sub-node for each regulator within the
|
||||
device. Each sub-node is identified using the node's name, with valid
|
||||
values listed below. The content of each sub-node is defined by the
|
||||
standard binding for regulators; see regulator.txt.
|
||||
BUCKA and BUCKB.
|
||||
|
||||
Optional properties:
|
||||
- Any optional property defined in regulator.txt
|
||||
|
||||
Example 1) DA9211
|
||||
|
||||
pmic: da9211@68 {
|
||||
compatible = "dlg,da9211";
|
||||
reg = <0x68>;
|
||||
interrupts = <3 27>;
|
||||
|
||||
regulators {
|
||||
BUCKA {
|
||||
regulator-name = "VBUCKA";
|
||||
regulator-min-microvolt = < 300000>;
|
||||
regulator-max-microvolt = <1570000>;
|
||||
regulator-min-microamp = <2000000>;
|
||||
regulator-max-microamp = <5000000>;
|
||||
};
|
||||
BUCKB {
|
||||
regulator-name = "VBUCKB";
|
||||
regulator-min-microvolt = < 300000>;
|
||||
regulator-max-microvolt = <1570000>;
|
||||
regulator-min-microamp = <2000000>;
|
||||
regulator-max-microamp = <5000000>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
Example 2) DA92113
|
||||
pmic: da9213@68 {
|
||||
compatible = "dlg,da9213";
|
||||
reg = <0x68>;
|
||||
interrupts = <3 27>;
|
||||
|
||||
regulators {
|
||||
BUCKA {
|
||||
regulator-name = "VBUCKA";
|
||||
regulator-min-microvolt = < 300000>;
|
||||
regulator-max-microvolt = <1570000>;
|
||||
regulator-min-microamp = <3000000>;
|
||||
regulator-max-microamp = <6000000>;
|
||||
};
|
||||
BUCKB {
|
||||
regulator-name = "VBUCKB";
|
||||
regulator-min-microvolt = < 300000>;
|
||||
regulator-max-microvolt = <1570000>;
|
||||
regulator-min-microamp = <3000000>;
|
||||
regulator-max-microamp = <6000000>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
@ -199,13 +199,14 @@ config REGULATOR_DA9210
|
|||
interface.
|
||||
|
||||
config REGULATOR_DA9211
|
||||
tristate "Dialog Semiconductor DA9211/DA9212 regulator"
|
||||
tristate "Dialog Semiconductor DA9211/DA9212/DA9213/DA9214 regulator"
|
||||
depends on I2C
|
||||
select REGMAP_I2C
|
||||
help
|
||||
Say y here to support for the Dialog Semiconductor DA9211/DA9212.
|
||||
The DA9211/DA9212 is a multi-phase synchronous step down
|
||||
converter 12A DC-DC Buck controlled through an I2C
|
||||
Say y here to support for the Dialog Semiconductor DA9211/DA9212
|
||||
/DA9213/DA9214.
|
||||
The DA9211/DA9212/DA9213/DA9214 is a multi-phase synchronous
|
||||
step down converter 12A or 16A DC-DC Buck controlled through an I2C
|
||||
interface.
|
||||
|
||||
config REGULATOR_DBX500_PRCMU
|
||||
|
|
|
|||
|
|
@ -22,12 +22,10 @@
|
|||
|
||||
struct as3711_regulator_info {
|
||||
struct regulator_desc desc;
|
||||
unsigned int max_uV;
|
||||
};
|
||||
|
||||
struct as3711_regulator {
|
||||
struct as3711_regulator_info *reg_info;
|
||||
struct regulator_dev *rdev;
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
@ -132,39 +130,37 @@ static const struct regulator_linear_range as3711_dldo_ranges[] = {
|
|||
REGULATOR_LINEAR_RANGE(1750000, 0x20, 0x3f, 50000),
|
||||
};
|
||||
|
||||
#define AS3711_REG(_id, _en_reg, _en_bit, _vmask, _vshift, _min_uV, _max_uV, _sfx) \
|
||||
[AS3711_REGULATOR_ ## _id] = { \
|
||||
.desc = { \
|
||||
.name = "as3711-regulator-" # _id, \
|
||||
.id = AS3711_REGULATOR_ ## _id, \
|
||||
.n_voltages = (_vmask + 1), \
|
||||
.ops = &as3711_ ## _sfx ## _ops, \
|
||||
.type = REGULATOR_VOLTAGE, \
|
||||
.owner = THIS_MODULE, \
|
||||
.vsel_reg = AS3711_ ## _id ## _VOLTAGE, \
|
||||
.vsel_mask = _vmask << _vshift, \
|
||||
.enable_reg = AS3711_ ## _en_reg, \
|
||||
.enable_mask = BIT(_en_bit), \
|
||||
.min_uV = _min_uV, \
|
||||
.linear_ranges = as3711_ ## _sfx ## _ranges, \
|
||||
.n_linear_ranges = ARRAY_SIZE(as3711_ ## _sfx ## _ranges), \
|
||||
}, \
|
||||
.max_uV = _max_uV, \
|
||||
#define AS3711_REG(_id, _en_reg, _en_bit, _vmask, _sfx) \
|
||||
[AS3711_REGULATOR_ ## _id] = { \
|
||||
.desc = { \
|
||||
.name = "as3711-regulator-" # _id, \
|
||||
.id = AS3711_REGULATOR_ ## _id, \
|
||||
.n_voltages = (_vmask + 1), \
|
||||
.ops = &as3711_ ## _sfx ## _ops, \
|
||||
.type = REGULATOR_VOLTAGE, \
|
||||
.owner = THIS_MODULE, \
|
||||
.vsel_reg = AS3711_ ## _id ## _VOLTAGE, \
|
||||
.vsel_mask = _vmask, \
|
||||
.enable_reg = AS3711_ ## _en_reg, \
|
||||
.enable_mask = BIT(_en_bit), \
|
||||
.linear_ranges = as3711_ ## _sfx ## _ranges, \
|
||||
.n_linear_ranges = ARRAY_SIZE(as3711_ ## _sfx ## _ranges), \
|
||||
}, \
|
||||
}
|
||||
|
||||
static struct as3711_regulator_info as3711_reg_info[] = {
|
||||
AS3711_REG(SD_1, SD_CONTROL, 0, 0x7f, 0, 612500, 3350000, sd),
|
||||
AS3711_REG(SD_2, SD_CONTROL, 1, 0x7f, 0, 612500, 3350000, sd),
|
||||
AS3711_REG(SD_3, SD_CONTROL, 2, 0x7f, 0, 612500, 3350000, sd),
|
||||
AS3711_REG(SD_4, SD_CONTROL, 3, 0x7f, 0, 612500, 3350000, sd),
|
||||
AS3711_REG(LDO_1, LDO_1_VOLTAGE, 7, 0x1f, 0, 1200000, 3300000, aldo),
|
||||
AS3711_REG(LDO_2, LDO_2_VOLTAGE, 7, 0x1f, 0, 1200000, 3300000, aldo),
|
||||
AS3711_REG(LDO_3, LDO_3_VOLTAGE, 7, 0x3f, 0, 900000, 3300000, dldo),
|
||||
AS3711_REG(LDO_4, LDO_4_VOLTAGE, 7, 0x3f, 0, 900000, 3300000, dldo),
|
||||
AS3711_REG(LDO_5, LDO_5_VOLTAGE, 7, 0x3f, 0, 900000, 3300000, dldo),
|
||||
AS3711_REG(LDO_6, LDO_6_VOLTAGE, 7, 0x3f, 0, 900000, 3300000, dldo),
|
||||
AS3711_REG(LDO_7, LDO_7_VOLTAGE, 7, 0x3f, 0, 900000, 3300000, dldo),
|
||||
AS3711_REG(LDO_8, LDO_8_VOLTAGE, 7, 0x3f, 0, 900000, 3300000, dldo),
|
||||
AS3711_REG(SD_1, SD_CONTROL, 0, 0x7f, sd),
|
||||
AS3711_REG(SD_2, SD_CONTROL, 1, 0x7f, sd),
|
||||
AS3711_REG(SD_3, SD_CONTROL, 2, 0x7f, sd),
|
||||
AS3711_REG(SD_4, SD_CONTROL, 3, 0x7f, sd),
|
||||
AS3711_REG(LDO_1, LDO_1_VOLTAGE, 7, 0x1f, aldo),
|
||||
AS3711_REG(LDO_2, LDO_2_VOLTAGE, 7, 0x1f, aldo),
|
||||
AS3711_REG(LDO_3, LDO_3_VOLTAGE, 7, 0x3f, dldo),
|
||||
AS3711_REG(LDO_4, LDO_4_VOLTAGE, 7, 0x3f, dldo),
|
||||
AS3711_REG(LDO_5, LDO_5_VOLTAGE, 7, 0x3f, dldo),
|
||||
AS3711_REG(LDO_6, LDO_6_VOLTAGE, 7, 0x3f, dldo),
|
||||
AS3711_REG(LDO_7, LDO_7_VOLTAGE, 7, 0x3f, dldo),
|
||||
AS3711_REG(LDO_8, LDO_8_VOLTAGE, 7, 0x3f, dldo),
|
||||
/* StepUp output voltage depends on supplying regulator */
|
||||
};
|
||||
|
||||
|
|
@ -263,7 +259,6 @@ static int as3711_regulator_probe(struct platform_device *pdev)
|
|||
ri->desc.name);
|
||||
return PTR_ERR(rdev);
|
||||
}
|
||||
reg->rdev = rdev;
|
||||
}
|
||||
platform_set_drvdata(pdev, regs);
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -245,7 +245,7 @@ static int axp20x_regulator_probe(struct platform_device *pdev)
|
|||
for (i = 0; i < AXP20X_REG_ID_MAX; i++) {
|
||||
init_data = axp20x_matches[i].init_data;
|
||||
|
||||
config.dev = &pdev->dev;
|
||||
config.dev = pdev->dev.parent;
|
||||
config.init_data = init_data;
|
||||
config.regmap = axp20x->regmap;
|
||||
config.of_node = axp20x_matches[i].of_node;
|
||||
|
|
|
|||
|
|
@ -202,7 +202,6 @@ static struct bcm590xx_info bcm590xx_regs[] = {
|
|||
struct bcm590xx_reg {
|
||||
struct regulator_desc *desc;
|
||||
struct bcm590xx *mfd;
|
||||
struct bcm590xx_info **info;
|
||||
};
|
||||
|
||||
static int bcm590xx_get_vsel_register(int id)
|
||||
|
|
@ -389,11 +388,6 @@ static int bcm590xx_probe(struct platform_device *pdev)
|
|||
if (!pmu->desc)
|
||||
return -ENOMEM;
|
||||
|
||||
pmu->info = devm_kzalloc(&pdev->dev, BCM590XX_NUM_REGS *
|
||||
sizeof(struct bcm590xx_info *), GFP_KERNEL);
|
||||
if (!pmu->info)
|
||||
return -ENOMEM;
|
||||
|
||||
info = bcm590xx_regs;
|
||||
|
||||
for (i = 0; i < BCM590XX_NUM_REGS; i++, info++) {
|
||||
|
|
@ -403,8 +397,6 @@ static int bcm590xx_probe(struct platform_device *pdev)
|
|||
reg_data = NULL;
|
||||
|
||||
/* Register the regulators */
|
||||
pmu->info[i] = info;
|
||||
|
||||
pmu->desc[i].name = info->name;
|
||||
pmu->desc[i].supply_name = info->vin_name;
|
||||
pmu->desc[i].id = i;
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* da9211-regulator.c - Regulator device driver for DA9211
|
||||
* da9211-regulator.c - Regulator device driver for DA9211/DA9213
|
||||
* Copyright (C) 2014 Dialog Semiconductor Ltd.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
|
|
@ -24,9 +24,14 @@
|
|||
#include <linux/regmap.h>
|
||||
#include <linux/irq.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/regulator/of_regulator.h>
|
||||
#include <linux/regulator/da9211.h>
|
||||
#include "da9211-regulator.h"
|
||||
|
||||
/* DEVICE IDs */
|
||||
#define DA9211_DEVICE_ID 0x22
|
||||
#define DA9213_DEVICE_ID 0x23
|
||||
|
||||
#define DA9211_BUCK_MODE_SLEEP 1
|
||||
#define DA9211_BUCK_MODE_SYNC 2
|
||||
#define DA9211_BUCK_MODE_AUTO 3
|
||||
|
|
@ -42,6 +47,7 @@ struct da9211 {
|
|||
struct regulator_dev *rdev[DA9211_MAX_REGULATORS];
|
||||
int num_regulator;
|
||||
int chip_irq;
|
||||
int chip_id;
|
||||
};
|
||||
|
||||
static const struct regmap_range_cfg da9211_regmap_range[] = {
|
||||
|
|
@ -52,14 +58,14 @@ static const struct regmap_range_cfg da9211_regmap_range[] = {
|
|||
.window_start = 0,
|
||||
.window_len = 256,
|
||||
.range_min = 0,
|
||||
.range_max = 2*256,
|
||||
.range_max = 5*128,
|
||||
},
|
||||
};
|
||||
|
||||
static const struct regmap_config da9211_regmap_config = {
|
||||
.reg_bits = 8,
|
||||
.val_bits = 8,
|
||||
.max_register = 2 * 256,
|
||||
.max_register = 5 * 128,
|
||||
.ranges = da9211_regmap_range,
|
||||
.num_ranges = ARRAY_SIZE(da9211_regmap_range),
|
||||
};
|
||||
|
|
@ -69,11 +75,20 @@ static const struct regmap_config da9211_regmap_config = {
|
|||
#define DA9211_MAX_MV 1570
|
||||
#define DA9211_STEP_MV 10
|
||||
|
||||
/* Current limits for buck (uA) indices corresponds with register values */
|
||||
/* Current limits for DA9211 buck (uA) indices
|
||||
* corresponds with register values
|
||||
*/
|
||||
static const int da9211_current_limits[] = {
|
||||
2000000, 2200000, 2400000, 2600000, 2800000, 3000000, 3200000, 3400000,
|
||||
3600000, 3800000, 4000000, 4200000, 4400000, 4600000, 4800000, 5000000
|
||||
};
|
||||
/* Current limits for DA9213 buck (uA) indices
|
||||
* corresponds with register values
|
||||
*/
|
||||
static const int da9213_current_limits[] = {
|
||||
3000000, 3200000, 3400000, 3600000, 3800000, 4000000, 4200000, 4400000,
|
||||
4600000, 4800000, 5000000, 5200000, 5400000, 5600000, 5800000, 6000000
|
||||
};
|
||||
|
||||
static unsigned int da9211_buck_get_mode(struct regulator_dev *rdev)
|
||||
{
|
||||
|
|
@ -129,12 +144,26 @@ static int da9211_set_current_limit(struct regulator_dev *rdev, int min,
|
|||
{
|
||||
int id = rdev_get_id(rdev);
|
||||
struct da9211 *chip = rdev_get_drvdata(rdev);
|
||||
int i;
|
||||
int i, max_size;
|
||||
const int *current_limits;
|
||||
|
||||
switch (chip->chip_id) {
|
||||
case DA9211:
|
||||
current_limits = da9211_current_limits;
|
||||
max_size = ARRAY_SIZE(da9211_current_limits)-1;
|
||||
break;
|
||||
case DA9213:
|
||||
current_limits = da9213_current_limits;
|
||||
max_size = ARRAY_SIZE(da9213_current_limits)-1;
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
/* search for closest to maximum */
|
||||
for (i = ARRAY_SIZE(da9211_current_limits)-1; i >= 0; i--) {
|
||||
if (min <= da9211_current_limits[i] &&
|
||||
max >= da9211_current_limits[i]) {
|
||||
for (i = max_size; i >= 0; i--) {
|
||||
if (min <= current_limits[i] &&
|
||||
max >= current_limits[i]) {
|
||||
return regmap_update_bits(chip->regmap,
|
||||
DA9211_REG_BUCK_ILIM,
|
||||
(0x0F << id*4), (i << id*4));
|
||||
|
|
@ -150,14 +179,28 @@ static int da9211_get_current_limit(struct regulator_dev *rdev)
|
|||
struct da9211 *chip = rdev_get_drvdata(rdev);
|
||||
unsigned int data;
|
||||
int ret;
|
||||
const int *current_limits;
|
||||
|
||||
switch (chip->chip_id) {
|
||||
case DA9211:
|
||||
current_limits = da9211_current_limits;
|
||||
break;
|
||||
case DA9213:
|
||||
current_limits = da9213_current_limits;
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
ret = regmap_read(chip->regmap, DA9211_REG_BUCK_ILIM, &data);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
/* select one of 16 values: 0000 (2000mA) to 1111 (5000mA) */
|
||||
/* select one of 16 values: 0000 (2000mA or 3000mA)
|
||||
* to 1111 (5000mA or 6000mA).
|
||||
*/
|
||||
data = (data >> id*4) & 0x0F;
|
||||
return da9211_current_limits[data];
|
||||
return current_limits[data];
|
||||
}
|
||||
|
||||
static struct regulator_ops da9211_buck_ops = {
|
||||
|
|
@ -194,6 +237,59 @@ static struct regulator_desc da9211_regulators[] = {
|
|||
DA9211_BUCK(BUCKB),
|
||||
};
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
static struct of_regulator_match da9211_matches[] = {
|
||||
[DA9211_ID_BUCKA] = { .name = "BUCKA" },
|
||||
[DA9211_ID_BUCKB] = { .name = "BUCKB" },
|
||||
};
|
||||
|
||||
static struct da9211_pdata *da9211_parse_regulators_dt(
|
||||
struct device *dev)
|
||||
{
|
||||
struct da9211_pdata *pdata;
|
||||
struct device_node *node;
|
||||
int i, num, n;
|
||||
|
||||
node = of_get_child_by_name(dev->of_node, "regulators");
|
||||
if (!node) {
|
||||
dev_err(dev, "regulators node not found\n");
|
||||
return ERR_PTR(-ENODEV);
|
||||
}
|
||||
|
||||
num = of_regulator_match(dev, node, da9211_matches,
|
||||
ARRAY_SIZE(da9211_matches));
|
||||
of_node_put(node);
|
||||
if (num < 0) {
|
||||
dev_err(dev, "Failed to match regulators\n");
|
||||
return ERR_PTR(-EINVAL);
|
||||
}
|
||||
|
||||
pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);
|
||||
if (!pdata)
|
||||
return ERR_PTR(-ENOMEM);
|
||||
|
||||
pdata->num_buck = num;
|
||||
|
||||
n = 0;
|
||||
for (i = 0; i < ARRAY_SIZE(da9211_matches); i++) {
|
||||
if (!da9211_matches[i].init_data)
|
||||
continue;
|
||||
|
||||
pdata->init_data[n] = da9211_matches[i].init_data;
|
||||
|
||||
n++;
|
||||
}
|
||||
|
||||
return pdata;
|
||||
}
|
||||
#else
|
||||
static struct da9211_pdata *da9211_parse_regulators_dt(
|
||||
struct device *dev)
|
||||
{
|
||||
return ERR_PTR(-ENODEV);
|
||||
}
|
||||
#endif
|
||||
|
||||
static irqreturn_t da9211_irq_handler(int irq, void *data)
|
||||
{
|
||||
struct da9211 *chip = data;
|
||||
|
|
@ -264,13 +360,11 @@ static int da9211_regulator_init(struct da9211 *chip)
|
|||
}
|
||||
|
||||
for (i = 0; i < chip->num_regulator; i++) {
|
||||
if (chip->pdata)
|
||||
config.init_data =
|
||||
&(chip->pdata->init_data[i]);
|
||||
|
||||
config.init_data = chip->pdata->init_data[i];
|
||||
config.dev = chip->dev;
|
||||
config.driver_data = chip;
|
||||
config.regmap = chip->regmap;
|
||||
config.of_node = chip->dev->of_node;
|
||||
|
||||
chip->rdev[i] = devm_regulator_register(chip->dev,
|
||||
&da9211_regulators[i], &config);
|
||||
|
|
@ -293,6 +387,7 @@ static int da9211_regulator_init(struct da9211 *chip)
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/*
|
||||
* I2C driver interface functions
|
||||
*/
|
||||
|
|
@ -301,14 +396,17 @@ static int da9211_i2c_probe(struct i2c_client *i2c,
|
|||
{
|
||||
struct da9211 *chip;
|
||||
int error, ret;
|
||||
unsigned int data;
|
||||
|
||||
chip = devm_kzalloc(&i2c->dev, sizeof(struct da9211), GFP_KERNEL);
|
||||
if (!chip)
|
||||
return -ENOMEM;
|
||||
|
||||
chip->dev = &i2c->dev;
|
||||
chip->regmap = devm_regmap_init_i2c(i2c, &da9211_regmap_config);
|
||||
if (IS_ERR(chip->regmap)) {
|
||||
error = PTR_ERR(chip->regmap);
|
||||
dev_err(&i2c->dev, "Failed to allocate register map: %d\n",
|
||||
dev_err(chip->dev, "Failed to allocate register map: %d\n",
|
||||
error);
|
||||
return error;
|
||||
}
|
||||
|
|
@ -316,11 +414,33 @@ static int da9211_i2c_probe(struct i2c_client *i2c,
|
|||
i2c_set_clientdata(i2c, chip);
|
||||
|
||||
chip->pdata = i2c->dev.platform_data;
|
||||
if (!chip->pdata) {
|
||||
dev_err(&i2c->dev, "No platform init data supplied\n");
|
||||
|
||||
ret = regmap_read(chip->regmap, DA9211_REG_DEVICE_ID, &data);
|
||||
if (ret < 0) {
|
||||
dev_err(chip->dev, "Failed to read DEVICE_ID reg: %d\n", ret);
|
||||
return ret;
|
||||
}
|
||||
|
||||
switch (data) {
|
||||
case DA9211_DEVICE_ID:
|
||||
chip->chip_id = DA9211;
|
||||
break;
|
||||
case DA9213_DEVICE_ID:
|
||||
chip->chip_id = DA9213;
|
||||
break;
|
||||
default:
|
||||
dev_err(chip->dev, "Unsupported device id = 0x%x.\n", data);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
if (!chip->pdata)
|
||||
chip->pdata = da9211_parse_regulators_dt(chip->dev);
|
||||
|
||||
if (IS_ERR(chip->pdata)) {
|
||||
dev_err(chip->dev, "No regulators defined for the platform\n");
|
||||
return PTR_ERR(chip->pdata);
|
||||
}
|
||||
|
||||
chip->chip_irq = i2c->irq;
|
||||
|
||||
if (chip->chip_irq != 0) {
|
||||
|
|
@ -340,22 +460,32 @@ static int da9211_i2c_probe(struct i2c_client *i2c,
|
|||
ret = da9211_regulator_init(chip);
|
||||
|
||||
if (ret < 0)
|
||||
dev_err(&i2c->dev, "Failed to initialize regulator: %d\n", ret);
|
||||
dev_err(chip->dev, "Failed to initialize regulator: %d\n", ret);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static const struct i2c_device_id da9211_i2c_id[] = {
|
||||
{"da9211", 0},
|
||||
{"da9211", DA9211},
|
||||
{"da9213", DA9213},
|
||||
{},
|
||||
};
|
||||
|
||||
MODULE_DEVICE_TABLE(i2c, da9211_i2c_id);
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
static const struct of_device_id da9211_dt_ids[] = {
|
||||
{ .compatible = "dlg,da9211", .data = &da9211_i2c_id[0] },
|
||||
{ .compatible = "dlg,da9213", .data = &da9211_i2c_id[1] },
|
||||
{},
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, da9211_dt_ids);
|
||||
#endif
|
||||
|
||||
static struct i2c_driver da9211_regulator_driver = {
|
||||
.driver = {
|
||||
.name = "da9211",
|
||||
.owner = THIS_MODULE,
|
||||
.of_match_table = of_match_ptr(da9211_dt_ids),
|
||||
},
|
||||
.probe = da9211_i2c_probe,
|
||||
.id_table = da9211_i2c_id,
|
||||
|
|
@ -364,5 +494,5 @@ static struct i2c_driver da9211_regulator_driver = {
|
|||
module_i2c_driver(da9211_regulator_driver);
|
||||
|
||||
MODULE_AUTHOR("James Ban <James.Ban.opensource@diasemi.com>");
|
||||
MODULE_DESCRIPTION("Regulator device driver for Dialog DA9211");
|
||||
MODULE_DESCRIPTION("Regulator device driver for Dialog DA9211/DA9213");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* da9211-regulator.h - Regulator definitions for DA9211
|
||||
* da9211-regulator.h - Regulator definitions for DA9211/DA9213
|
||||
* Copyright (C) 2014 Dialog Semiconductor Ltd.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
|
|
@ -53,12 +53,15 @@
|
|||
/* BUCK Phase Selection*/
|
||||
#define DA9211_REG_CONFIG_E 0x147
|
||||
|
||||
/* Device ID */
|
||||
#define DA9211_REG_DEVICE_ID 0x201
|
||||
|
||||
/*
|
||||
* Registers bits
|
||||
*/
|
||||
/* DA9211_REG_PAGE_CON (addr=0x00) */
|
||||
#define DA9211_REG_PAGE_SHIFT 1
|
||||
#define DA9211_REG_PAGE_MASK 0x02
|
||||
#define DA9211_REG_PAGE_MASK 0x06
|
||||
/* On I2C registers 0x00 - 0xFF */
|
||||
#define DA9211_REG_PAGE0 0
|
||||
/* On I2C registers 0x100 - 0x1FF */
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* da9211.h - Regulator device driver for DA9211
|
||||
* da9211.h - Regulator device driver for DA9211/DA9213
|
||||
* Copyright (C) 2014 Dialog Semiconductor Ltd.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
|
|
@ -20,6 +20,11 @@
|
|||
|
||||
#define DA9211_MAX_REGULATORS 2
|
||||
|
||||
enum da9211_chip_id {
|
||||
DA9211,
|
||||
DA9213,
|
||||
};
|
||||
|
||||
struct da9211_pdata {
|
||||
/*
|
||||
* Number of buck
|
||||
|
|
@ -27,6 +32,6 @@ struct da9211_pdata {
|
|||
* 2 : 2 phase 2 buck
|
||||
*/
|
||||
int num_buck;
|
||||
struct regulator_init_data *init_data;
|
||||
struct regulator_init_data *init_data[DA9211_MAX_REGULATORS];
|
||||
};
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue