Add enable control over GPIO for regulators supporting this: LDO20, LDO21, LDO22, buck8 and buck9.
This is needed for proper (and full) configuration of the Maxim 77686 PMIC without creating redundant 'regulator-fixed' entries. Signed-off-by: Krzysztof Kozlowski <[email protected]> --- drivers/regulator/Kconfig | 1 + drivers/regulator/max77686.c | 97 ++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 90 insertions(+), 8 deletions(-) diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 55d7b7b0f2e0..156ab8032ea4 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -391,6 +391,7 @@ config REGULATOR_MAX8998 config REGULATOR_MAX77686 tristate "Maxim 77686 regulator" depends on MFD_MAX77686 + depends on GPIOLIB help This driver controls a Maxim 77686 regulator via I2C bus. The provided regulator is suitable for diff --git a/drivers/regulator/max77686.c b/drivers/regulator/max77686.c index 5497e10b9659..9446509e7325 100644 --- a/drivers/regulator/max77686.c +++ b/drivers/regulator/max77686.c @@ -26,6 +26,7 @@ #include <linux/bug.h> #include <linux/err.h> #include <linux/gpio.h> +#include <linux/of_gpio.h> #include <linux/slab.h> #include <linux/platform_device.h> #include <linux/regulator/driver.h> @@ -46,6 +47,11 @@ #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. * Forcing low power mode: LDO1, 3-5, 9, 13, 17-26 */ @@ -82,6 +88,9 @@ enum max77686_ramp_rate { }; struct max77686_data { + /* GPIO control over regulators */ + int gpio[MAX77686_REGULATORS]; + /* Array indexed by regulator id */ unsigned int opmode[MAX77686_REGULATORS]; }; @@ -100,6 +109,25 @@ 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 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 (gpio_is_valid(max77686->gpio[id])) + return MAX77686_GPIO_CONTROL; + } + + return MAX77686_NORMAL; +} + /* Some BUCKs and LDOs supports Normal[ON/OFF] mode during suspend */ static int max77686_set_suspend_disable(struct regulator_dev *rdev) { @@ -136,7 +164,7 @@ static int max77686_set_suspend_mode(struct regulator_dev *rdev, val = MAX77686_LDO_LOWPOWER_PWRREQ; break; case REGULATOR_MODE_NORMAL: /* ON in Normal Mode */ - val = MAX77686_NORMAL; + val = max77686_map_normal_mode(max77686, id); break; default: 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, { unsigned int val; struct max77686_data *max77686 = rdev_get_drvdata(rdev); - int ret; + int ret, id = rdev_get_id(rdev); switch (mode) { case REGULATOR_MODE_STANDBY: /* switch off */ @@ -170,7 +198,7 @@ static int max77686_ldo_set_suspend_mode(struct regulator_dev *rdev, val = MAX77686_LDO_LOWPOWER_PWRREQ; break; case REGULATOR_MODE_NORMAL: /* ON in Normal Mode */ - val = MAX77686_NORMAL; + val = max77686_map_normal_mode(max77686, id); break; default: 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, if (ret) return ret; - max77686->opmode[rdev_get_id(rdev)] = val; + max77686->opmode[id] = val; return 0; } @@ -197,7 +225,7 @@ static int max77686_enable(struct regulator_dev *rdev) shift = max77686_get_opmode_shift(id); 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, rdev->desc->enable_mask, @@ -428,8 +456,46 @@ static const struct regulator_desc regulators[] = { regulator_desc_buck(9), }; +static int max77686_enable_gpio_control(struct regulator_dev *rdev) +{ + return regmap_update_bits(rdev->regmap, rdev->desc->enable_reg, + rdev->desc->enable_mask, + MAX77686_GPIO_CONTROL); +} + +static void max77686_pmic_dt_parse_gpio_control(struct platform_device *pdev, + struct max77686_data *max77686, + struct of_regulator_match *rdata) +{ + unsigned int i; + unsigned int valid_regulators[5] = { MAX77686_LDO20, MAX77686_LDO21, + MAX77686_LDO22, MAX77686_BUCK8, MAX77686_BUCK9 }; + + /* + * 0 is a valid GPIO so initialize all GPIOs to negative value + * to indicate that GPIO control won't be used for this regulator. + */ + for (i = 0; i < MAX77686_REGULATORS; i++) + max77686->gpio[i] = -EINVAL; + + for (i = 0; i < ARRAY_SIZE(valid_regulators); i++) { + unsigned int id = valid_regulators[i]; + int *gpio = &max77686->gpio[id]; + + /* Assuming that index of rdata matches 'id' */ + if (!rdata[id].init_data || !rdata[id].of_node) + continue; + + *gpio = of_get_named_gpio(rdata[id].of_node, "gpio", 0); + if (gpio_is_valid(*gpio)) + dev_dbg(&pdev->dev, "Using GPIO %d for ext-control over %d/%s\n", + *gpio, id, rdata[id].of_node->name); + } +} + static int max77686_pmic_dt_parse(struct platform_device *pdev, - struct of_regulator_match *rdata) + struct max77686_data *max77686, + struct of_regulator_match *rdata) { struct max77686_dev *iodev = dev_get_drvdata(pdev->dev.parent); struct device_node *pmic_np, *regulators_np; @@ -444,7 +510,6 @@ static int max77686_pmic_dt_parse(struct platform_device *pdev, return -EINVAL; } - ret = of_regulator_match(&pdev->dev, regulators_np, rdata, MAX77686_REGULATORS); if (ret < 0) { @@ -454,6 +519,8 @@ static int max77686_pmic_dt_parse(struct platform_device *pdev, } /* else: don't care how many regulators were parsed from DTS. */ + max77686_pmic_dt_parse_gpio_control(pdev, max77686, rdata); + of_node_put(regulators_np); return 0; @@ -477,6 +544,8 @@ static int max77686_pmic_probe(struct platform_device *pdev) config.dev = &pdev->dev; config.regmap = iodev->regmap; config.driver_data = max77686; + config.ena_gpio_flags = GPIOF_OUT_INIT_HIGH; + config.ena_gpio_initialized = true; platform_set_drvdata(pdev, max77686); rdata = kzalloc(sizeof(*rdata) * MAX77686_REGULATORS, GFP_KERNEL); @@ -486,7 +555,7 @@ static int max77686_pmic_probe(struct platform_device *pdev) for (i = 0; i < MAX77686_REGULATORS; i++) rdata[i].name = regulators[i].name; - ret = max77686_pmic_dt_parse(pdev, rdata); + ret = max77686_pmic_dt_parse(pdev, max77686, rdata); if (ret) goto out; @@ -496,6 +565,7 @@ static int max77686_pmic_probe(struct platform_device *pdev) config.init_data = rdata[i].init_data; config.of_node = rdata[i].of_node; + config.ena_gpio = max77686->gpio[id]; max77686->opmode[id] = MAX77686_NORMAL; @@ -507,6 +577,17 @@ static int max77686_pmic_probe(struct platform_device *pdev) "regulator init failed for %d: %d\n", i, ret); goto out; } + + if (gpio_is_valid(config.ena_gpio)) { + ret = max77686_enable_gpio_control(rdev); + + if (ret < 0) { + dev_err(&pdev->dev, + "regulator enable ext control failed for %d\n", + i); + goto out; + } + } } out: -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
