regulator: s2mps11: Add support S2MPS13 regulator device
authorChanwoo Choi <cw00.choi@samsung.com>
Tue, 18 Nov 2014 08:59:40 +0000 (17:59 +0900)
committerLee Jones <lee.jones@linaro.org>
Tue, 25 Nov 2014 15:55:06 +0000 (15:55 +0000)
This patch adds S2MPS13 regulator device to existing S2MPS11 device driver.
The S2MPS13 has just different number of regulators from S2MPS14.
The S2MPS13 regulator device includes LDO[1-40] and BUCK[1-10].

Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Acked-by: Sangbeom Kim <sbkim73@samsung.com>
Acked-by: Mark Brown <broonie@kernel.org>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
drivers/mfd/sec-core.c
drivers/regulator/Kconfig
drivers/regulator/s2mps11.c
include/linux/mfd/samsung/core.h
include/linux/mfd/samsung/s2mps13.h [new file with mode: 0644]

index d086e8c..b399605 100644 (file)
@@ -27,6 +27,7 @@
 #include <linux/mfd/samsung/irq.h>
 #include <linux/mfd/samsung/s2mpa01.h>
 #include <linux/mfd/samsung/s2mps11.h>
+#include <linux/mfd/samsung/s2mps13.h>
 #include <linux/mfd/samsung/s2mps14.h>
 #include <linux/mfd/samsung/s2mpu02.h>
 #include <linux/mfd/samsung/s5m8763.h>
@@ -206,6 +207,15 @@ static const struct regmap_config s2mps11_regmap_config = {
        .cache_type = REGCACHE_FLAT,
 };
 
+static const struct regmap_config s2mps13_regmap_config = {
+       .reg_bits = 8,
+       .val_bits = 8,
+
+       .max_register = S2MPS13_REG_LDODSCH5,
+       .volatile_reg = s2mps11_volatile,
+       .cache_type = REGCACHE_FLAT,
+};
+
 static const struct regmap_config s2mps14_regmap_config = {
        .reg_bits = 8,
        .val_bits = 8,
@@ -337,6 +347,9 @@ static int sec_pmic_probe(struct i2c_client *i2c,
        case S2MPS11X:
                regmap = &s2mps11_regmap_config;
                break;
+       case S2MPS13X:
+               regmap = &s2mps13_regmap_config;
+               break;
        case S2MPS14X:
                regmap = &s2mps14_regmap_config;
                break;
Simple merge
Simple merge
Simple merge
Simple merge