From c15bbbf135ae74f1e0e631d0321859dc750c9b40 Mon Sep 17 00:00:00 2001 From: Axel Lin Date: Fri, 23 Nov 2012 09:25:54 +0800 Subject: [PATCH] --- yaml --- r: 343216 b: refs/heads/master c: bf0caae3036563ef84d1dcb7b2c7fcbda59a889d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/regulator/tps80031-regulator.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9c9e7c1467de..112076abb6b8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a7ae58e2c5feb2c0f35e773223949a8fa672433 +refs/heads/master: bf0caae3036563ef84d1dcb7b2c7fcbda59a889d diff --git a/trunk/drivers/regulator/tps80031-regulator.c b/trunk/drivers/regulator/tps80031-regulator.c index aaab3d73d7bd..ce480499177e 100644 --- a/trunk/drivers/regulator/tps80031-regulator.c +++ b/trunk/drivers/regulator/tps80031-regulator.c @@ -407,15 +407,18 @@ static struct regulator_ops tps80031_ldo_ops = { }; static struct regulator_ops tps80031_vbus_sw_ops = { + .list_voltage = regulator_list_voltage_linear, .enable = tps80031_vbus_enable, .disable = tps80031_vbus_disable, .is_enabled = tps80031_vbus_is_enabled, }; static struct regulator_ops tps80031_vbus_hw_ops = { + .list_voltage = regulator_list_voltage_linear, }; static struct regulator_ops tps80031_ext_reg_ops = { + .list_voltage = regulator_list_voltage_linear, .enable = tps80031_reg_enable, .disable = tps80031_reg_disable, .is_enabled = tps80031_reg_is_enabled, @@ -477,7 +480,8 @@ static struct regulator_ops tps80031_ext_reg_ops = { .desc = { \ .name = "tps80031_"#_id, \ .id = TPS80031_REGULATOR_##_id, \ - .n_voltages = 2, \ + .min_uV = max_mV * 1000, \ + .n_voltages = 1, \ .ops = &_ops, \ .type = REGULATOR_VOLTAGE, \ .owner = THIS_MODULE, \