aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd
diff options
context:
space:
mode:
authorLee Jones <lee.jones@linaro.org>2014-05-27 06:41:14 -0400
committerLee Jones <lee.jones@linaro.org>2014-05-27 06:41:14 -0400
commit4bd5e3049b44f2d71b4c5df194e4ebcc7e41a649 (patch)
tree8396a08eae9cc3d9546c5ce18347fb05727093f6 /drivers/mfd
parent2cce4be9e6b885c595816c45a80bcce95dae6d30 (diff)
parent6c46ccc8bb0660c1805f6662d4646eb5405dcb2d (diff)
Merge tag 'regulator-tps658640' into ib-from-regulator-3.16
regulator: Support newer revisions of tps658640 There are two different variants of the tps658640 with slightly different feature sets.
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)
495 case TPS658623: 495 case TPS658623:
496 name = "TPS658623"; 496 name = "TPS658623";
497 break; 497 break;
498 case TPS658640:
499 case TPS658640v2:
500 name = "TPS658640";
501 break;
498 case TPS658643: 502 case TPS658643:
499 name = "TPS658643"; 503 name = "TPS658643";
500 break; 504 break;