mfd: ab8500-core: Rework MFD sub-device initialisation structures

Here we're separating Battery Management devices into their own
structure, removing the common device structure & redistribute them
amongst the individual platform structs and completing the population
of them.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>

1 files changed, 182 insertions, 61 deletions

diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
index cdf6c1e59bc3..23db4fcea496 100644
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@ -658,7 +658,7 @@ static struct resource ab8500_gpadc_resources[] = {
         },
 };
 
-static struct resource ab8540_gpadc_resources[] = {
+static struct resource ab8505_gpadc_resources[] = {
         {
                 .name   = "SW_CONV_END",
                 .start  = AB8500_INT_GP_SW_ADC_CONV_END,
@@ -1001,7 +1001,42 @@ static struct resource ab8500_temp_resources[] = {
         },
 };
 
-static struct mfd_cell abx500_common_devs[] = {
+static struct mfd_cell ab8500_bm_devs[] = {
+        {
+                .name = "ab8500-charger",
+                .of_compatible = "stericsson,ab8500-charger",
+                .num_resources = ARRAY_SIZE(ab8500_charger_resources),
+                .resources = ab8500_charger_resources,
+                .platform_data = &ab8500_bm_data,
+                .pdata_size = sizeof(ab8500_bm_data),
+        },
+        {
+                .name = "ab8500-btemp",
+                .of_compatible = "stericsson,ab8500-btemp",
+                .num_resources = ARRAY_SIZE(ab8500_btemp_resources),
+                .resources = ab8500_btemp_resources,
+                .platform_data = &ab8500_bm_data,
+                .pdata_size = sizeof(ab8500_bm_data),
+        },
+        {
+                .name = "ab8500-fg",
+                .of_compatible = "stericsson,ab8500-fg",
+                .num_resources = ARRAY_SIZE(ab8500_fg_resources),
+                .resources = ab8500_fg_resources,
+                .platform_data = &ab8500_bm_data,
+                .pdata_size = sizeof(ab8500_bm_data),
+        },
+        {
+                .name = "ab8500-chargalg",
+                .of_compatible = "stericsson,ab8500-chargalg",
+                .num_resources = ARRAY_SIZE(ab8500_chargalg_resources),
+                .resources = ab8500_chargalg_resources,
+                .platform_data = &ab8500_bm_data,
+                .pdata_size = sizeof(ab8500_bm_data),
+        },
+};
+
+static struct mfd_cell ab8500_devs[] = {
 #ifdef CONFIG_DEBUG_FS
         {
                 .name = "ab8500-debug",
@@ -1023,6 +1058,11 @@ static struct mfd_cell abx500_common_devs[] = {
                 .of_compatible = "stericsson,abx500-clk",
         },
         {
+                .name = "ab8500-gpadc",
+                .num_resources = ARRAY_SIZE(ab8500_gpadc_resources),
+                .resources = ab8500_gpadc_resources,
+        },
+        {
                 .name = "ab8500-rtc",
                 .of_compatible = "stericsson,ab8500-rtc",
                 .num_resources = ARRAY_SIZE(ab8500_rtc_resources),
@@ -1035,6 +1075,7 @@ static struct mfd_cell abx500_common_devs[] = {
                 .resources = ab8500_av_acc_detect_resources,
         },
         {
+
                 .name = "ab8500-poweron-key",
                 .of_compatible = "stericsson,ab8500-poweron-key",
                 .num_resources = ARRAY_SIZE(ab8500_poweronkey_db_resources),
@@ -1064,62 +1105,38 @@ static struct mfd_cell abx500_common_devs[] = {
                 .of_compatible = "stericsson,ab8500-denc",
         },
         {
+                .name = "ab8500-gpio",
+                .of_compatible = "stericsson,ab8500-gpio",
+        },
+        {
                 .name = "abx500-temp",
                 .of_compatible = "stericsson,abx500-temp",
                 .num_resources = ARRAY_SIZE(ab8500_temp_resources),
                 .resources = ab8500_temp_resources,
         },
-};
-
-static struct mfd_cell ab8500_bm_devs[] = {
-        {
-                .name = "ab8500-charger",
-                .of_compatible = "stericsson,ab8500-charger",
-                .num_resources = ARRAY_SIZE(ab8500_charger_resources),
-                .resources = ab8500_charger_resources,
-                .platform_data = &ab8500_bm_data,
-                .pdata_size = sizeof(ab8500_bm_data),
-        },
         {
-                .name = "ab8500-btemp",
-                .of_compatible = "stericsson,ab8500-btemp",
-                .num_resources = ARRAY_SIZE(ab8500_btemp_resources),
-                .resources = ab8500_btemp_resources,
-                .platform_data = &ab8500_bm_data,
-                .pdata_size = sizeof(ab8500_bm_data),
-        },
-        {
-                .name = "ab8500-fg",
-                .of_compatible = "stericsson,ab8500-fg",
-                .num_resources = ARRAY_SIZE(ab8500_fg_resources),
-                .resources = ab8500_fg_resources,
-                .platform_data = &ab8500_bm_data,
-                .pdata_size = sizeof(ab8500_bm_data),
+                .name = "ab8500-usb",
+                .num_resources = ARRAY_SIZE(ab8500_usb_resources),
+                .resources = ab8500_usb_resources,
         },
         {
-                .name = "ab8500-chargalg",
-                .of_compatible = "stericsson,ab8500-chargalg",
-                .num_resources = ARRAY_SIZE(ab8500_chargalg_resources),
-                .resources = ab8500_chargalg_resources,
-                .platform_data = &ab8500_bm_data,
-                .pdata_size = sizeof(ab8500_bm_data),
+                .name = "ab8500-codec",
         },
 };
 
-static struct mfd_cell ab8500_devs[] = {
+static struct mfd_cell ab9540_devs[] = {
+#ifdef CONFIG_DEBUG_FS
         {
-                .name = "pinctrl-ab8500",
-                .of_compatible = "stericsson,ab8500-gpio",
+                .name = "ab8500-debug",
+                .num_resources = ARRAY_SIZE(ab8500_debug_resources),
+                .resources = ab8500_debug_resources,
         },
+#endif
         {
-                .name = "ab8500-usb",
-                .of_compatible = "stericsson,ab8500-usb",
-                .num_resources = ARRAY_SIZE(ab8500_usb_resources),
-                .resources = ab8500_usb_resources,
+                .name = "ab8500-sysctrl",
         },
         {
-                .name = "ab8500-codec",
-                .of_compatible = "stericsson,ab8500-codec",
+                .name = "ab8500-regulator",
         },
         {
                 .name = "ab8500-gpadc",
@@ -1127,9 +1144,33 @@ static struct mfd_cell ab8500_devs[] = {
                 .num_resources = ARRAY_SIZE(ab8500_gpadc_resources),
                 .resources = ab8500_gpadc_resources,
         },
-};
-
-static struct mfd_cell ab9540_devs[] = {
+        {
+                .name = "ab8500-rtc",
+                .num_resources = ARRAY_SIZE(ab8500_rtc_resources),
+                .resources = ab8500_rtc_resources,
+        },
+        {
+                .name = "ab8500-acc-det",
+                .num_resources = ARRAY_SIZE(ab8500_av_acc_detect_resources),
+                .resources = ab8500_av_acc_detect_resources,
+        },
+        {
+                .name = "ab8500-poweron-key",
+                .num_resources = ARRAY_SIZE(ab8500_poweronkey_db_resources),
+                .resources = ab8500_poweronkey_db_resources,
+        },
+        {
+                .name = "ab8500-pwm",
+                .id = 1,
+        },
+        {
+                .name = "ab8500-leds",
+        },
+        {
+                .name = "abx500-temp",
+                .num_resources = ARRAY_SIZE(ab8500_temp_resources),
+                .resources = ab8500_temp_resources,
+        },
         {
                 .name = "pinctrl-ab9540",
                 .of_compatible = "stericsson,ab9540-gpio",
@@ -1143,11 +1184,6 @@ static struct mfd_cell ab9540_devs[] = {
                 .name = "ab9540-codec",
         },
         {
-                .name = "ab8500-gpadc",
-                .num_resources = ARRAY_SIZE(ab8500_gpadc_resources),
-                .resources = ab8500_gpadc_resources,
-        },
-        {
                 .name = "ab-iddet",
                 .num_resources = ARRAY_SIZE(ab8505_iddet_resources),
                 .resources = ab8505_iddet_resources,
@@ -1156,6 +1192,57 @@ static struct mfd_cell ab9540_devs[] = {
 
 /* Device list for ab8505  */
 static struct mfd_cell ab8505_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(ab8505_gpadc_resources),
+                .resources = ab8505_gpadc_resources,
+        },
+        {
+                .name = "ab8500-rtc",
+                .num_resources = ARRAY_SIZE(ab8500_rtc_resources),
+                .resources = ab8500_rtc_resources,
+        },
+        {
+                .name = "ab8500-acc-det",
+                .num_resources = ARRAY_SIZE(ab8500_av_acc_detect_resources),
+                .resources = ab8500_av_acc_detect_resources,
+        },
+        {
+                .name = "ab8500-poweron-key",
+                .num_resources = ARRAY_SIZE(ab8500_poweronkey_db_resources),
+                .resources = ab8500_poweronkey_db_resources,
+        },
+        {
+                .name = "ab8500-pwm",
+                .id = 1,
+        },
+        {
+                .name = "ab8500-leds",
+        },
+        {
+                .name = "ab8500-gpio",
+        },
+        {
+                .name = "ab8500-usb",
+                .num_resources = ARRAY_SIZE(ab8500_usb_resources),
+                .resources = ab8500_usb_resources,
+        },
+        {
+                .name = "ab8500-codec",
+        },
         {
                 .name = "ab-iddet",
                 .num_resources = ARRAY_SIZE(ab8505_iddet_resources),
@@ -1164,6 +1251,51 @@ static struct mfd_cell ab8505_devs[] = {
 };
 
 static struct mfd_cell ab8540_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(ab8505_gpadc_resources),
+                .resources = ab8505_gpadc_resources,
+        },
+        {
+                .name = "ab8500-rtc",
+                .num_resources = ARRAY_SIZE(ab8500_rtc_resources),
+                .resources = ab8500_rtc_resources,
+        },
+        {
+                .name = "ab8500-acc-det",
+                .num_resources = ARRAY_SIZE(ab8500_av_acc_detect_resources),
+                .resources = ab8500_av_acc_detect_resources,
+        },
+        {
+                .name = "ab8500-poweron-key",
+                .num_resources = ARRAY_SIZE(ab8500_poweronkey_db_resources),
+                .resources = ab8500_poweronkey_db_resources,
+        },
+        {
+                .name = "ab8500-pwm",
+                .id = 1,
+        },
+        {
+                .name = "ab8500-leds",
+        },
+        {
+                .name = "abx500-temp",
+                .num_resources = ARRAY_SIZE(ab8500_temp_resources),
+                .resources = ab8500_temp_resources,
+        },
         {
                 .name = "ab8500-gpio",
         },
@@ -1176,11 +1308,6 @@ static struct mfd_cell ab8540_devs[] = {
                 .name = "ab8540-codec",
         },
         {
-                .name = "ab8500-gpadc",
-                .num_resources = ARRAY_SIZE(ab8540_gpadc_resources),
-                .resources = ab8540_gpadc_resources,
-        },
-        {
                 .name = "ab-iddet",
                 .num_resources = ARRAY_SIZE(ab8505_iddet_resources),
                 .resources = ab8505_iddet_resources,
@@ -1528,12 +1655,6 @@ static int ab8500_probe(struct platform_device *pdev)
                         return ret;
         }
 
-        ret = mfd_add_devices(ab8500->dev, 0, abx500_common_devs,
-                        ARRAY_SIZE(abx500_common_devs), NULL,
-                        ab8500->irq_base, ab8500->domain);
-        if (ret)
-                return ret;
-
         if (is_ab9540(ab8500))
                 ret = mfd_add_devices(ab8500->dev, 0, ab9540_devs,
                                 ARRAY_SIZE(ab9540_devs), NULL,