Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 302301
b: refs/heads/master
c: 2b7a7a4
h: refs/heads/master
i:
  302299: 03895d9
v: v3
  • Loading branch information
Axel Lin authored and Mark Brown committed May 16, 2012
1 parent cbce69e commit 32aba20
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5eb3394f86cda9fc2e66df79ff19086552f0d83e
refs/heads/master: 2b7a7a4e837269a8a157a19ac93ddb207f2bd0b6
9 changes: 3 additions & 6 deletions trunk/drivers/regulator/isl6271a-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -83,15 +83,10 @@ static int isl6271a_set_voltage(struct regulator_dev *dev,
return err;
}

static int isl6271a_list_voltage(struct regulator_dev *dev, unsigned selector)
{
return ISL6271A_VOLTAGE_MIN + (ISL6271A_VOLTAGE_STEP * selector);
}

static struct regulator_ops isl_core_ops = {
.get_voltage = isl6271a_get_voltage,
.set_voltage = isl6271a_set_voltage,
.list_voltage = isl6271a_list_voltage,
.list_voltage = regulator_list_voltage_linear,
};

static int isl6271a_get_fixed_voltage(struct regulator_dev *dev)
Expand Down Expand Up @@ -119,6 +114,8 @@ static const struct regulator_desc isl_rd[] = {
.ops = &isl_core_ops,
.type = REGULATOR_VOLTAGE,
.owner = THIS_MODULE,
.min_uV = ISL6271A_VOLTAGE_MIN,
.uV_step = ISL6271A_VOLTAGE_STEP,
}, {
.name = "LDO1",
.id = 1,
Expand Down

0 comments on commit 32aba20

Please sign in to comment.