diff options
| author | Haojian Zhuang <haojian.zhuang@gmail.com> | 2010-09-08 09:44:34 -0400 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2010-10-29 00:29:23 +0200 |
| commit | 38b340527aa44bb8d1b88ef1e5a4e26b27695c2b (patch) | |
| tree | 54241d7400bd97328a1685c753d24d7b5aeb7cfb /drivers/mfd | |
| parent | f0f05b1c751772d19c9c8f36d75e97b1d9687407 (diff) | |
| download | kernel_samsung_aries-38b340527aa44bb8d1b88ef1e5a4e26b27695c2b.zip kernel_samsung_aries-38b340527aa44bb8d1b88ef1e5a4e26b27695c2b.tar.gz kernel_samsung_aries-38b340527aa44bb8d1b88ef1e5a4e26b27695c2b.tar.bz2 | |
mfd: Update chip id of 88pm8607
Chipid of 88pm8607 is 0x40 or 0x50.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/88pm860x-core.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c index 4db10a1..20895e7 100644 --- a/drivers/mfd/88pm860x-core.c +++ b/drivers/mfd/88pm860x-core.c @@ -645,10 +645,13 @@ static void __devinit device_8607_init(struct pm860x_chip *chip, dev_err(chip->dev, "Failed to read CHIP ID: %d\n", ret); goto out; } - if ((ret & PM8607_VERSION_MASK) == PM8607_VERSION) + switch (ret & PM8607_VERSION_MASK) { + case 0x40: + case 0x50: dev_info(chip->dev, "Marvell 88PM8607 (ID: %02x) detected\n", ret); - else { + break; + default: dev_err(chip->dev, "Failed to detect Marvell 88PM8607. " "Chip ID: %02x\n", ret); goto out; |