diff options
| author |   Lee Jones <lee.jones@linaro.org> | 2014-05-27 11:41:14 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2014-05-27 11:41:14 +0100 |
| commit | 4bd5e3049b44f2d71b4c5df194e4ebcc7e41a649 (patch) | |
| tree | 8396a08eae9cc3d9546c5ce18347fb05727093f6 /drivers/mfd | |
| parent | regulator: arizona-ldo1: Add processing of init_data from device tree (diff) | |
| parent | regulator: tps6586x: Add support for the TPS658640 (diff) | |
| download | linux-dev-4bd5e3049b44f2d71b4c5df194e4ebcc7e41a649.tar.xz linux-dev-4bd5e3049b44f2d71b4c5df194e4ebcc7e41a649.zip | |
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.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; |