Commit f3ba7299 authored by Mark Brown's avatar Mark Brown

Merge remote-tracking branches 'regulator/topic/isl9305',...

Merge remote-tracking branches 'regulator/topic/isl9305', 'regulator/topic/lp872x', 'regulator/topic/max14577', 'regulator/topic/max7686' and 'regulator/topic/max77843' into regulator-next
...@@ -39,6 +39,12 @@ to get matched with their hardware counterparts as follow: ...@@ -39,6 +39,12 @@ to get matched with their hardware counterparts as follow:
-BUCKn : 1-4. -BUCKn : 1-4.
Use standard regulator bindings for it ('regulator-off-in-suspend'). Use standard regulator bindings for it ('regulator-off-in-suspend').
LDO20, LDO21, LDO22, BUCK8 and BUCK9 can be configured to GPIO enable
control. To turn this feature on this property must be added to the regulator
sub-node:
- maxim,ena-gpios : one GPIO specifier enable control (the gpio
flags are actually ignored and always
ACTIVE_HIGH is used)
Example: Example:
...@@ -65,4 +71,12 @@ Example: ...@@ -65,4 +71,12 @@ Example:
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;
}; };
buck9_reg {
regulator-compatible = "BUCK9";
regulator-name = "CAM_ISP_CORE_1.2V";
regulator-min-microvolt = <1000000>;
regulator-max-microvolt = <1200000>;
maxim,ena-gpios = <&gpm0 3 GPIO_ACTIVE_HIGH>;
};
} }
...@@ -2,7 +2,7 @@ Intersil ISL9305/ISL9305H voltage regulator ...@@ -2,7 +2,7 @@ Intersil ISL9305/ISL9305H voltage regulator
Required properties: Required properties:
- compatible: "isl,isl9305" or "isl,isl9305h" - compatible: "isil,isl9305" or "isil,isl9305h"
- reg: I2C slave address, usually 0x68. - reg: I2C slave address, usually 0x68.
- regulators: A node that houses a sub-node for each regulator within the - regulators: A node that houses a sub-node for each regulator within the
device. Each sub-node is identified using the node's name, with valid device. Each sub-node is identified using the node's name, with valid
...@@ -19,7 +19,7 @@ Optional properties: ...@@ -19,7 +19,7 @@ Optional properties:
Example Example
pmic: isl9305@68 { pmic: isl9305@68 {
compatible = "isl,isl9305"; compatible = "isil,isl9305";
reg = <0x68>; reg = <0x68>;
VINDCD1-supply = <&system_power>; VINDCD1-supply = <&system_power>;
......
...@@ -414,6 +414,14 @@ config REGULATOR_MAX77802 ...@@ -414,6 +414,14 @@ config REGULATOR_MAX77802
Exynos5420/Exynos5800 SoCs to control various voltages. Exynos5420/Exynos5800 SoCs to control various voltages.
It includes support for control of voltage and ramp speed. It includes support for control of voltage and ramp speed.
config REGULATOR_MAX77843
tristate "Maxim 77843 regulator"
depends on MFD_MAX77843
help
This driver controls a Maxim 77843 regulator.
The regulator include two 'SAFEOUT' for USB(Universal Serial Bus)
This is suitable for Exynos5433 SoC chips.
config REGULATOR_MC13XXX_CORE config REGULATOR_MC13XXX_CORE
tristate tristate
......
...@@ -55,6 +55,7 @@ obj-$(CONFIG_REGULATOR_MAX8998) += max8998.o ...@@ -55,6 +55,7 @@ obj-$(CONFIG_REGULATOR_MAX8998) += max8998.o
obj-$(CONFIG_REGULATOR_MAX77686) += max77686.o obj-$(CONFIG_REGULATOR_MAX77686) += max77686.o
obj-$(CONFIG_REGULATOR_MAX77693) += max77693.o obj-$(CONFIG_REGULATOR_MAX77693) += max77693.o
obj-$(CONFIG_REGULATOR_MAX77802) += max77802.o obj-$(CONFIG_REGULATOR_MAX77802) += max77802.o
obj-$(CONFIG_REGULATOR_MAX77843) += max77843.o
obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o
obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
obj-$(CONFIG_REGULATOR_MC13XXX_CORE) += mc13xxx-regulator-core.o obj-$(CONFIG_REGULATOR_MC13XXX_CORE) += mc13xxx-regulator-core.o
......
...@@ -177,8 +177,10 @@ static int isl9305_i2c_probe(struct i2c_client *i2c, ...@@ -177,8 +177,10 @@ static int isl9305_i2c_probe(struct i2c_client *i2c,
#ifdef CONFIG_OF #ifdef CONFIG_OF
static const struct of_device_id isl9305_dt_ids[] = { static const struct of_device_id isl9305_dt_ids[] = {
{ .compatible = "isl,isl9305" }, { .compatible = "isl,isl9305" }, /* for backward compat., don't use */
{ .compatible = "isl,isl9305h" }, { .compatible = "isil,isl9305" },
{ .compatible = "isl,isl9305h" }, /* for backward compat., don't use */
{ .compatible = "isil,isl9305h" },
{}, {},
}; };
#endif #endif
......
...@@ -106,7 +106,6 @@ struct lp872x { ...@@ -106,7 +106,6 @@ struct lp872x {
struct device *dev; struct device *dev;
enum lp872x_id chipid; enum lp872x_id chipid;
struct lp872x_platform_data *pdata; struct lp872x_platform_data *pdata;
struct regulator_dev **regulators;
int num_regulators; int num_regulators;
enum lp872x_dvs_state dvs_pin; enum lp872x_dvs_state dvs_pin;
int dvs_gpio; int dvs_gpio;
...@@ -801,8 +800,6 @@ static int lp872x_regulator_register(struct lp872x *lp) ...@@ -801,8 +800,6 @@ static int lp872x_regulator_register(struct lp872x *lp)
dev_err(lp->dev, "regulator register err"); dev_err(lp->dev, "regulator register err");
return PTR_ERR(rdev); return PTR_ERR(rdev);
} }
*(lp->regulators + i) = rdev;
} }
return 0; return 0;
...@@ -906,7 +903,7 @@ static struct lp872x_platform_data ...@@ -906,7 +903,7 @@ static struct lp872x_platform_data
static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id) static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
{ {
struct lp872x *lp; struct lp872x *lp;
int ret, size, num_regulators; int ret;
const int lp872x_num_regulators[] = { const int lp872x_num_regulators[] = {
[LP8720] = LP8720_NUM_REGULATORS, [LP8720] = LP8720_NUM_REGULATORS,
[LP8725] = LP8725_NUM_REGULATORS, [LP8725] = LP8725_NUM_REGULATORS,
...@@ -918,38 +915,27 @@ static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id) ...@@ -918,38 +915,27 @@ static int lp872x_probe(struct i2c_client *cl, const struct i2c_device_id *id)
lp = devm_kzalloc(&cl->dev, sizeof(struct lp872x), GFP_KERNEL); lp = devm_kzalloc(&cl->dev, sizeof(struct lp872x), GFP_KERNEL);
if (!lp) if (!lp)
goto err_mem; return -ENOMEM;
num_regulators = lp872x_num_regulators[id->driver_data];
size = sizeof(struct regulator_dev *) * num_regulators;
lp->regulators = devm_kzalloc(&cl->dev, size, GFP_KERNEL); lp->num_regulators = lp872x_num_regulators[id->driver_data];
if (!lp->regulators)
goto err_mem;
lp->regmap = devm_regmap_init_i2c(cl, &lp872x_regmap_config); lp->regmap = devm_regmap_init_i2c(cl, &lp872x_regmap_config);
if (IS_ERR(lp->regmap)) { if (IS_ERR(lp->regmap)) {
ret = PTR_ERR(lp->regmap); ret = PTR_ERR(lp->regmap);
dev_err(&cl->dev, "regmap init i2c err: %d\n", ret); dev_err(&cl->dev, "regmap init i2c err: %d\n", ret);
goto err_dev; return ret;
} }
lp->dev = &cl->dev; lp->dev = &cl->dev;
lp->pdata = dev_get_platdata(&cl->dev); lp->pdata = dev_get_platdata(&cl->dev);
lp->chipid = id->driver_data; lp->chipid = id->driver_data;
lp->num_regulators = num_regulators;
i2c_set_clientdata(cl, lp); i2c_set_clientdata(cl, lp);
ret = lp872x_config(lp); ret = lp872x_config(lp);
if (ret) if (ret)
goto err_dev; return ret;
return lp872x_regulator_register(lp); return lp872x_regulator_register(lp);
err_mem:
return -ENOMEM;
err_dev:
return ret;
} }
static const struct of_device_id lp872x_dt_ids[] = { static const struct of_device_id lp872x_dt_ids[] = {
......
...@@ -103,6 +103,8 @@ static struct regulator_ops max14577_charger_ops = { ...@@ -103,6 +103,8 @@ static struct regulator_ops max14577_charger_ops = {
static const struct regulator_desc max14577_supported_regulators[] = { static const struct regulator_desc max14577_supported_regulators[] = {
[MAX14577_SAFEOUT] = { [MAX14577_SAFEOUT] = {
.name = "SAFEOUT", .name = "SAFEOUT",
.of_match = of_match_ptr("SAFEOUT"),
.regulators_node = of_match_ptr("regulators"),
.id = MAX14577_SAFEOUT, .id = MAX14577_SAFEOUT,
.ops = &max14577_safeout_ops, .ops = &max14577_safeout_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
...@@ -114,6 +116,8 @@ static const struct regulator_desc max14577_supported_regulators[] = { ...@@ -114,6 +116,8 @@ static const struct regulator_desc max14577_supported_regulators[] = {
}, },
[MAX14577_CHARGER] = { [MAX14577_CHARGER] = {
.name = "CHARGER", .name = "CHARGER",
.of_match = of_match_ptr("CHARGER"),
.regulators_node = of_match_ptr("regulators"),
.id = MAX14577_CHARGER, .id = MAX14577_CHARGER,
.ops = &max14577_charger_ops, .ops = &max14577_charger_ops,
.type = REGULATOR_CURRENT, .type = REGULATOR_CURRENT,
...@@ -137,6 +141,8 @@ static struct regulator_ops max77836_ldo_ops = { ...@@ -137,6 +141,8 @@ static struct regulator_ops max77836_ldo_ops = {
static const struct regulator_desc max77836_supported_regulators[] = { static const struct regulator_desc max77836_supported_regulators[] = {
[MAX14577_SAFEOUT] = { [MAX14577_SAFEOUT] = {
.name = "SAFEOUT", .name = "SAFEOUT",
.of_match = of_match_ptr("SAFEOUT"),
.regulators_node = of_match_ptr("regulators"),
.id = MAX14577_SAFEOUT, .id = MAX14577_SAFEOUT,
.ops = &max14577_safeout_ops, .ops = &max14577_safeout_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
...@@ -148,6 +154,8 @@ static const struct regulator_desc max77836_supported_regulators[] = { ...@@ -148,6 +154,8 @@ static const struct regulator_desc max77836_supported_regulators[] = {
}, },
[MAX14577_CHARGER] = { [MAX14577_CHARGER] = {
.name = "CHARGER", .name = "CHARGER",
.of_match = of_match_ptr("CHARGER"),
.regulators_node = of_match_ptr("regulators"),
.id = MAX14577_CHARGER, .id = MAX14577_CHARGER,
.ops = &max14577_charger_ops, .ops = &max14577_charger_ops,
.type = REGULATOR_CURRENT, .type = REGULATOR_CURRENT,
...@@ -157,6 +165,8 @@ static const struct regulator_desc max77836_supported_regulators[] = { ...@@ -157,6 +165,8 @@ static const struct regulator_desc max77836_supported_regulators[] = {
}, },
[MAX77836_LDO1] = { [MAX77836_LDO1] = {
.name = "LDO1", .name = "LDO1",
.of_match = of_match_ptr("LDO1"),
.regulators_node = of_match_ptr("regulators"),
.id = MAX77836_LDO1, .id = MAX77836_LDO1,
.ops = &max77836_ldo_ops, .ops = &max77836_ldo_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
...@@ -171,6 +181,8 @@ static const struct regulator_desc max77836_supported_regulators[] = { ...@@ -171,6 +181,8 @@ static const struct regulator_desc max77836_supported_regulators[] = {
}, },
[MAX77836_LDO2] = { [MAX77836_LDO2] = {
.name = "LDO2", .name = "LDO2",
.of_match = of_match_ptr("LDO2"),
.regulators_node = of_match_ptr("regulators"),
.id = MAX77836_LDO2, .id = MAX77836_LDO2,
.ops = &max77836_ldo_ops, .ops = &max77836_ldo_ops,
.type = REGULATOR_VOLTAGE, .type = REGULATOR_VOLTAGE,
...@@ -198,43 +210,6 @@ static struct of_regulator_match max77836_regulator_matches[] = { ...@@ -198,43 +210,6 @@ static struct of_regulator_match max77836_regulator_matches[] = {
{ .name = "LDO2", }, { .name = "LDO2", },
}; };
static int max14577_regulator_dt_parse_pdata(struct platform_device *pdev,
enum maxim_device_type dev_type)
{
int ret;
struct device_node *np;
struct of_regulator_match *regulator_matches;
unsigned int regulator_matches_size;
np = of_get_child_by_name(pdev->dev.parent->of_node, "regulators");
if (!np) {
dev_err(&pdev->dev, "Failed to get child OF node for regulators\n");
return -EINVAL;
}
switch (dev_type) {
case MAXIM_DEVICE_TYPE_MAX77836:
regulator_matches = max77836_regulator_matches;
regulator_matches_size = ARRAY_SIZE(max77836_regulator_matches);
break;
case MAXIM_DEVICE_TYPE_MAX14577:
default:
regulator_matches = max14577_regulator_matches;
regulator_matches_size = ARRAY_SIZE(max14577_regulator_matches);
}
ret = of_regulator_match(&pdev->dev, np, regulator_matches,
regulator_matches_size);
if (ret < 0)
dev_err(&pdev->dev, "Error parsing regulator init data: %d\n", ret);
else
ret = 0;
of_node_put(np);
return ret;
}
static inline struct regulator_init_data *match_init_data(int index, static inline struct regulator_init_data *match_init_data(int index,
enum maxim_device_type dev_type) enum maxim_device_type dev_type)
{ {
...@@ -261,11 +236,6 @@ static inline struct device_node *match_of_node(int index, ...@@ -261,11 +236,6 @@ static inline struct device_node *match_of_node(int index,
} }
} }
#else /* CONFIG_OF */ #else /* CONFIG_OF */
static int max14577_regulator_dt_parse_pdata(struct platform_device *pdev,
enum maxim_device_type dev_type)
{
return 0;
}
static inline struct regulator_init_data *match_init_data(int index, static inline struct regulator_init_data *match_init_data(int index,
enum maxim_device_type dev_type) enum maxim_device_type dev_type)
{ {
...@@ -308,16 +278,12 @@ static int max14577_regulator_probe(struct platform_device *pdev) ...@@ -308,16 +278,12 @@ static int max14577_regulator_probe(struct platform_device *pdev)
{ {
struct max14577 *max14577 = dev_get_drvdata(pdev->dev.parent); struct max14577 *max14577 = dev_get_drvdata(pdev->dev.parent);
struct max14577_platform_data *pdata = dev_get_platdata(max14577->dev); struct max14577_platform_data *pdata = dev_get_platdata(max14577->dev);
int i, ret; int i, ret = 0;
struct regulator_config config = {}; struct regulator_config config = {};
const struct regulator_desc *supported_regulators; const struct regulator_desc *supported_regulators;
unsigned int supported_regulators_size; unsigned int supported_regulators_size;
enum maxim_device_type dev_type = max14577->dev_type; enum maxim_device_type dev_type = max14577->dev_type;
ret = max14577_regulator_dt_parse_pdata(pdev, dev_type);
if (ret)
return ret;
switch (dev_type) { switch (dev_type) {
case MAXIM_DEVICE_TYPE_MAX77836: case MAXIM_DEVICE_TYPE_MAX77836:
supported_regulators = max77836_supported_regulators; supported_regulators = max77836_supported_regulators;
...@@ -329,7 +295,7 @@ static int max14577_regulator_probe(struct platform_device *pdev) ...@@ -329,7 +295,7 @@ static int max14577_regulator_probe(struct platform_device *pdev)
supported_regulators_size = ARRAY_SIZE(max14577_supported_regulators); supported_regulators_size = ARRAY_SIZE(max14577_supported_regulators);
} }
config.dev = &pdev->dev; config.dev = max14577->dev;
config.driver_data = max14577; config.driver_data = max14577;
for (i = 0; i < supported_regulators_size; i++) { for (i = 0; i < supported_regulators_size; i++) {
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <linux/bug.h> #include <linux/bug.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/of_gpio.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/regulator/driver.h> #include <linux/regulator/driver.h>
...@@ -45,6 +46,11 @@ ...@@ -45,6 +46,11 @@
#define MAX77686_DVS_MINUV 600000 #define MAX77686_DVS_MINUV 600000
#define MAX77686_DVS_UVSTEP 12500 #define MAX77686_DVS_UVSTEP 12500
/*
* Value for configuring buck[89] and LDO{20,21,22} as GPIO control.
* It is the same as 'off' for other regulators.
*/
#define MAX77686_GPIO_CONTROL 0x0
/* /*
* Values used for configuring LDOs and bucks. * Values used for configuring LDOs and bucks.
* Forcing low power mode: LDO1, 3-5, 9, 13, 17-26 * Forcing low power mode: LDO1, 3-5, 9, 13, 17-26
...@@ -82,6 +88,8 @@ enum max77686_ramp_rate { ...@@ -82,6 +88,8 @@ enum max77686_ramp_rate {
}; };
struct max77686_data { struct max77686_data {
u64 gpio_enabled:MAX77686_REGULATORS;
/* Array indexed by regulator id */ /* Array indexed by regulator id */
unsigned int opmode[MAX77686_REGULATORS]; unsigned int opmode[MAX77686_REGULATORS];
}; };
...@@ -100,6 +108,26 @@ static unsigned int max77686_get_opmode_shift(int id) ...@@ -100,6 +108,26 @@ static unsigned int max77686_get_opmode_shift(int id)
} }
} }
/*
* When regulator is configured for GPIO control then it
* replaces "normal" mode. Any change from low power mode to normal
* should actually change to GPIO control.
* Map normal mode to proper value for such regulators.
*/
static unsigned int max77686_map_normal_mode(struct max77686_data *max77686,
int id)
{
switch (id) {
case MAX77686_BUCK8:
case MAX77686_BUCK9:
case MAX77686_LDO20 ... MAX77686_LDO22:
if (max77686->gpio_enabled & (1 << id))
return MAX77686_GPIO_CONTROL;
}
return MAX77686_NORMAL;
}
/* Some BUCKs and LDOs supports Normal[ON/OFF] mode during suspend */ /* Some BUCKs and LDOs supports Normal[ON/OFF] mode during suspend */
static int max77686_set_suspend_disable(struct regulator_dev *rdev) static int max77686_set_suspend_disable(struct regulator_dev *rdev)
{ {
...@@ -136,7 +164,7 @@ static int max77686_set_suspend_mode(struct regulator_dev *rdev, ...@@ -136,7 +164,7 @@ static int max77686_set_suspend_mode(struct regulator_dev *rdev,
val = MAX77686_LDO_LOWPOWER_PWRREQ; val = MAX77686_LDO_LOWPOWER_PWRREQ;
break; break;
case REGULATOR_MODE_NORMAL: /* ON in Normal Mode */ case REGULATOR_MODE_NORMAL: /* ON in Normal Mode */
val = MAX77686_NORMAL; val = max77686_map_normal_mode(max77686, id);
break; break;
default: default:
pr_warn("%s: regulator_suspend_mode : 0x%x not supported\n", pr_warn("%s: regulator_suspend_mode : 0x%x not supported\n",
...@@ -160,7 +188,7 @@ static int max77686_ldo_set_suspend_mode(struct regulator_dev *rdev, ...@@ -160,7 +188,7 @@ static int max77686_ldo_set_suspend_mode(struct regulator_dev *rdev,
{ {
unsigned int val; unsigned int val;
struct max77686_data *max77686 = rdev_get_drvdata(rdev); struct max77686_data *max77686 = rdev_get_drvdata(rdev);
int ret; int ret, id = rdev_get_id(rdev);
switch (mode) { switch (mode) {
case REGULATOR_MODE_STANDBY: /* switch off */ case REGULATOR_MODE_STANDBY: /* switch off */
...@@ -170,7 +198,7 @@ static int max77686_ldo_set_suspend_mode(struct regulator_dev *rdev, ...@@ -170,7 +198,7 @@ static int max77686_ldo_set_suspend_mode(struct regulator_dev *rdev,
val = MAX77686_LDO_LOWPOWER_PWRREQ; val = MAX77686_LDO_LOWPOWER_PWRREQ;
break; break;
case REGULATOR_MODE_NORMAL: /* ON in Normal Mode */ case REGULATOR_MODE_NORMAL: /* ON in Normal Mode */
val = MAX77686_NORMAL; val = max77686_map_normal_mode(max77686, id);
break; break;
default: default:
pr_warn("%s: regulator_suspend_mode : 0x%x not supported\n", pr_warn("%s: regulator_suspend_mode : 0x%x not supported\n",
...@@ -184,7 +212,7 @@ static int max77686_ldo_set_suspend_mode(struct regulator_dev *rdev, ...@@ -184,7 +212,7 @@ static int max77686_ldo_set_suspend_mode(struct regulator_dev *rdev,
if (ret) if (ret)
return ret; return ret;
max77686->opmode[rdev_get_id(rdev)] = val; max77686->opmode[id] = val;
return 0; return 0;
} }
...@@ -197,7 +225,7 @@ static int max77686_enable(struct regulator_dev *rdev) ...@@ -197,7 +225,7 @@ static int max77686_enable(struct regulator_dev *rdev)
shift = max77686_get_opmode_shift(id); shift = max77686_get_opmode_shift(id);
if (max77686->opmode[id] == MAX77686_OFF_PWRREQ) if (max77686->opmode[id] == MAX77686_OFF_PWRREQ)
max77686->opmode[id] = MAX77686_NORMAL; max77686->opmode[id] = max77686_map_normal_mode(max77686, id);
return regmap_update_bits(rdev->regmap, rdev->desc->enable_reg, return regmap_update_bits(rdev->regmap, rdev->desc->enable_reg,
rdev->desc->enable_mask, rdev->desc->enable_mask,
...@@ -229,6 +257,36 @@ static int max77686_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay) ...@@ -229,6 +257,36 @@ static int max77686_set_ramp_delay(struct regulator_dev *rdev, int ramp_delay)
MAX77686_RAMP_RATE_MASK, ramp_value << 6); MAX77686_RAMP_RATE_MASK, ramp_value << 6);
} }
static int max77686_of_parse_cb(struct device_node *np,
const struct regulator_desc *desc,
struct regulator_config *config)
{
struct max77686_data *max77686 = config->driver_data;
switch (desc->id) {
case MAX77686_BUCK8:
case MAX77686_BUCK9:
case MAX77686_LDO20 ... MAX77686_LDO22:
config->ena_gpio = of_get_named_gpio(np,
"maxim,ena-gpios", 0);
config->ena_gpio_flags = GPIOF_OUT_INIT_HIGH;
config->ena_gpio_initialized = true;
break;
default:
return 0;
}
if (gpio_is_valid(config->ena_gpio)) {
max77686->gpio_enabled |= (1 << desc->id);
return regmap_update_bits(config->regmap, desc->enable_reg,
desc->enable_mask,
MAX77686_GPIO_CONTROL);
}
return 0;
}
static struct regulator_ops max77686_ops = { static struct regulator_ops max77686_ops = {
.list_voltage = regulator_list_voltage_linear, .list_voltage = regulator_list_voltage_linear,
.map_voltage = regulator_map_voltage_linear, .map_voltage = regulator_map_voltage_linear,
...@@ -283,6 +341,7 @@ static struct regulator_ops max77686_buck_dvs_ops = { ...@@ -283,6 +341,7 @@ static struct regulator_ops max77686_buck_dvs_ops = {
.name = "LDO"#num, \ .name = "LDO"#num, \
.of_match = of_match_ptr("LDO"#num), \ .of_match = of_match_ptr("LDO"#num), \
.regulators_node = of_match_ptr("voltage-regulators"), \ .regulators_node = of_match_ptr("voltage-regulators"), \
.of_parse_cb = max77686_of_parse_cb, \
.id = MAX77686_LDO##num, \ .id = MAX77686_LDO##num, \
.ops = &max77686_ops, \ .ops = &max77686_ops, \
.type = REGULATOR_VOLTAGE, \ .type = REGULATOR_VOLTAGE, \
...@@ -355,6 +414,7 @@ static struct regulator_ops max77686_buck_dvs_ops = { ...@@ -355,6 +414,7 @@ static struct regulator_ops max77686_buck_dvs_ops = {
.name = "BUCK"#num, \ .name = "BUCK"#num, \
.of_match = of_match_ptr("BUCK"#num), \ .of_match = of_match_ptr("BUCK"#num), \
.regulators_node = of_match_ptr("voltage-regulators"), \ .regulators_node = of_match_ptr("voltage-regulators"), \
.of_parse_cb = max77686_of_parse_cb, \
.id = MAX77686_BUCK##num, \ .id = MAX77686_BUCK##num, \
.ops = &max77686_ops, \ .ops = &max77686_ops, \
.type = REGULATOR_VOLTAGE, \ .type = REGULATOR_VOLTAGE, \
......
/*
* max77843.c - Regulator driver for the Maxim MAX77843
*
* Copyright (C) 2015 Samsung Electronics
* Author: Jaewon Kim <jaewon02.kim@samsung.com>
* Author: Beomho Seo <beomho.seo@samsung.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*/
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/regulator/driver.h>
#include <linux/regulator/machine.h>
#include <linux/mfd/max77843-private.h>
#include <linux/regulator/of_regulator.h>
enum max77843_regulator_type {
MAX77843_SAFEOUT1 = 0,
MAX77843_SAFEOUT2,
MAX77843_CHARGER,
MAX77843_NUM,
};
static const unsigned int max77843_safeout_voltage_table[] = {
4850000,
4900000,
4950000,
3300000,
};
static int max77843_reg_is_enabled(struct regulator_dev *rdev)
{
struct regmap *regmap = rdev->regmap;
int ret;
unsigned int reg;
ret = regmap_read(regmap, rdev->desc->enable_reg, &reg);
if (ret) {
dev_err(&rdev->dev, "Fialed to read charger register\n");
return ret;
}
return (reg & rdev->desc->enable_mask) == rdev->desc->enable_mask;
}
static int max77843_reg_get_current_limit(struct regulator_dev *rdev)
{
struct regmap *regmap = rdev->regmap;
unsigned int chg_min_uA = rdev->constraints->min_uA;
unsigned int chg_max_uA = rdev->constraints->max_uA;
unsigned int val;
int ret;
unsigned int reg, sel;
ret = regmap_read(regmap, MAX77843_CHG_REG_CHG_CNFG_02, &reg);
if (ret) {
dev_err(&rdev->dev, "Failed to read charger register\n");
return ret;
}
sel = reg & MAX77843_CHG_FAST_CHG_CURRENT_MASK;
if (sel < 0x03)
sel = 0;
else
sel -= 2;
val = chg_min_uA + MAX77843_CHG_FAST_CHG_CURRENT_STEP * sel;
if (val > chg_max_uA)
return -EINVAL;
return val;
}
static int max77843_reg_set_current_limit(struct regulator_dev *rdev,
int min_uA, int max_uA)
{
struct regmap *regmap = rdev->regmap;
unsigned int chg_min_uA = rdev->constraints->min_uA;
int sel = 0;
while (chg_min_uA + MAX77843_CHG_FAST_CHG_CURRENT_STEP * sel < min_uA)
sel++;
if (chg_min_uA + MAX77843_CHG_FAST_CHG_CURRENT_STEP * sel > max_uA)
return -EINVAL;
sel += 2;
return regmap_write(regmap, MAX77843_CHG_REG_CHG_CNFG_02, sel);
}
static struct regulator_ops max77843_charger_ops = {
.is_enabled = max77843_reg_is_enabled,
.enable = regulator_enable_regmap,
.disable = regulator_disable_regmap,
.get_current_limit = max77843_reg_get_current_limit,
.set_current_limit = max77843_reg_set_current_limit,
};
static struct regulator_ops max77843_regulator_ops = {
.is_enabled = regulator_is_enabled_regmap,
.enable = regulator_enable_regmap,
.disable = regulator_disable_regmap,
.list_voltage = regulator_list_voltage_table,
.get_voltage_sel = regulator_get_voltage_sel_regmap,
.set_voltage_sel = regulator_set_voltage_sel_regmap,
};
static const struct regulator_desc max77843_supported_regulators[] = {
[MAX77843_SAFEOUT1] = {
.name = "SAFEOUT1",
.id = MAX77843_SAFEOUT1,
.ops = &max77843_regulator_ops,
.of_match = of_match_ptr("SAFEOUT1"),
.regulators_node = of_match_ptr("regulators"),
.type = REGULATOR_VOLTAGE,
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(max77843_safeout_voltage_table),
.volt_table = max77843_safeout_voltage_table,
.enable_reg = MAX77843_SYS_REG_SAFEOUTCTRL,
.enable_mask = MAX77843_REG_SAFEOUTCTRL_ENSAFEOUT1,
.vsel_reg = MAX77843_SYS_REG_SAFEOUTCTRL,
.vsel_mask = MAX77843_REG_SAFEOUTCTRL_SAFEOUT1_MASK,
},
[MAX77843_SAFEOUT2] = {
.name = "SAFEOUT2",
.id = MAX77843_SAFEOUT2,
.ops = &max77843_regulator_ops,
.of_match = of_match_ptr("SAFEOUT2"),
.regulators_node = of_match_ptr("regulators"),
.type = REGULATOR_VOLTAGE,
.owner = THIS_MODULE,
.n_voltages = ARRAY_SIZE(max77843_safeout_voltage_table),
.volt_table = max77843_safeout_voltage_table,
.enable_reg = MAX77843_SYS_REG_SAFEOUTCTRL,
.enable_mask = MAX77843_REG_SAFEOUTCTRL_ENSAFEOUT2,
.vsel_reg = MAX77843_SYS_REG_SAFEOUTCTRL,
.vsel_mask = MAX77843_REG_SAFEOUTCTRL_SAFEOUT2_MASK,
},
[MAX77843_CHARGER] = {
.name = "CHARGER",
.id = MAX77843_CHARGER,
.ops = &max77843_charger_ops,
.of_match = of_match_ptr("CHARGER"),
.regulators_node = of_match_ptr("regulators"),
.type = REGULATOR_CURRENT,
.owner = THIS_MODULE,
.enable_reg = MAX77843_CHG_REG_CHG_CNFG_00,
.enable_mask = MAX77843_CHG_MASK,
},
};
static struct regmap *max77843_get_regmap(struct max77843 *max77843, int reg_id)
{
switch (reg_id) {
case MAX77843_SAFEOUT1:
case MAX77843_SAFEOUT2:
return max77843->regmap;
case MAX77843_CHARGER:
return max77843->regmap_chg;
default:
return max77843->regmap;
}
}
static int max77843_regulator_probe(struct platform_device *pdev)
{
struct max77843 *max77843 = dev_get_drvdata(pdev->dev.parent);
struct regulator_config config = {};
int i;
config.dev = max77843->dev;
config.driver_data = max77843;
for (i = 0; i < ARRAY_SIZE(max77843_supported_regulators); i++) {
struct regulator_dev *regulator;
config.regmap = max77843_get_regmap(max77843,
max77843_supported_regulators[i].id);
regulator = devm_regulator_register(&pdev->dev,
&max77843_supported_regulators[i], &config);
if (IS_ERR(regulator)) {
dev_err(&pdev->dev,
"Failed to regiser regulator-%d\n", i);
return PTR_ERR(regulator);
}
}
return 0;
}
static const struct platform_device_id max77843_regulator_id[] = {
{ "max77843-regulator", },
{ /* sentinel */ },
};
static struct platform_driver max77843_regulator_driver = {
.driver = {
.name = "max77843-regulator",
},
.probe = max77843_regulator_probe,
.id_table = max77843_regulator_id,
};
static int __init max77843_regulator_init(void)
{
return platform_driver_register(&max77843_regulator_driver);
}
subsys_initcall(max77843_regulator_init);
static void __exit max77843_regulator_exit(void)
{
platform_driver_unregister(&max77843_regulator_driver);
}
module_exit(max77843_regulator_exit);
MODULE_AUTHOR("Jaewon Kim <jaewon02.kim@samsung.com>");
MODULE_AUTHOR("Beomho Seo <beomho.seo@samsung.com>");
MODULE_DESCRIPTION("Maxim MAX77843 regulator driver");
MODULE_LICENSE("GPL");
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment