8 files changed, 217 insertions, 26 deletions

diff --git a/drivers/mfd/da9055-i2c.c b/drivers/mfd/da9055-i2c.c
index 13af7e50021e..8103e4362132 100644
--- a/drivers/mfd/da9055-i2c.c
+++ b/drivers/mfd/da9055-i2c.c
@@ -53,17 +53,25 @@ static int da9055_i2c_remove(struct i2c_client *i2c)
         return 0;
 }
 
+/*
+ * DO NOT change the device Ids. The naming is intentionally specific as both
+ * the PMIC and CODEC parts of this chip are instantiated separately as I2C
+ * devices (both have configurable I2C addresses, and are to all intents and
+ * purposes separate). As a result there are specific DA9055 ids for PMIC
+ * and CODEC, which must be different to operate together.
+ */
 static struct i2c_device_id da9055_i2c_id[] = {
-        {"da9055", 0},
+        {"da9055-pmic", 0},
         { }
 };
+MODULE_DEVICE_TABLE(i2c, da9055_i2c_id);
 
 static struct i2c_driver da9055_i2c_driver = {
         .probe = da9055_i2c_probe,
         .remove = da9055_i2c_remove,
         .id_table = da9055_i2c_id,
         .driver = {
-                .name = "da9055",
+                .name = "da9055-pmic",
                 .owner = THIS_MODULE,
         },
 };
diff --git a/drivers/mfd/max14577.c b/drivers/mfd/max14577.c
index ac514fb2b877..71aa14a6bfbb 100644
--- a/drivers/mfd/max14577.c
+++ b/drivers/mfd/max14577.c
@@ -173,6 +173,7 @@ static const struct i2c_device_id max14577_i2c_id[] = {
 };
 MODULE_DEVICE_TABLE(i2c, max14577_i2c_id);
 
+#ifdef CONFIG_PM_SLEEP
 static int max14577_suspend(struct device *dev)
 {
         struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);
@@ -208,6 +209,7 @@ static int max14577_resume(struct device *dev)
 
         return 0;
 }
+#endif /* CONFIG_PM_SLEEP */
 
 static struct of_device_id max14577_dt_match[] = {
         { .compatible = "maxim,max14577", },
diff --git a/drivers/mfd/max8997.c b/drivers/mfd/max8997.c
index be88a3bf7b85..5adede0fb04c 100644
--- a/drivers/mfd/max8997.c
+++ b/drivers/mfd/max8997.c
@@ -164,15 +164,15 @@ static struct max8997_platform_data *max8997_i2c_parse_dt_pdata(
         return pd;
 }
 
-static inline int max8997_i2c_get_driver_data(struct i2c_client *i2c,
+static inline unsigned long max8997_i2c_get_driver_data(struct i2c_client *i2c,
                                                 const struct i2c_device_id *id)
 {
         if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) {
                 const struct of_device_id *match;
                 match = of_match_node(max8997_pmic_dt_match, i2c->dev.of_node);
-                return (int)match->data;
+                return (unsigned long)match->data;
         }
-        return (int)id->driver_data;
+        return id->driver_data;
 }
 
 static int max8997_i2c_probe(struct i2c_client *i2c,
diff --git a/drivers/mfd/max8998.c b/drivers/mfd/max8998.c
index 612ca404e150..5d5e186b5d8b 100644
--- a/drivers/mfd/max8998.c
+++ b/drivers/mfd/max8998.c
@@ -169,16 +169,16 @@ static struct max8998_platform_data *max8998_i2c_parse_dt_pdata(
         return pd;
 }
 
-static inline int max8998_i2c_get_driver_data(struct i2c_client *i2c,
+static inline unsigned long max8998_i2c_get_driver_data(struct i2c_client *i2c,
                                                 const struct i2c_device_id *id)
 {
         if (IS_ENABLED(CONFIG_OF) && i2c->dev.of_node) {
                 const struct of_device_id *match;
                 match = of_match_node(max8998_dt_match, i2c->dev.of_node);
-                return (int)(long)match->data;
+                return (unsigned long)match->data;
         }
 
-        return (int)id->driver_data;
+        return id->driver_data;
 }
 
 static int max8998_i2c_probe(struct i2c_client *i2c,
diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
index a139798b8065..281a82747275 100644
--- a/drivers/mfd/sec-core.c
+++ b/drivers/mfd/sec-core.c
@@ -26,7 +26,9 @@
 #include <linux/mfd/samsung/core.h>
 #include <linux/mfd/samsung/irq.h>
 #include <linux/mfd/samsung/rtc.h>
+#include <linux/mfd/samsung/s2mpa01.h>
 #include <linux/mfd/samsung/s2mps11.h>
+#include <linux/mfd/samsung/s2mps14.h>
 #include <linux/mfd/samsung/s5m8763.h>
 #include <linux/mfd/samsung/s5m8767.h>
 #include <linux/regmap.h>
@@ -69,18 +71,53 @@ static const struct mfd_cell s2mps11_devs[] = {
         }
 };
 
+static const struct mfd_cell s2mps14_devs[] = {
+        {
+                .name = "s2mps14-pmic",
+        }, {
+                .name = "s2mps14-rtc",
+        }, {
+                .name = "s2mps14-clk",
+        }
+};
+
+static const struct mfd_cell s2mpa01_devs[] = {
+        {
+                .name = "s2mpa01-pmic",
+        },
+};
+
 #ifdef CONFIG_OF
 static struct of_device_id sec_dt_match[] = {
         {       .compatible = "samsung,s5m8767-pmic",
                 .data = (void *)S5M8767X,
-        },
-        {       .compatible = "samsung,s2mps11-pmic",
+        }, {
+                .compatible = "samsung,s2mps11-pmic",
                 .data = (void *)S2MPS11X,
+        }, {
+                .compatible = "samsung,s2mps14-pmic",
+                .data = (void *)S2MPS14X,
+        }, {
+                .compatible = "samsung,s2mpa01-pmic",
+                .data = (void *)S2MPA01,
+        }, {
+                /* Sentinel */
         },
-        {},
 };
 #endif
 
+static bool s2mpa01_volatile(struct device *dev, unsigned int reg)
+{
+        switch (reg) {
+        case S2MPA01_REG_INT1M:
+        case S2MPA01_REG_INT2M:
+        case S2MPA01_REG_INT3M:
+                return false;
+        default:
+                return true;
+        }
+}
+
 static bool s2mps11_volatile(struct device *dev, unsigned int reg)
 {
         switch (reg) {
@@ -111,6 +148,15 @@ static const struct regmap_config sec_regmap_config = {
         .val_bits = 8,
 };
 
+static const struct regmap_config s2mpa01_regmap_config = {
+        .reg_bits = 8,
+        .val_bits = 8,
+
+        .max_register = S2MPA01_REG_LDO_OVCB4,
+        .volatile_reg = s2mpa01_volatile,
+        .cache_type = REGCACHE_FLAT,
+};
+
 static const struct regmap_config s2mps11_regmap_config = {
         .reg_bits = 8,
         .val_bits = 8,
@@ -120,6 +166,15 @@ static const struct regmap_config s2mps11_regmap_config = {
         .cache_type = REGCACHE_FLAT,
 };
 
+static const struct regmap_config s2mps14_regmap_config = {
+        .reg_bits = 8,
+        .val_bits = 8,
+
+        .max_register = S2MPS14_REG_LDODSCH3,
+        .volatile_reg = s2mps11_volatile,
+        .cache_type = REGCACHE_FLAT,
+};
+
 static const struct regmap_config s5m8763_regmap_config = {
         .reg_bits = 8,
         .val_bits = 8,
@@ -138,9 +193,18 @@ static const struct regmap_config s5m8767_regmap_config = {
         .cache_type = REGCACHE_FLAT,
 };
 
-static const struct regmap_config sec_rtc_regmap_config = {
+static const struct regmap_config s5m_rtc_regmap_config = {
+        .reg_bits = 8,
+        .val_bits = 8,
+
+        .max_register = SEC_RTC_REG_MAX,
+};
+
+static const struct regmap_config s2mps14_rtc_regmap_config = {
         .reg_bits = 8,
         .val_bits = 8,
+
+        .max_register = S2MPS_RTC_REG_MAX,
 };
 
 #ifdef CONFIG_OF
@@ -180,24 +244,24 @@ static struct sec_platform_data *sec_pmic_i2c_parse_dt_pdata(
 }
 #endif
 
-static inline int sec_i2c_get_driver_data(struct i2c_client *i2c,
+static inline unsigned long sec_i2c_get_driver_data(struct i2c_client *i2c,
                                                 const struct i2c_device_id *id)
 {
 #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 (int)match->data;
+                return (unsigned long)match->data;
         }
 #endif
-        return (int)id->driver_data;
+        return id->driver_data;
 }
 
 static int sec_pmic_probe(struct i2c_client *i2c,
                             const struct i2c_device_id *id)
 {
         struct sec_platform_data *pdata = dev_get_platdata(&i2c->dev);
-        const struct regmap_config *regmap;
+        const struct regmap_config *regmap, *regmap_rtc;
         struct sec_pmic_dev *sec_pmic;
         int ret;
 
@@ -229,17 +293,34 @@ static int sec_pmic_probe(struct i2c_client *i2c,
         }
 
         switch (sec_pmic->device_type) {
+        case S2MPA01:
+                regmap = &s2mpa01_regmap_config;
+                break;
         case S2MPS11X:
                 regmap = &s2mps11_regmap_config;
+                /*
+                 * The rtc-s5m driver does not support S2MPS11 and there
+                 * is no mfd_cell for S2MPS11 RTC device.
+                 * However we must pass something to devm_regmap_init_i2c()
+                 * so use S5M-like regmap config even though it wouldn't work.
+                 */
+                regmap_rtc = &s5m_rtc_regmap_config;
+                break;
+        case S2MPS14X:
+                regmap = &s2mps14_regmap_config;
+                regmap_rtc = &s2mps14_rtc_regmap_config;
                 break;
         case S5M8763X:
                 regmap = &s5m8763_regmap_config;
+                regmap_rtc = &s5m_rtc_regmap_config;
                 break;
         case S5M8767X:
                 regmap = &s5m8767_regmap_config;
+                regmap_rtc = &s5m_rtc_regmap_config;
                 break;
         default:
                 regmap = &sec_regmap_config;
+                regmap_rtc = &s5m_rtc_regmap_config;
                 break;
         }
 
@@ -252,10 +333,13 @@ static int sec_pmic_probe(struct i2c_client *i2c,
         }
 
         sec_pmic->rtc = i2c_new_dummy(i2c->adapter, RTC_I2C_ADDR);
+        if (!sec_pmic->rtc) {
+                dev_err(&i2c->dev, "Failed to allocate I2C for RTC\n");
+                return -ENODEV;
+        }
         i2c_set_clientdata(sec_pmic->rtc, sec_pmic);
 
-        sec_pmic->regmap_rtc = devm_regmap_init_i2c(sec_pmic->rtc,
-                        &sec_rtc_regmap_config);
+        sec_pmic->regmap_rtc = devm_regmap_init_i2c(sec_pmic->rtc, regmap_rtc);
         if (IS_ERR(sec_pmic->regmap_rtc)) {
                 ret = PTR_ERR(sec_pmic->regmap_rtc);
                 dev_err(&i2c->dev, "Failed to allocate RTC register map: %d\n",
@@ -283,10 +367,18 @@ static int sec_pmic_probe(struct i2c_client *i2c,
                 ret = mfd_add_devices(sec_pmic->dev, -1, s5m8767_devs,
                                       ARRAY_SIZE(s5m8767_devs), NULL, 0, NULL);
                 break;
+        case S2MPA01:
+                ret = mfd_add_devices(sec_pmic->dev, -1, s2mpa01_devs,
+                                      ARRAY_SIZE(s2mpa01_devs), NULL, 0, NULL);
+                break;
         case S2MPS11X:
                 ret = mfd_add_devices(sec_pmic->dev, -1, s2mps11_devs,
                                       ARRAY_SIZE(s2mps11_devs), NULL, 0, NULL);
                 break;
+        case S2MPS14X:
+                ret = mfd_add_devices(sec_pmic->dev, -1, s2mps14_devs,
+                                      ARRAY_SIZE(s2mps14_devs), NULL, 0, NULL);
+                break;
         default:
                 /* If this happens the probe function is problem */
                 BUG();
@@ -315,6 +407,7 @@ static int sec_pmic_remove(struct i2c_client *i2c)
         return 0;
 }
 
+#ifdef CONFIG_PM_SLEEP
 static int sec_pmic_suspend(struct device *dev)
 {
         struct i2c_client *i2c = container_of(dev, struct i2c_client, dev);
@@ -349,6 +442,7 @@ static int sec_pmic_resume(struct device *dev)
 
         return 0;
 }
+#endif /* CONFIG_PM_SLEEP */
 
 static SIMPLE_DEV_PM_OPS(sec_pmic_pm_ops, sec_pmic_suspend, sec_pmic_resume);
 
diff --git a/drivers/mfd/sec-irq.c b/drivers/mfd/sec-irq.c
index 4de494f51d40..64e7913aadc6 100644
--- a/drivers/mfd/sec-irq.c
+++ b/drivers/mfd/sec-irq.c
@@ -1,7 +1,7 @@
 /*
  * sec-irq.c
  *
- * Copyright (c) 2011 Samsung Electronics Co., Ltd
+ * Copyright (c) 2011-2014 Samsung Electronics Co., Ltd
  *              http://www.samsung.com
  *
  *  This program is free software; you can redistribute  it and/or modify it
@@ -19,6 +19,7 @@
 #include <linux/mfd/samsung/core.h>
 #include <linux/mfd/samsung/irq.h>
 #include <linux/mfd/samsung/s2mps11.h>
+#include <linux/mfd/samsung/s2mps14.h>
 #include <linux/mfd/samsung/s5m8763.h>
 #include <linux/mfd/samsung/s5m8767.h>
 
@@ -59,13 +60,13 @@ static const struct regmap_irq s2mps11_irqs[] = {
                 .reg_offset = 1,
                 .mask = S2MPS11_IRQ_RTC60S_MASK,
         },
-        [S2MPS11_IRQ_RTCA1] = {
+        [S2MPS11_IRQ_RTCA0] = {
                 .reg_offset = 1,
-                .mask = S2MPS11_IRQ_RTCA1_MASK,
+                .mask = S2MPS11_IRQ_RTCA0_MASK,
         },
-        [S2MPS11_IRQ_RTCA2] = {
+        [S2MPS11_IRQ_RTCA1] = {
                 .reg_offset = 1,
-                .mask = S2MPS11_IRQ_RTCA2_MASK,
+                .mask = S2MPS11_IRQ_RTCA1_MASK,
         },
         [S2MPS11_IRQ_SMPL] = {
                 .reg_offset = 1,
@@ -89,6 +90,76 @@ static const struct regmap_irq s2mps11_irqs[] = {
         },
 };
 
+static const struct regmap_irq s2mps14_irqs[] = {
+        [S2MPS14_IRQ_PWRONF] = {
+                .reg_offset = 0,
+                .mask = S2MPS11_IRQ_PWRONF_MASK,
+        },
+        [S2MPS14_IRQ_PWRONR] = {
+                .reg_offset = 0,
+                .mask = S2MPS11_IRQ_PWRONR_MASK,
+        },
+        [S2MPS14_IRQ_JIGONBF] = {
+                .reg_offset = 0,
+                .mask = S2MPS11_IRQ_JIGONBF_MASK,
+        },
+        [S2MPS14_IRQ_JIGONBR] = {
+                .reg_offset = 0,
+                .mask = S2MPS11_IRQ_JIGONBR_MASK,
+        },
+        [S2MPS14_IRQ_ACOKBF] = {
+                .reg_offset = 0,
+                .mask = S2MPS11_IRQ_ACOKBF_MASK,
+        },
+        [S2MPS14_IRQ_ACOKBR] = {
+                .reg_offset = 0,
+                .mask = S2MPS11_IRQ_ACOKBR_MASK,
+        },
+        [S2MPS14_IRQ_PWRON1S] = {
+                .reg_offset = 0,
+                .mask = S2MPS11_IRQ_PWRON1S_MASK,
+        },
+        [S2MPS14_IRQ_MRB] = {
+                .reg_offset = 0,
+                .mask = S2MPS11_IRQ_MRB_MASK,
+        },
+        [S2MPS14_IRQ_RTC60S] = {
+                .reg_offset = 1,
+                .mask = S2MPS11_IRQ_RTC60S_MASK,
+        },
+        [S2MPS14_IRQ_RTCA1] = {
+                .reg_offset = 1,
+                .mask = S2MPS11_IRQ_RTCA1_MASK,
+        },
+        [S2MPS14_IRQ_RTCA0] = {
+                .reg_offset = 1,
+                .mask = S2MPS11_IRQ_RTCA0_MASK,
+        },
+        [S2MPS14_IRQ_SMPL] = {
+                .reg_offset = 1,
+                .mask = S2MPS11_IRQ_SMPL_MASK,
+        },
+        [S2MPS14_IRQ_RTC1S] = {
+                .reg_offset = 1,
+                .mask = S2MPS11_IRQ_RTC1S_MASK,
+        },
+        [S2MPS14_IRQ_WTSR] = {
+                .reg_offset = 1,
+                .mask = S2MPS11_IRQ_WTSR_MASK,
+        },
+        [S2MPS14_IRQ_INT120C] = {
+                .reg_offset = 2,
+                .mask = S2MPS11_IRQ_INT120C_MASK,
+        },
+        [S2MPS14_IRQ_INT140C] = {
+                .reg_offset = 2,
+                .mask = S2MPS11_IRQ_INT140C_MASK,
+        },
+        [S2MPS14_IRQ_TSD] = {
+                .reg_offset = 2,
+                .mask = S2MPS14_IRQ_TSD_MASK,
+        },
+};
 
 static const struct regmap_irq s5m8767_irqs[] = {
         [S5M8767_IRQ_PWRR] = {
@@ -246,6 +317,16 @@ static const struct regmap_irq_chip s2mps11_irq_chip = {
         .ack_base = S2MPS11_REG_INT1,
 };
 
+static const struct regmap_irq_chip s2mps14_irq_chip = {
+        .name = "s2mps14",
+        .irqs = s2mps14_irqs,
+        .num_irqs = ARRAY_SIZE(s2mps14_irqs),
+        .num_regs = 3,
+        .status_base = S2MPS14_REG_INT1,
+        .mask_base = S2MPS14_REG_INT1M,
+        .ack_base = S2MPS14_REG_INT1,
+};
+
 static const struct regmap_irq_chip s5m8767_irq_chip = {
         .name = "s5m8767",
         .irqs = s5m8767_irqs,
@@ -297,6 +378,12 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic)
                                   sec_pmic->irq_base, &s2mps11_irq_chip,
                                   &sec_pmic->irq_data);
                 break;
+        case S2MPS14X:
+                ret = regmap_add_irq_chip(sec_pmic->regmap_pmic, sec_pmic->irq,
+                                  IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
+                                  sec_pmic->irq_base, &s2mps14_irq_chip,
+                                  &sec_pmic->irq_data);
+                break;
         default:
                 dev_err(sec_pmic->dev, "Unknown device type %d\n",
                         sec_pmic->device_type);
diff --git a/drivers/mfd/tps65217.c b/drivers/mfd/tps65217.c
index 966cf65c5c36..3cc4c7084b92 100644
--- a/drivers/mfd/tps65217.c
+++ b/drivers/mfd/tps65217.c
@@ -158,7 +158,7 @@ static int tps65217_probe(struct i2c_client *client,
 {
         struct tps65217 *tps;
         unsigned int version;
-        unsigned int chip_id = ids->driver_data;
+        unsigned long chip_id = ids->driver_data;
         const struct of_device_id *match;
         bool status_off = false;
         int ret;
@@ -170,7 +170,7 @@ static int tps65217_probe(struct i2c_client *client,
                                 "Failed to find matching dt id\n");
                         return -EINVAL;
                 }
-                chip_id = (unsigned int)(unsigned long)match->data;
+                chip_id = (unsigned long)match->data;
                 status_off = of_property_read_bool(client->dev.of_node,
                                         "ti,pmic-shutdown-controller");
         }
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index ba04f1bc70eb..e6fab94e2c8a 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -636,7 +636,7 @@ static int wm8994_i2c_probe(struct i2c_client *i2c,
         if (i2c->dev.of_node) {
                 of_id = of_match_device(wm8994_of_match, &i2c->dev);
                 if (of_id)
-                        wm8994->type = (int)of_id->data;
+                        wm8994->type = (enum wm8994_type)of_id->data;
         } else {
                 wm8994->type = id->driver_data;
         }