1 files changed, 32 insertions, 26 deletions

diff --git a/include/linux/mfd/ab8500.h b/include/linux/mfd/ab8500.h
index d63b6050b183..37f56b7c4c15 100644
--- a/include/linux/mfd/ab8500.h
+++ b/include/linux/mfd/ab8500.h
@@ -74,32 +74,37 @@
 #define AB8500_INT_ACC_DETECT_21DB_F    37
 #define AB8500_INT_ACC_DETECT_21DB_R    38
 #define AB8500_INT_GP_SW_ADC_CONV_END   39
-#define AB8500_INT_BTEMP_LOW            72
-#define AB8500_INT_BTEMP_LOW_MEDIUM     73
-#define AB8500_INT_BTEMP_MEDIUM_HIGH    74
-#define AB8500_INT_BTEMP_HIGH           75
-#define AB8500_INT_USB_CHARGER_NOT_OK   81
-#define AB8500_INT_ID_WAKEUP_R          82
-#define AB8500_INT_ID_DET_R1R           84
-#define AB8500_INT_ID_DET_R2R           85
-#define AB8500_INT_ID_DET_R3R           86
-#define AB8500_INT_ID_DET_R4R           87
-#define AB8500_INT_ID_WAKEUP_F          88
-#define AB8500_INT_ID_DET_R1F           90
-#define AB8500_INT_ID_DET_R2F           91
-#define AB8500_INT_ID_DET_R3F           92
-#define AB8500_INT_ID_DET_R4F           93
-#define AB8500_INT_USB_CHG_DET_DONE     94
-#define AB8500_INT_USB_CH_TH_PROT_F     96
-#define AB8500_INT_USB_CH_TH_PROP_R     97
-#define AB8500_INT_MAIN_CH_TH_PROP_F    98
-#define AB8500_INT_MAIN_CH_TH_PROT_R    99
-#define AB8500_INT_USB_CHARGER_NOT_OKF  103
+#define AB8500_INT_ADP_SOURCE_ERROR     72
+#define AB8500_INT_ADP_SINK_ERROR       73
+#define AB8500_INT_ADP_PROBE_PLUG       74
+#define AB8500_INT_ADP_PROBE_UNPLUG     75
+#define AB8500_INT_ADP_SENSE_OFF        76
+#define AB8500_INT_USB_PHY_POWER_ERR    78
+#define AB8500_INT_USB_LINK_STATUS      79
+#define AB8500_INT_BTEMP_LOW            80
+#define AB8500_INT_BTEMP_LOW_MEDIUM     81
+#define AB8500_INT_BTEMP_MEDIUM_HIGH    82
+#define AB8500_INT_BTEMP_HIGH           83
+#define AB8500_INT_USB_CHARGER_NOT_OK   89
+#define AB8500_INT_ID_WAKEUP_R          90
+#define AB8500_INT_ID_DET_R1R           92
+#define AB8500_INT_ID_DET_R2R           93
+#define AB8500_INT_ID_DET_R3R           94
+#define AB8500_INT_ID_DET_R4R           95
+#define AB8500_INT_ID_WAKEUP_F          96
+#define AB8500_INT_ID_DET_R1F           98
+#define AB8500_INT_ID_DET_R2F           99
+#define AB8500_INT_ID_DET_R3F           100
+#define AB8500_INT_ID_DET_R4F           101
+#define AB8500_INT_USB_CHG_DET_DONE     102
+#define AB8500_INT_USB_CH_TH_PROT_F     104
+#define AB8500_INT_USB_CH_TH_PROT_R    105
+#define AB8500_INT_MAIN_CH_TH_PROT_F   106
+#define AB8500_INT_MAIN_CH_TH_PROT_R    107
+#define AB8500_INT_USB_CHARGER_NOT_OKF  111
 
-#define AB8500_NR_IRQS                  104
-#define AB8500_NUM_IRQ_REGS             13
-
-#define AB8500_NUM_REGULATORS   15
+#define AB8500_NR_IRQS                  112
+#define AB8500_NUM_IRQ_REGS             14
 
 /**
  * struct ab8500 - ab8500 internal structure
@@ -145,7 +150,8 @@ struct regulator_init_data;
 struct ab8500_platform_data {
         int irq_base;
         void (*init) (struct ab8500 *);
-        struct regulator_init_data *regulator[AB8500_NUM_REGULATORS];
+        int num_regulator;
+        struct regulator_init_data *regulator;
 };
 
 extern int __devinit ab8500_init(struct ab8500 *ab8500);