Merge branch 'for-linus-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / mfd / 88pm80x.c

diff --git a/drivers/mfd/88pm80x.c b/drivers/mfd/88pm80x.c
index 5e72f65ef94c3f48c4643dfa9f366dd8782ac956..63445ea6b0bfe2481c681e657d1b16d0abd7fea3 100644 (file)
--- a/drivers/mfd/88pm80x.c
+++ b/drivers/mfd/88pm80x.c
@@ -33,6 +33,8 @@ static struct pm80x_chip_mapping chip_mapping[] = {
        {0x3,   CHIP_PM800},
        /* 88PM805 chip id number */
        {0x0,   CHIP_PM805},
+       /* 88PM860 chip id number */
+       {0x4,   CHIP_PM860},
 };
 
 /*