mfd: sec-core: Add support for S2MPU02 device

Add support for Samsung S2MPU02 PMIC device to the MFD sec-core driver.
The S2MPU02 device includes PMIC/RTC/Clock devices.

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

5 files changed, 352 insertions, 30 deletions

diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
index be06d0abbf19..15ba847b3d23 100644
--- a/drivers/mfd/sec-core.c
+++ b/drivers/mfd/sec-core.c
@@ -89,6 +89,15 @@ static const struct mfd_cell s2mpa01_devs[] = {
         },
 };
 
+static const struct mfd_cell s2mpu02_devs[] = {
+        { .name = "s2mpu02-pmic", },
+        { .name = "s2mpu02-rtc", },
+        {
+                .name = "s2mpu02-clk",
+                .of_compatible = "samsung,s2mpu02-clk",
+        }
+};
+
 #ifdef CONFIG_OF
 static const struct of_device_id sec_dt_match[] = {
         {       .compatible = "samsung,s5m8767-pmic",
@@ -103,6 +112,9 @@ static const struct of_device_id sec_dt_match[] = {
                 .compatible = "samsung,s2mpa01-pmic",
                 .data = (void *)S2MPA01,
         }, {
+                .compatible = "samsung,s2mpu02-pmic",
+                .data = (void *)S2MPU02,
+        }, {
                 /* Sentinel */
         },
 };
@@ -250,9 +262,10 @@ static int sec_pmic_probe(struct i2c_client *i2c,
 {
         struct sec_platform_data *pdata = dev_get_platdata(&i2c->dev);
         const struct regmap_config *regmap;
+        const struct mfd_cell *sec_devs;
         struct sec_pmic_dev *sec_pmic;
         unsigned long device_type;
-        int ret;
+        int ret, num_sec_devs;
 
         sec_pmic = devm_kzalloc(&i2c->dev, sizeof(struct sec_pmic_dev),
                                 GFP_KERNEL);
@@ -319,34 +332,39 @@ static int sec_pmic_probe(struct i2c_client *i2c,
 
         switch (sec_pmic->device_type) {
         case S5M8751X:
-                ret = mfd_add_devices(sec_pmic->dev, -1, s5m8751_devs,
-                                      ARRAY_SIZE(s5m8751_devs), NULL, 0, NULL);
+                sec_devs = s5m8751_devs;
+                num_sec_devs = ARRAY_SIZE(s5m8751_devs);
                 break;
         case S5M8763X:
-                ret = mfd_add_devices(sec_pmic->dev, -1, s5m8763_devs,
-                                      ARRAY_SIZE(s5m8763_devs), NULL, 0, NULL);
+                sec_devs = s5m8763_devs;
+                num_sec_devs = ARRAY_SIZE(s5m8763_devs);
                 break;
         case S5M8767X:
-                ret = mfd_add_devices(sec_pmic->dev, -1, s5m8767_devs,
-                                      ARRAY_SIZE(s5m8767_devs), NULL, 0, NULL);
+                sec_devs = s5m8767_devs;
+                num_sec_devs = ARRAY_SIZE(s5m8767_devs);
                 break;
         case S2MPA01:
-                ret = mfd_add_devices(sec_pmic->dev, -1, s2mpa01_devs,
-                                      ARRAY_SIZE(s2mpa01_devs), NULL, 0, NULL);
+                sec_devs = s2mpa01_devs;
+                num_sec_devs = ARRAY_SIZE(s2mpa01_devs);
                 break;
         case S2MPS11X:
-                ret = mfd_add_devices(sec_pmic->dev, -1, s2mps11_devs,
-                                      ARRAY_SIZE(s2mps11_devs), NULL, 0, NULL);
+                sec_devs = s2mps11_devs;
+                num_sec_devs = ARRAY_SIZE(s2mps11_devs);
                 break;
         case S2MPS14X:
-                ret = mfd_add_devices(sec_pmic->dev, -1, s2mps14_devs,
-                                      ARRAY_SIZE(s2mps14_devs), NULL, 0, NULL);
+                sec_devs = s2mps14_devs;
+                num_sec_devs = ARRAY_SIZE(s2mps14_devs);
+                break;
+        case S2MPU02:
+                sec_devs = s2mpu02_devs;
+                num_sec_devs = ARRAY_SIZE(s2mpu02_devs);
                 break;
         default:
                 /* If this happens the probe function is problem */
                 BUG();
         }
-
+        ret = mfd_add_devices(sec_pmic->dev, -1, sec_devs, num_sec_devs, NULL,
+                              0, NULL);
         if (ret)
                 goto err_mfd;
 
diff --git a/drivers/mfd/sec-irq.c b/drivers/mfd/sec-irq.c
index 654e2c1dbf7a..f9a57869e3ec 100644
--- a/drivers/mfd/sec-irq.c
+++ b/drivers/mfd/sec-irq.c
@@ -20,6 +20,7 @@
 #include <linux/mfd/samsung/irq.h>
 #include <linux/mfd/samsung/s2mps11.h>
 #include <linux/mfd/samsung/s2mps14.h>
+#include <linux/mfd/samsung/s2mpu02.h>
 #include <linux/mfd/samsung/s5m8763.h>
 #include <linux/mfd/samsung/s5m8767.h>
 
@@ -161,6 +162,77 @@ static const struct regmap_irq s2mps14_irqs[] = {
         },
 };
 
+static const struct regmap_irq s2mpu02_irqs[] = {
+        [S2MPU02_IRQ_PWRONF] = {
+                .reg_offset = 0,
+                .mask = S2MPS11_IRQ_PWRONF_MASK,
+        },
+        [S2MPU02_IRQ_PWRONR] = {
+                .reg_offset = 0,
+                .mask = S2MPS11_IRQ_PWRONR_MASK,
+        },
+        [S2MPU02_IRQ_JIGONBF] = {
+                .reg_offset = 0,
+                .mask = S2MPS11_IRQ_JIGONBF_MASK,
+        },
+        [S2MPU02_IRQ_JIGONBR] = {
+                .reg_offset = 0,
+                .mask = S2MPS11_IRQ_JIGONBR_MASK,
+        },
+        [S2MPU02_IRQ_ACOKBF] = {
+                .reg_offset = 0,
+                .mask = S2MPS11_IRQ_ACOKBF_MASK,
+        },
+        [S2MPU02_IRQ_ACOKBR] = {
+                .reg_offset = 0,
+                .mask = S2MPS11_IRQ_ACOKBR_MASK,
+        },
+        [S2MPU02_IRQ_PWRON1S] = {
+                .reg_offset = 0,
+                .mask = S2MPS11_IRQ_PWRON1S_MASK,
+        },
+        [S2MPU02_IRQ_MRB] = {
+                .reg_offset = 0,
+                .mask = S2MPS11_IRQ_MRB_MASK,
+        },
+        [S2MPU02_IRQ_RTC60S] = {
+                .reg_offset = 1,
+                .mask = S2MPS11_IRQ_RTC60S_MASK,
+        },
+        [S2MPU02_IRQ_RTCA1] = {
+                .reg_offset = 1,
+                .mask = S2MPS11_IRQ_RTCA1_MASK,
+        },
+        [S2MPU02_IRQ_RTCA0] = {
+                .reg_offset = 1,
+                .mask = S2MPS11_IRQ_RTCA0_MASK,
+        },
+        [S2MPU02_IRQ_SMPL] = {
+                .reg_offset = 1,
+                .mask = S2MPS11_IRQ_SMPL_MASK,
+        },
+        [S2MPU02_IRQ_RTC1S] = {
+                .reg_offset = 1,
+                .mask = S2MPS11_IRQ_RTC1S_MASK,
+        },
+        [S2MPU02_IRQ_WTSR] = {
+                .reg_offset = 1,
+                .mask = S2MPS11_IRQ_WTSR_MASK,
+        },
+        [S2MPU02_IRQ_INT120C] = {
+                .reg_offset = 2,
+                .mask = S2MPS11_IRQ_INT120C_MASK,
+        },
+        [S2MPU02_IRQ_INT140C] = {
+                .reg_offset = 2,
+