summaryrefslogtreecommitdiff
path: root/drivers/mfd
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-02 20:08:14 +0400
committerMark Brown <broonie@linaro.org>2014-06-02 20:08:14 +0400
commit978371cbabb4cb7a47751049d72f06dc8348cab2 (patch)
treefcd37ce42f4eb934fcd455c2857630cb9b2d4bf0 /drivers/mfd
parentb58e917bf9eadf1efbbebe49f13235c56f0c2c4f (diff)
parentae8b70c9d8ff3c2120651c880a148596061dcbb2 (diff)
downloadlinux-978371cbabb4cb7a47751049d72f06dc8348cab2.tar.xz
Merge remote-tracking branch 'regulator/topic/tps6586x' into regulator-next
Diffstat (limited to 'drivers/mfd')
-rw-r--r--drivers/mfd/tps6586x.c4
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;