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>

diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c
index 4db10a150369a65aad347fd855ee006c12b6c5c5..20895e7a99c963538d05d89b43a2bdcb7d8b61ec 100644 (file)
--- 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;

diff --git a/include/linux/mfd/88pm860x.h b/include/linux/mfd/88pm860x.h
index bfd23bef7363c0d99e450857a03c474860f72444..4db1fbd8969ea3ee26b8214d8f89091e43ce02c7 100644 (file)
--- a/include/linux/mfd/88pm860x.h
+++ b/include/linux/mfd/88pm860x.h
@@ -138,7 +138,7 @@ enum {
        PM8607_ID_RG_MAX,
 };
 
-#define PM8607_VERSION                 (0x40)  /* 8607 chip ID */
+/* 8607 chip ID is 0x40 or 0x50 */
 #define PM8607_VERSION_MASK            (0xF0)  /* 8607 chip ID mask */
 
 /* Interrupt Registers */