diff options
| author |   Mark Brown <broonie@linaro.org> | 2014-06-02 17:08:14 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-06-02 17:08:14 +0100 |
| commit | 978371cbabb4cb7a47751049d72f06dc8348cab2 (patch) | |
| tree | fcd37ce42f4eb934fcd455c2857630cb9b2d4bf0 /drivers/mfd | |
| parent | Merge remote-tracking branches 'regulator/topic/s5m8767', 'regulator/topic/stub', 'regulator/topic/tps65090', 'regulator/topic/tps65217' and 'regulator/topic/tps65218' into regulator-next (diff) | |
| parent | regulator: tps6586x: Remove unused to_tps6586x_dev() function (diff) | |
| download | linux-dev-978371cbabb4cb7a47751049d72f06dc8348cab2.tar.xz linux-dev-978371cbabb4cb7a47751049d72f06dc8348cab2.zip | |
Merge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/tps6586x.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c index bbd54414a75d..835e5549ecdd 100644 --- a/drivers/mfd/tps6586x.c +++ b/drivers/mfd/tps6586x.c @@ -495,6 +495,10 @@ static void tps6586x_print_version(struct i2c_client *client, int version) case TPS658623: name = "TPS658623"; break; + case TPS658640: + case TPS658640v2: + name = "TPS658640"; + break; case TPS658643: name = "TPS658643"; break; |