aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/tps6586x.c
diff options
context:
space:
mode:
authorAndrew Chew <achew@nvidia.com>2010-10-19 05:08:36 -0400
committerSamuel Ortiz <sameo@linux.intel.com>2010-10-28 18:30:18 -0400
commitd1f92f05754116fc65cb1165d4942d25df6f200e (patch)
treef1e8e574ca31046bdd50b132bac4a69ac7a99e4e /drivers/mfd/tps6586x.c
parentb0b4a7c28ebee0763cae90d470cfff501a83be37 (diff)
mfd: Add TPS658621C device ID
The interface for this device should be identical to that of the TPS658521A. Signed-off-by: Andrew Chew <achew@nvidia.com> Acked-by: Mike Rapoport <mike@compulab.co.il> Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd/tps6586x.c')
-rw-r--r--drivers/mfd/tps6586x.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
index 117eb7cafe77..b4931ab34929 100644
--- a/drivers/mfd/tps6586x.c
+++ b/drivers/mfd/tps6586x.c
@@ -47,6 +47,7 @@
47/* device id */ 47/* device id */
48#define TPS6586X_VERSIONCRC 0xcd 48#define TPS6586X_VERSIONCRC 0xcd
49#define TPS658621A_VERSIONCRC 0x15 49#define TPS658621A_VERSIONCRC 0x15
50#define TPS658621C_VERSIONCRC 0x2c
50 51
51struct tps6586x_irq_data { 52struct tps6586x_irq_data {
52 u8 mask_reg; 53 u8 mask_reg;
@@ -497,7 +498,8 @@ static int __devinit tps6586x_i2c_probe(struct i2c_client *client,
497 return -EIO; 498 return -EIO;
498 } 499 }
499 500
500 if (ret != TPS658621A_VERSIONCRC) { 501 if ((ret != TPS658621A_VERSIONCRC) &&
502 (ret != TPS658621C_VERSIONCRC)) {
501 dev_err(&client->dev, "Unsupported chip ID: %x\n", ret); 503 dev_err(&client->dev, "Unsupported chip ID: %x\n", ret);
502 return -ENODEV; 504 return -ENODEV;
503 } 505 }