From 7ce198aaf15386e104c7de5aedfbe85355278ab2 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Thu, 6 Dec 2012 08:24:11 +0800 Subject: [PATCH] --- yaml --- r: 343217 b: refs/heads/master c: 7fa8a5975784cce646b3763e5d9957f8d688c9ce h: refs/heads/master i: 343215: 67cb9d0a19915a6b2fbf2b657984fab69bc0ea98 v: v3 --- [refs] | 2 +- trunk/drivers/regulator/tps80031-regulator.c | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 112076abb6b8..6f9f32a11c9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf0caae3036563ef84d1dcb7b2c7fcbda59a889d +refs/heads/master: 7fa8a5975784cce646b3763e5d9957f8d688c9ce diff --git a/trunk/drivers/regulator/tps80031-regulator.c b/trunk/drivers/regulator/tps80031-regulator.c index ce480499177e..b54300c64424 100644 --- a/trunk/drivers/regulator/tps80031-regulator.c +++ b/trunk/drivers/regulator/tps80031-regulator.c @@ -284,14 +284,6 @@ static int tps80031_ldo_get_voltage_sel(struct regulator_dev *rdev) return vsel & rdev->desc->vsel_mask; } -static int tps80031_ldo_list_voltage(struct regulator_dev *rdev, unsigned sel) -{ - if (sel == 0) - return 0; - else - return regulator_list_voltage_linear(rdev, sel - 1); -} - static int tps80031_vbus_is_enabled(struct regulator_dev *rdev) { struct tps80031_regulator *ri = rdev_get_drvdata(rdev); @@ -398,7 +390,7 @@ static struct regulator_ops tps80031_dcdc_ops = { }; static struct regulator_ops tps80031_ldo_ops = { - .list_voltage = tps80031_ldo_list_voltage, + .list_voltage = regulator_list_voltage_linear, .set_voltage_sel = tps80031_ldo_set_voltage_sel, .get_voltage_sel = tps80031_ldo_get_voltage_sel, .enable = tps80031_reg_enable, @@ -465,6 +457,7 @@ static struct regulator_ops tps80031_ext_reg_ops = { .type = REGULATOR_VOLTAGE, \ .min_uV = 1000000, \ .uV_step = 100000, \ + .linear_min_sel = 1, \ .n_voltages = 25, \ .vsel_mask = LDO_VSEL_MASK, \ .enable_time = 500, \