Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 312577
b: refs/heads/master
c: b515241
h: refs/heads/master
i:
  312575: 899f2c1
v: v3
  • Loading branch information
Axel Lin authored and Mark Brown committed Jun 23, 2012
1 parent 21f11d0 commit abc39d8
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 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: b19dbf711e8dae026f8d014eae90d766d02f4acb
refs/heads/master: b5152415225ba0d489939778f3b85217b25036db
7 changes: 2 additions & 5 deletions trunk/drivers/regulator/tps62360-regulator.c
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,8 @@ struct tps62360_chip {
struct regulator_desc desc;
struct regulator_dev *rdev;
struct regmap *regmap;
int chip_id;
int vsel0_gpio;
int vsel1_gpio;
int voltage_base;
u8 voltage_reg_mask;
bool en_internal_pulldn;
bool en_discharge;
Expand Down Expand Up @@ -401,13 +399,13 @@ static int __devinit tps62360_probe(struct i2c_client *client,
switch (chip_id) {
case TPS62360:
case TPS62362:
tps->voltage_base = TPS62360_BASE_VOLTAGE;
tps->desc.min_uV = TPS62360_BASE_VOLTAGE;
tps->voltage_reg_mask = 0x3F;
tps->desc.n_voltages = TPS62360_N_VOLTAGES;
break;
case TPS62361:
case TPS62363:
tps->voltage_base = TPS62361_BASE_VOLTAGE;
tps->desc.min_uV = TPS62361_BASE_VOLTAGE;
tps->voltage_reg_mask = 0x7F;
tps->desc.n_voltages = TPS62361_N_VOLTAGES;
break;
Expand All @@ -420,7 +418,6 @@ static int __devinit tps62360_probe(struct i2c_client *client,
tps->desc.ops = &tps62360_dcdc_ops;
tps->desc.type = REGULATOR_VOLTAGE;
tps->desc.owner = THIS_MODULE;
tps->desc.min_uV = tps->voltage_base;
tps->desc.uV_step = 10000;

tps->regmap = devm_regmap_init_i2c(client, &tps62360_regmap_config);
Expand Down

0 comments on commit abc39d8

Please sign in to comment.