Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38b34052 authored by Haojian Zhuang's avatar Haojian Zhuang Committed by Samuel Ortiz
Browse files

mfd: Update chip id of 88pm8607 



Chipid of 88pm8607 is 0x40 or 0x50.

Signed-off-by: default avatarHaojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent f0f05b1c

drivers/mfd/88pm860x-core.c

+5 −2
Original line number Diff line number Diff line
@@ -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;

include/linux/mfd/88pm860x.h

+1 −1
Original line number Diff line number Diff line
@@ -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 */