From dbcd8068e4665be146b49054ae37acc684f6137c Mon Sep 17 00:00:00 2001 From: Andrew Chew Date: Tue, 19 Oct 2010 11:08:36 +0200 Subject: [PATCH] --- yaml --- r: 220628 b: refs/heads/master c: d1f92f05754116fc65cb1165d4942d25df6f200e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/mfd/tps6586x.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d85c967a4e8b..39afa5c2f537 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b0b4a7c28ebee0763cae90d470cfff501a83be37 +refs/heads/master: d1f92f05754116fc65cb1165d4942d25df6f200e diff --git a/trunk/drivers/mfd/tps6586x.c b/trunk/drivers/mfd/tps6586x.c index 117eb7cafe77..b4931ab34929 100644 --- a/trunk/drivers/mfd/tps6586x.c +++ b/trunk/drivers/mfd/tps6586x.c @@ -47,6 +47,7 @@ /* device id */ #define TPS6586X_VERSIONCRC 0xcd #define TPS658621A_VERSIONCRC 0x15 +#define TPS658621C_VERSIONCRC 0x2c struct tps6586x_irq_data { u8 mask_reg; @@ -497,7 +498,8 @@ static int __devinit tps6586x_i2c_probe(struct i2c_client *client, return -EIO; } - if (ret != TPS658621A_VERSIONCRC) { + if ((ret != TPS658621A_VERSIONCRC) && + (ret != TPS658621C_VERSIONCRC)) { dev_err(&client->dev, "Unsupported chip ID: %x\n", ret); return -ENODEV; }