intel_pstate: Turn per cpu printk into pr_debug

[cascardo/linux.git] / drivers / mfd / sec-core.c

diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
index be06d0a..dba7e2b 100644 (file)
--- a/drivers/mfd/sec-core.c
+++ b/drivers/mfd/sec-core.c
@@ -28,8 +28,10 @@
 #include <linux/mfd/samsung/s2mpa01.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>
+#include <linux/regulator/machine.h>
 #include <linux/regmap.h>
 
 static const struct mfd_cell s5m8751_devs[] = {
@@ -89,6 +91,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",
@@ -102,6 +113,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 */
        },
@@ -132,6 +146,18 @@ static bool s2mps11_volatile(struct device *dev, unsigned int reg)
        }
 }
 
+static bool s2mpu02_volatile(struct device *dev, unsigned int reg)
+{
+       switch (reg) {
+       case S2MPU02_REG_INT1M:
+       case S2MPU02_REG_INT2M:
+       case S2MPU02_REG_INT3M:
+               return false;
+       default:
+               return true;
+       }
+}
+
 static bool s5m8763_volatile(struct device *dev, unsigned int reg)
 {
        switch (reg) {
@@ -177,6 +203,15 @@ static const struct regmap_config s2mps14_regmap_config = {
        .cache_type = REGCACHE_FLAT,
 };
 
+static const struct regmap_config s2mpu02_regmap_config = {
+       .reg_bits = 8,
+       .val_bits = 8,
+
+       .max_register = S2MPU02_REG_DVSDATA,
+       .volatile_reg = s2mpu02_volatile,
+       .cache_type = REGCACHE_FLAT,
+};
+
 static const struct regmap_config s5m8763_regmap_config = {
        .reg_bits = 8,
        .val_bits = 8,
@@ -238,6 +273,7 @@ static inline unsigned long sec_i2c_get_driver_data(struct i2c_client *i2c,
 #ifdef CONFIG_OF
        if (i2c->dev.of_node) {
                const struct of_device_id *match;
+
                match = of_match_node(sec_dt_match, i2c->dev.of_node);
                return (unsigned long)match->data;
        }
@@ -250,9 +286,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);
@@ -297,6 +334,9 @@ static int sec_pmic_probe(struct i2c_client *i2c,
        case S5M8767X:
                regmap = &s5m8767_regmap_config;
                break;
+       case S2MPU02:
+               regmap = &s2mpu02_regmap_config;
+               break;
        default:
                regmap = &sec_regmap_config;
                break;
@@ -319,34 +359,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;
 
@@ -387,6 +432,15 @@ static int sec_pmic_suspend(struct device *dev)
         */
        disable_irq(sec_pmic->irq);
 
+       switch (sec_pmic->device_type) {
+       case S2MPS14X:
+       case S2MPU02:
+               regulator_suspend_prepare(PM_SUSPEND_MEM);
+               break;
+       default:
+               break;
+       }
+
        return 0;
 }