diff options
| author | Nitin Kumbhar <nkumbhar@nvidia.com> | 2010-12-23 14:58:35 +0530 |
|---|---|---|
| committer | Nitin Kumbhar <nkumbhar@nvidia.com> | 2010-12-23 14:58:35 +0530 |
| commit | 96a476b53360de76f20774122111f031be9ac9c2 (patch) | |
| tree | e603fb33cb93cac7bbcc750bbaea8010a22dcea7 /drivers/mfd | |
| parent | 8302d262e4801d44fa1b1952e15666256692b7b6 (diff) | |
| parent | 3f29a8834975956ed5590959bfced00cb9bd03ed (diff) | |
merging android-tegra-2.6.36 into git-master/linux-2.6/android-tegra-2.6.36
Conflicts:
arch/arm/mach-tegra/board-ventana-power.c
drivers/mfd/tps6586x.c
Change-Id: Ic8c46d4251d6e71fa2900b7e876f87e256299bc4
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/tps6586x.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c index 6f3dbc2de343..ad0dfe2a28fb 100644 --- a/drivers/mfd/tps6586x.c +++ b/drivers/mfd/tps6586x.c @@ -50,9 +50,6 @@ /* device id */ #define TPS6586X_VERSIONCRC 0xcd -#define TPS658621A_VERSIONCRC 0x15 -#define TPS658621C_VERSIONCRC 0x18 -#define TPS658621D_VERSIONCRC 0x2C struct tps6586x_irq_data { u8 mask_reg; @@ -525,11 +522,7 @@ static int __devinit tps6586x_i2c_probe(struct i2c_client *client, return -EIO; } - if (ret != TPS658621A_VERSIONCRC && ret != TPS658621C_VERSIONCRC - && ret != TPS658621D_VERSIONCRC) { - dev_err(&client->dev, "Unsupported chip ID: %x\n", ret); - return -ENODEV; - } + dev_info(&client->dev, "VERSIONCRC is %02x\n", ret); tps6586x = kzalloc(sizeof(struct tps6586x), GFP_KERNEL); if (tps6586x == NULL) |