mfd: ab8500-core ioresources irq for subdrivers added

This patch adds the ioresources used by subdrivers to
retrieve their interrupt.

Signed-off-by: Mattias Wallin <mattias.wallin@stericsson.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>

2 files changed, 201 insertions, 9 deletions

diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
index e464e94c4bc0..7f01a3a1d10f 100644
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@ -397,13 +397,189 @@ static struct resource ab8500_poweronkey_db_resources[] = {
         },
 };
 
+static struct resource ab8500_bm_resources[] = {
+        {
+                .name = "MAIN_EXT_CH_NOT_OK",
+                .start = AB8500_INT_MAIN_EXT_CH_NOT_OK,
+                .end = AB8500_INT_MAIN_EXT_CH_NOT_OK,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "BATT_OVV",
+                .start = AB8500_INT_BATT_OVV,
+                .end = AB8500_INT_BATT_OVV,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "MAIN_CH_UNPLUG_DET",
+                .start = AB8500_INT_MAIN_CH_UNPLUG_DET,
+                .end = AB8500_INT_MAIN_CH_UNPLUG_DET,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "MAIN_CHARGE_PLUG_DET",
+                .start = AB8500_INT_MAIN_CH_PLUG_DET,
+                .end = AB8500_INT_MAIN_CH_PLUG_DET,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "VBUS_DET_F",
+                .start = AB8500_INT_VBUS_DET_F,
+                .end = AB8500_INT_VBUS_DET_F,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "VBUS_DET_R",
+                .start = AB8500_INT_VBUS_DET_R,
+                .end = AB8500_INT_VBUS_DET_R,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "BAT_CTRL_INDB",
+                .start = AB8500_INT_BAT_CTRL_INDB,
+                .end = AB8500_INT_BAT_CTRL_INDB,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "CH_WD_EXP",
+                .start = AB8500_INT_CH_WD_EXP,
+                .end = AB8500_INT_CH_WD_EXP,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "VBUS_OVV",
+                .start = AB8500_INT_VBUS_OVV,
+                .end = AB8500_INT_VBUS_OVV,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "NCONV_ACCU",
+                .start = AB8500_INT_CCN_CONV_ACC,
+                .end = AB8500_INT_CCN_CONV_ACC,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "LOW_BAT_F",
+                .start = AB8500_INT_LOW_BAT_F,
+                .end = AB8500_INT_LOW_BAT_F,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "LOW_BAT_R",
+                .start = AB8500_INT_LOW_BAT_R,
+                .end = AB8500_INT_LOW_BAT_R,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "BTEMP_LOW",
+                .start = AB8500_INT_BTEMP_LOW,
+                .end = AB8500_INT_BTEMP_LOW,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "BTEMP_HIGH",
+                .start = AB8500_INT_BTEMP_HIGH,
+                .end = AB8500_INT_BTEMP_HIGH,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "USB_CHARGER_NOT_OKR",
+                .start = AB8500_INT_USB_CHARGER_NOT_OK,
+                .end = AB8500_INT_USB_CHARGER_NOT_OK,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "USB_CHARGE_DET_DONE",
+                .start = AB8500_INT_USB_CHG_DET_DONE,
+                .end = AB8500_INT_USB_CHG_DET_DONE,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "USB_CH_TH_PROT_R",
+                .start = AB8500_INT_USB_CH_TH_PROT_R,
+                .end = AB8500_INT_USB_CH_TH_PROT_R,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "MAIN_CH_TH_PROT_R",
+                .start = AB8500_INT_MAIN_CH_TH_PROT_R,
+                .end = AB8500_INT_MAIN_CH_TH_PROT_R,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "USB_CHARGER_NOT_OKF",
+                .start = AB8500_INT_USB_CHARGER_NOT_OKF,
+                .end = AB8500_INT_USB_CHARGER_NOT_OKF,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct resource ab8500_debug_resources[] = {
+        {
+                .name   = "IRQ_FIRST",
+                .start  = AB8500_INT_MAIN_EXT_CH_NOT_OK,
+                .end    = AB8500_INT_MAIN_EXT_CH_NOT_OK,
+                .flags  = IORESOURCE_IRQ,
+        },
+        {
+                .name   = "IRQ_LAST",
+                .start  = AB8500_INT_USB_CHARGER_NOT_OKF,
+                .end    = AB8500_INT_USB_CHARGER_NOT_OKF,
+                .flags  = IORESOURCE_IRQ,
+        },
+};
+
+static struct resource ab8500_usb_resources[] = {
+        {
+                .name = "ID_WAKEUP_R",
+                .start = AB8500_INT_ID_WAKEUP_R,
+                .end = AB8500_INT_ID_WAKEUP_R,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "ID_WAKEUP_F",
+                .start = AB8500_INT_ID_WAKEUP_F,
+                .end = AB8500_INT_ID_WAKEUP_F,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "VBUS_DET_F",
+                .start = AB8500_INT_VBUS_DET_F,
+                .end = AB8500_INT_VBUS_DET_F,
+                .flags = IORESOURCE_IRQ,
+        },
+        {
+                .name = "VBUS_DET_R",
+                .start = AB8500_INT_VBUS_DET_R,
+                .end = AB8500_INT_VBUS_DET_R,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
+static struct resource ab8500_temp_resources[] = {
+        {
+                .name  = "AB8500_TEMP_WARM",
+                .start = AB8500_INT_TEMP_WARM,
+                .end   = AB8500_INT_TEMP_WARM,
+                .flags = IORESOURCE_IRQ,
+        },
+};
+
 static struct mfd_cell ab8500_devs[] = {
 #ifdef CONFIG_DEBUG_FS
         {
                 .name = "ab8500-debug",
+                .num_resources = ARRAY_SIZE(ab8500_debug_resources),
+                .resources = ab8500_debug_resources,
         },
 #endif
         {
+                .name = "ab8500-sysctrl",
+        },
+        {
+                .name = "ab8500-regulator",
+        },
+        {
                 .name = "ab8500-gpadc",
                 .num_resources = ARRAY_SIZE(ab8500_gpadc_resources),
                 .resources = ab8500_gpadc_resources,
@@ -414,6 +590,22 @@ static struct mfd_cell ab8500_devs[] = {
                 .resources = ab8500_rtc_resources,
         },
         {
+                .name = "ab8500-bm",
+                .num_resources = ARRAY_SIZE(ab8500_bm_resources),
+                .resources = ab8500_bm_resources,
+        },
+        { .name = "ab8500-codec", },
+        {
+                .name = "ab8500-usb",
+                .num_resources = ARRAY_SIZE(ab8500_usb_resources),
+                .resources = ab8500_usb_resources,
+        },
+        {
+                .name = "ab8500-poweron-key",
+                .num_resources = ARRAY_SIZE(ab8500_poweronkey_db_resources),
+                .resources = ab8500_poweronkey_db_resources,
+        },
+        {
                 .name = "ab8500-pwm",
                 .id = 1,
         },
@@ -425,14 +617,14 @@ static struct mfd_cell ab8500_devs[] = {
                 .name = "ab8500-pwm",
                 .id = 3,
         },
-        { .name = "ab8500-charger", },
-        { .name = "ab8500-audio", },
-        { .name = "ab8500-usb", },
-        { .name = "ab8500-regulator", },
+        { .name = "ab8500-leds", },
         {
-                .name = "ab8500-poweron-key",
-                .num_resources = ARRAY_SIZE(ab8500_poweronkey_db_resources),
-                .resources = ab8500_poweronkey_db_resources,
+                .name = "ab8500-denc",
+        },
+        {
+                .name = "ab8500-temp",
+                .num_resources = ARRAY_SIZE(ab8500_temp_resources),
+                .resources = ab8500_temp_resources,
         },
 };
 
diff --git a/include/linux/mfd/ab8500.h b/include/linux/mfd/ab8500.h
index 85cf2c28fac6..1ad169655235 100644
--- a/include/linux/mfd/ab8500.h
+++ b/include/linux/mfd/ab8500.h
@@ -91,8 +91,8 @@
 #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_USB_CH_TH_PROT_R     97
+#define AB8500_INT_MAIN_CH_TH_PROT_F    98
 #define AB8500_INT_MAIN_CH_TH_PROT_R    99
 #define AB8500_INT_USB_CHARGER_NOT_OKF  103