Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux...

[karo-tx-linux.git] / drivers / mfd / ab8500-core.c

diff --git a/drivers/mfd/ab8500-core.c b/drivers/mfd/ab8500-core.c
index 258b367e39891468eb4dd0a9dabf05558a75446d..b6c2cdc76091aa2ff78b8d1d17e3c7b6e6d1dbd0 100644 (file)
--- a/drivers/mfd/ab8500-core.c
+++ b/drivers/mfd/ab8500-core.c
@@ -650,6 +650,21 @@ static struct resource ab8500_rtc_resources[] = {
        },
 };
 
+static struct resource ab8540_rtc_resources[] = {
+       {
+               .name   = "1S",
+               .start  = AB8540_INT_RTC_1S,
+               .end    = AB8540_INT_RTC_1S,
+               .flags  = IORESOURCE_IRQ,
+       },
+       {
+               .name   = "ALARM",
+               .start  = AB8500_INT_RTC_ALARM,
+               .end    = AB8500_INT_RTC_ALARM,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
 static struct resource ab8500_poweronkey_db_resources[] = {
        {
                .name   = "ONKEY_DBF",
@@ -1050,6 +1065,10 @@ static struct mfd_cell ab8500_devs[] = {
                .name = "ab8500-sysctrl",
                .of_compatible = "stericsson,ab8500-sysctrl",
        },
+       {
+               .name = "ab8500-ext-regulator",
+               .of_compatible = "stericsson,ab8500-ext-regulator",
+       },
        {
                .name = "ab8500-regulator",
                .of_compatible = "stericsson,ab8500-regulator",
@@ -1098,10 +1117,6 @@ static struct mfd_cell ab8500_devs[] = {
                .of_compatible = "stericsson,ab8500-pwm",
                .id = 3,
        },
-       {
-               .name = "ab8500-leds",
-               .of_compatible = "stericsson,ab8500-leds",
-       },
        {
                .name = "ab8500-denc",
                .of_compatible = "stericsson,ab8500-denc",
@@ -1124,6 +1139,7 @@ static struct mfd_cell ab8500_devs[] = {
        },
        {
                .name = "ab8500-codec",
+               .of_compatible = "stericsson,ab8500-codec",
        },
 };
 
@@ -1138,6 +1154,9 @@ static struct mfd_cell ab9540_devs[] = {
        {
                .name = "ab8500-sysctrl",
        },
+       {
+               .name = "ab8500-ext-regulator",
+       },
        {
                .name = "ab8500-regulator",
        },
@@ -1170,9 +1189,6 @@ static struct mfd_cell ab9540_devs[] = {
                .name = "ab8500-pwm",
                .id = 1,
        },
-       {
-               .name = "ab8500-leds",
-       },
        {
                .name = "abx500-temp",
                .num_resources = ARRAY_SIZE(ab8500_temp_resources),
@@ -1241,9 +1257,6 @@ static struct mfd_cell ab8505_devs[] = {
                .name = "ab8500-pwm",
                .id = 1,
        },
-       {
-               .name = "ab8500-leds",
-       },
        {
                .name = "pinctrl-ab8505",
        },
@@ -1273,6 +1286,9 @@ static struct mfd_cell ab8540_devs[] = {
        {
                .name = "ab8500-sysctrl",
        },
+       {
+               .name = "ab8500-ext-regulator",
+       },
        {
                .name = "ab8500-regulator",
        },
@@ -1286,11 +1302,6 @@ static struct mfd_cell ab8540_devs[] = {
                .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),
@@ -1305,9 +1316,6 @@ static struct mfd_cell ab8540_devs[] = {
                .name = "ab8500-pwm",
                .id = 1,
        },
-       {
-               .name = "ab8500-leds",
-       },
        {
                .name = "abx500-temp",
                .num_resources = ARRAY_SIZE(ab8500_temp_resources),
@@ -1331,6 +1339,24 @@ static struct mfd_cell ab8540_devs[] = {
        },
 };
 
+static struct mfd_cell ab8540_cut1_devs[] = {
+       {
+               .name = "ab8500-rtc",
+               .of_compatible = "stericsson,ab8500-rtc",
+               .num_resources = ARRAY_SIZE(ab8500_rtc_resources),
+               .resources = ab8500_rtc_resources,
+       },
+};
+
+static struct mfd_cell ab8540_cut2_devs[] = {
+       {
+               .name = "ab8540-rtc",
+               .of_compatible = "stericsson,ab8540-rtc",
+               .num_resources = ARRAY_SIZE(ab8540_rtc_resources),
+               .resources = ab8540_rtc_resources,
+       },
+};
+
 static ssize_t show_chip_id(struct device *dev,
                                struct device_attribute *attr, char *buf)
 {
@@ -1734,11 +1760,22 @@ static int ab8500_probe(struct platform_device *pdev)
                ret = mfd_add_devices(ab8500->dev, 0, ab9540_devs,
                                ARRAY_SIZE(ab9540_devs), NULL,
                                ab8500->irq_base, ab8500->domain);
-       else if (is_ab8540(ab8500))
+       else if (is_ab8540(ab8500)) {
                ret = mfd_add_devices(ab8500->dev, 0, ab8540_devs,
                              ARRAY_SIZE(ab8540_devs), NULL,
-                             ab8500->irq_base, ab8500->domain);
-       else if (is_ab8505(ab8500))
+                             ab8500->irq_base, NULL);
+               if (ret)
+                       return ret;
+
+               if (is_ab8540_1p2_or_earlier(ab8500))
+                       ret = mfd_add_devices(ab8500->dev, 0, ab8540_cut1_devs,
+                             ARRAY_SIZE(ab8540_cut1_devs), NULL,
+                             ab8500->irq_base, NULL);
+               else /* ab8540 >= cut2 */
+                       ret = mfd_add_devices(ab8500->dev, 0, ab8540_cut2_devs,
+                             ARRAY_SIZE(ab8540_cut2_devs), NULL,
+                             ab8500->irq_base, NULL);
+       } else if (is_ab8505(ab8500))
                ret = mfd_add_devices(ab8500->dev, 0, ab8505_devs,
                              ARRAY_SIZE(ab8505_devs), NULL,
                              ab8500->irq_base, ab8500->domain);