Merge branch 'for-3.5/core' of git://git.kernel.dk/linux-block

[karo-tx-linux.git] / arch / arm / mach-mmp / ttc_dkb.c

diff --git a/arch/arm/mach-mmp/ttc_dkb.c b/arch/arm/mach-mmp/ttc_dkb.c
index 266215393f44c9d3a84335d34804074211c5f74a..7a7de2b12a622d06abe13daa7efad655772f0fb4 100644 (file)
--- a/arch/arm/mach-mmp/ttc_dkb.c
+++ b/arch/arm/mach-mmp/ttc_dkb.c
@@ -17,6 +17,7 @@
 #include <linux/interrupt.h>
 #include <linux/i2c/pca953x.h>
 #include <linux/gpio.h>
+#include <linux/mfd/88pm860x.h>
 #include <linux/platform_data/mv_usb.h>
 
 #include <asm/mach-types.h>
@@ -137,7 +138,17 @@ static struct pca953x_platform_data max7312_data[] = {
        },
 };
 
+static struct pm860x_platform_data ttc_dkb_pm8607_info = {
+       .irq_base       = IRQ_BOARD_START,
+};
+
 static struct i2c_board_info ttc_dkb_i2c_info[] = {
+       {
+               .type           = "88PM860x",
+               .addr           = 0x34,
+               .platform_data  = &ttc_dkb_pm8607_info,
+               .irq            = IRQ_PXA910_PMIC_INT,
+       },
        {
                .type           = "max7312",
                .addr           = 0x23,