Received: by 2002:a25:7ec1:0:0:0:0:0 with SMTP id z184csp5561456ybc; Wed, 27 Nov 2019 06:04:01 -0800 (PST) X-Google-Smtp-Source: APXvYqw6lUT0qNaSnyT+0NW5LghcTejB2n81ocFIEoRAjYZyt1SJMxxP8h6rVwkQ8AI6ExCJeNcD X-Received: by 2002:a37:4985:: with SMTP id w127mr4361900qka.125.1574863441059; Wed, 27 Nov 2019 06:04:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1574863440; cv=none; d=google.com; s=arc-20160816; b=Wte5B9/D9zOPH0C81lRHVMpaojD5kC2MYVqoKEPvBxtXMjSkEHSAi6ineoHcZyDrYv oU4LdCW/iGrJLB0p13Jnb/2yro5tD0BipF5Ck1RY5+Re7J5u3D9uzCZaeoixQJcTb0Y2 acXguM0X1935Q+NZ5ioh+XLTCj3/LLh4vrxZo+nmGTGxX3LA+cZo7ISu8FrBEcF/Ymo6 DV27pwjCLmxGRiauPTePpx2lP098RBJRRwq0pxh6d47wxL4/rOs5Vr0IkauEu4TTMRYj ioFLkG03wmXD7L4DV6jF0egqgMA+HCs7FWH2e4ag7E5xXPKxw6rEbZ91+KcmBV901aPS Y8iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=f2dmPoxVr8vpE71RMqV9eUwSjKFEJkZGvaHImPwY1OE=; b=qovvX4nl81/EYGicyG0TyxIFmh6ZT2R9BWPwDaA5aPBEukvprjHwzj+3xX9bx0MYP0 W98zbfdudthNAGv/YdaQJ1DLF5RfsnsI9t7/EMz4nuUj21/LKna/P983APNNHXlDWBDs o1Qcwb1ptEjqShG5YLNaKXyV+1YYp1GoJQVgU72pPKYBiYGPNtS23kRYqya0F0Ts1/uw 4FX83HAlcpVrwmdHIcdr4Yywk3NXjdNgFFeeIhVju93fJB7pZ/HGb8/jYqd8SUNiP0rk 6Eoi/r28nQVRlk0HETxweYiNXb4doPTYApSLqYoTQOWR01CnRGvup703AlKrhzPthMFz CLbw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id by4si10650661edb.87.2019.11.27.06.03.19; Wed, 27 Nov 2019 06:04:00 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727096AbfK0N7o (ORCPT + 99 others); Wed, 27 Nov 2019 08:59:44 -0500 Received: from metis.ext.pengutronix.de ([85.220.165.71]:52919 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727047AbfK0N7l (ORCPT ); Wed, 27 Nov 2019 08:59:41 -0500 Received: from dude02.hi.pengutronix.de ([2001:67c:670:100:1d::28] helo=dude02.lab.pengutronix.de) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1iZxqv-0005PE-JT; Wed, 27 Nov 2019 14:59:33 +0100 Received: from mfe by dude02.lab.pengutronix.de with local (Exim 4.92) (envelope-from ) id 1iZxqv-0008Fn-4M; Wed, 27 Nov 2019 14:59:33 +0100 From: Marco Felsch To: bgolaszewski@baylibre.com, linus.walleij@linaro.org, support.opensource@diasemi.com, lee.jones@linaro.org, robh+dt@kernel.org, lgirdwood@gmail.com, broonie@kernel.org, stwiss.opensource@diasemi.com, Adam.Thomson.Opensource@diasemi.com Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de Subject: [PATCH v2 3/5] regulator: da9062: add voltage selection gpio support Date: Wed, 27 Nov 2019 14:59:30 +0100 Message-Id: <20191127135932.7223-4-m.felsch@pengutronix.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191127135932.7223-1-m.felsch@pengutronix.de> References: <20191127135932.7223-1-m.felsch@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::28 X-SA-Exim-Mail-From: mfe@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-kernel@vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The DA9062/1 devices can switch their regulator voltages between voltage-A (active) and voltage-B (suspend) settings. Switching the voltages can be controlled by ther internal state-machine or by a gpio input signal and can be configured for each individual regulator. This commit adds the gpio-based voltage switching support. Signed-off-by: Marco Felsch --- Changelog: v2: - use new public api gpiod_to_offset() - add -ENOENT error check to mimic devm_gpio_optional - add local gpio check for hardening the code drivers/regulator/da9062-regulator.c | 164 +++++++++++++++++++++++++++ 1 file changed, 164 insertions(+) diff --git a/drivers/regulator/da9062-regulator.c b/drivers/regulator/da9062-regulator.c index 710e67081d53..f545ae39352e 100644 --- a/drivers/regulator/da9062-regulator.c +++ b/drivers/regulator/da9062-regulator.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -50,6 +51,7 @@ struct da9062_regulator_info { struct reg_field sleep; struct reg_field suspend_sleep; unsigned int suspend_vsel_reg; + struct reg_field vsel_gpi; /* Event detection bit */ struct reg_field oc_event; }; @@ -65,6 +67,7 @@ struct da9062_regulator { struct regmap_field *suspend; struct regmap_field *sleep; struct regmap_field *suspend_sleep; + struct regmap_field *vsel_gpi; }; /* Encapsulates all information for the regulators driver */ @@ -351,6 +354,81 @@ static const struct regulator_ops da9062_ldo_ops = { .set_suspend_mode = da9062_ldo_set_suspend_mode, }; +static int da9062_config_gpi(struct device_node *np, + const struct regulator_desc *desc, + struct regulator_config *cfg, const char *gpi_id) +{ + struct da9062_regulator *regl = cfg->driver_data; + struct device *hw = regl->hw->dev; + struct device_node *gpio_np; + struct gpio_desc *gpi; + unsigned int nr; + int ret; + char *prop, *label; + + prop = kasprintf(GFP_KERNEL, "dlg,%s-sense-gpios", gpi_id); + if (!prop) + return -ENOMEM; + + label = kasprintf(GFP_KERNEL, "%s-%s-gpi", desc->name, gpi_id); + if (!label) { + ret = -ENOMEM; + goto free; + } + + /* + * We only must ensure that the gpio device is probed before the + * regulator driver so no need to store the reference global. Luckily + * devm_* releases the gpio upon a remove action. The gpio's are + * optional so we need to check for ENOENT. Also we need to check for + * the GPIOLIB support. Do nothing if the property or the gpiolib is + * missing. + */ + gpi = devm_gpiod_get_from_of_node(cfg->dev, np, prop, 0, GPIOD_IN | + GPIOD_FLAGS_BIT_NONEXCLUSIVE, label); + if (IS_ERR(gpi)) { + ret = PTR_ERR(gpi); + if (ret == -ENOENT || ret == -ENOSYS) + ret = 0; + goto free; + } + + /* + * Only local gpios are valid. The gpio-controller is within the + * mfd-root node. + */ + gpio_np = of_parse_phandle(np, prop, 0); + if (gpio_np != hw->of_node) { + of_node_put(gpio_np); + dev_err(hw, "Failed to request %s.\n", prop); + ret = -EINVAL; + goto free; + } + of_node_put(gpio_np); + + /* We need the local number */ + nr = gpiod_to_offset(gpi); + if (nr < 1 || nr > 3) { + ret = -EINVAL; + goto free; + } + + ret = regmap_field_write(regl->vsel_gpi, nr); + +free: + kfree(prop); + kfree(label); + + return ret; +} + +static int da9062_parse_dt(struct device_node *np, + const struct regulator_desc *desc, + struct regulator_config *cfg) +{ + return da9062_config_gpi(np, desc, cfg, "vsel"); +} + /* DA9061 Regulator information */ static const struct da9062_regulator_info local_da9061_regulator_info[] = { { @@ -358,6 +436,7 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = { .desc.name = "DA9061 BUCK1", .desc.of_match = of_match_ptr("buck1"), .desc.regulators_node = of_match_ptr("regulators"), + .desc.of_parse_cb = da9062_parse_dt, .desc.ops = &da9062_buck_ops, .desc.min_uV = (300) * 1000, .desc.uV_step = (10) * 1000, @@ -388,12 +467,17 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = { __builtin_ffs((int)DA9062AA_BUCK1_CONF_MASK) - 1, sizeof(unsigned int) * 8 - __builtin_clz(DA9062AA_BUCK1_CONF_MASK) - 1), + .vsel_gpi = REG_FIELD(DA9062AA_BUCK1_CONT, + __builtin_ffs((int)DA9062AA_VBUCK1_GPI_MASK) - 1, + sizeof(unsigned int) * 8 - + __builtin_clz(DA9062AA_VBUCK1_GPI_MASK) - 1), }, { .desc.id = DA9061_ID_BUCK2, .desc.name = "DA9061 BUCK2", .desc.of_match = of_match_ptr("buck2"), .desc.regulators_node = of_match_ptr("regulators"), + .desc.of_parse_cb = da9062_parse_dt, .desc.ops = &da9062_buck_ops, .desc.min_uV = (800) * 1000, .desc.uV_step = (20) * 1000, @@ -424,12 +508,17 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = { __builtin_ffs((int)DA9062AA_BUCK3_CONF_MASK) - 1, sizeof(unsigned int) * 8 - __builtin_clz(DA9062AA_BUCK3_CONF_MASK) - 1), + .vsel_gpi = REG_FIELD(DA9062AA_BUCK3_CONT, + __builtin_ffs((int)DA9062AA_VBUCK3_GPI_MASK) - 1, + sizeof(unsigned int) * 8 - + __builtin_clz(DA9062AA_VBUCK3_GPI_MASK) - 1), }, { .desc.id = DA9061_ID_BUCK3, .desc.name = "DA9061 BUCK3", .desc.of_match = of_match_ptr("buck3"), .desc.regulators_node = of_match_ptr("regulators"), + .desc.of_parse_cb = da9062_parse_dt, .desc.ops = &da9062_buck_ops, .desc.min_uV = (530) * 1000, .desc.uV_step = (10) * 1000, @@ -460,12 +549,17 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = { __builtin_ffs((int)DA9062AA_BUCK4_CONF_MASK) - 1, sizeof(unsigned int) * 8 - __builtin_clz(DA9062AA_BUCK4_CONF_MASK) - 1), + .vsel_gpi = REG_FIELD(DA9062AA_BUCK4_CONT, + __builtin_ffs((int)DA9062AA_VBUCK4_GPI_MASK) - 1, + sizeof(unsigned int) * 8 - + __builtin_clz(DA9062AA_VBUCK4_GPI_MASK) - 1), }, { .desc.id = DA9061_ID_LDO1, .desc.name = "DA9061 LDO1", .desc.of_match = of_match_ptr("ldo1"), .desc.regulators_node = of_match_ptr("regulators"), + .desc.of_parse_cb = da9062_parse_dt, .desc.ops = &da9062_ldo_ops, .desc.min_uV = (900) * 1000, .desc.uV_step = (50) * 1000, @@ -489,6 +583,10 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = { __builtin_ffs((int)DA9062AA_LDO1_CONF_MASK) - 1, sizeof(unsigned int) * 8 - __builtin_clz(DA9062AA_LDO1_CONF_MASK) - 1), + .vsel_gpi = REG_FIELD(DA9062AA_LDO1_CONT, + __builtin_ffs((int)DA9062AA_VLDO1_GPI_MASK) - 1, + sizeof(unsigned int) * 8 - + __builtin_clz(DA9062AA_VLDO1_GPI_MASK) - 1), .oc_event = REG_FIELD(DA9062AA_STATUS_D, __builtin_ffs((int)DA9062AA_LDO1_ILIM_MASK) - 1, sizeof(unsigned int) * 8 - @@ -499,6 +597,7 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = { .desc.name = "DA9061 LDO2", .desc.of_match = of_match_ptr("ldo2"), .desc.regulators_node = of_match_ptr("regulators"), + .desc.of_parse_cb = da9062_parse_dt, .desc.ops = &da9062_ldo_ops, .desc.min_uV = (900) * 1000, .desc.uV_step = (50) * 1000, @@ -522,6 +621,10 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = { __builtin_ffs((int)DA9062AA_LDO2_CONF_MASK) - 1, sizeof(unsigned int) * 8 - __builtin_clz(DA9062AA_LDO2_CONF_MASK) - 1), + .vsel_gpi = REG_FIELD(DA9062AA_LDO2_CONT, + __builtin_ffs((int)DA9062AA_VLDO2_GPI_MASK) - 1, + sizeof(unsigned int) * 8 - + __builtin_clz(DA9062AA_VLDO2_GPI_MASK) - 1), .oc_event = REG_FIELD(DA9062AA_STATUS_D, __builtin_ffs((int)DA9062AA_LDO2_ILIM_MASK) - 1, sizeof(unsigned int) * 8 - @@ -532,6 +635,7 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = { .desc.name = "DA9061 LDO3", .desc.of_match = of_match_ptr("ldo3"), .desc.regulators_node = of_match_ptr("regulators"), + .desc.of_parse_cb = da9062_parse_dt, .desc.ops = &da9062_ldo_ops, .desc.min_uV = (900) * 1000, .desc.uV_step = (50) * 1000, @@ -555,6 +659,10 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = { __builtin_ffs((int)DA9062AA_LDO3_CONF_MASK) - 1, sizeof(unsigned int) * 8 - __builtin_clz(DA9062AA_LDO3_CONF_MASK) - 1), + .vsel_gpi = REG_FIELD(DA9062AA_LDO3_CONT, + __builtin_ffs((int)DA9062AA_VLDO3_GPI_MASK) - 1, + sizeof(unsigned int) * 8 - + __builtin_clz(DA9062AA_VLDO3_GPI_MASK) - 1), .oc_event = REG_FIELD(DA9062AA_STATUS_D, __builtin_ffs((int)DA9062AA_LDO3_ILIM_MASK) - 1, sizeof(unsigned int) * 8 - @@ -565,6 +673,7 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = { .desc.name = "DA9061 LDO4", .desc.of_match = of_match_ptr("ldo4"), .desc.regulators_node = of_match_ptr("regulators"), + .desc.of_parse_cb = da9062_parse_dt, .desc.ops = &da9062_ldo_ops, .desc.min_uV = (900) * 1000, .desc.uV_step = (50) * 1000, @@ -588,6 +697,10 @@ static const struct da9062_regulator_info local_da9061_regulator_info[] = { __builtin_ffs((int)DA9062AA_LDO4_CONF_MASK) - 1, sizeof(unsigned int) * 8 - __builtin_clz(DA9062AA_LDO4_CONF_MASK) - 1), + .vsel_gpi = REG_FIELD(DA9062AA_LDO4_CONT, + __builtin_ffs((int)DA9062AA_VLDO4_GPI_MASK) - 1, + sizeof(unsigned int) * 8 - + __builtin_clz(DA9062AA_VLDO4_GPI_MASK) - 1), .oc_event = REG_FIELD(DA9062AA_STATUS_D, __builtin_ffs((int)DA9062AA_LDO4_ILIM_MASK) - 1, sizeof(unsigned int) * 8 - @@ -602,6 +715,7 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = { .desc.name = "DA9062 BUCK1", .desc.of_match = of_match_ptr("buck1"), .desc.regulators_node = of_match_ptr("regulators"), + .desc.of_parse_cb = da9062_parse_dt, .desc.ops = &da9062_buck_ops, .desc.min_uV = (300) * 1000, .desc.uV_step = (10) * 1000, @@ -632,12 +746,17 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = { __builtin_ffs((int)DA9062AA_BUCK1_CONF_MASK) - 1, sizeof(unsigned int) * 8 - __builtin_clz(DA9062AA_BUCK1_CONF_MASK) - 1), + .vsel_gpi = REG_FIELD(DA9062AA_BUCK1_CONT, + __builtin_ffs((int)DA9062AA_VBUCK1_GPI_MASK) - 1, + sizeof(unsigned int) * 8 - + __builtin_clz(DA9062AA_VBUCK1_GPI_MASK) - 1), }, { .desc.id = DA9062_ID_BUCK2, .desc.name = "DA9062 BUCK2", .desc.of_match = of_match_ptr("buck2"), .desc.regulators_node = of_match_ptr("regulators"), + .desc.of_parse_cb = da9062_parse_dt, .desc.ops = &da9062_buck_ops, .desc.min_uV = (300) * 1000, .desc.uV_step = (10) * 1000, @@ -668,12 +787,17 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = { __builtin_ffs((int)DA9062AA_BUCK2_CONF_MASK) - 1, sizeof(unsigned int) * 8 - __builtin_clz(DA9062AA_BUCK2_CONF_MASK) - 1), + .vsel_gpi = REG_FIELD(DA9062AA_BUCK2_CONT, + __builtin_ffs((int)DA9062AA_VBUCK2_GPI_MASK) - 1, + sizeof(unsigned int) * 8 - + __builtin_clz(DA9062AA_VBUCK2_GPI_MASK) - 1), }, { .desc.id = DA9062_ID_BUCK3, .desc.name = "DA9062 BUCK3", .desc.of_match = of_match_ptr("buck3"), .desc.regulators_node = of_match_ptr("regulators"), + .desc.of_parse_cb = da9062_parse_dt, .desc.ops = &da9062_buck_ops, .desc.min_uV = (800) * 1000, .desc.uV_step = (20) * 1000, @@ -704,12 +828,17 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = { __builtin_ffs((int)DA9062AA_BUCK3_CONF_MASK) - 1, sizeof(unsigned int) * 8 - __builtin_clz(DA9062AA_BUCK3_CONF_MASK) - 1), + .vsel_gpi = REG_FIELD(DA9062AA_BUCK3_CONT, + __builtin_ffs((int)DA9062AA_VBUCK3_GPI_MASK) - 1, + sizeof(unsigned int) * 8 - + __builtin_clz(DA9062AA_VBUCK3_GPI_MASK) - 1), }, { .desc.id = DA9062_ID_BUCK4, .desc.name = "DA9062 BUCK4", .desc.of_match = of_match_ptr("buck4"), .desc.regulators_node = of_match_ptr("regulators"), + .desc.of_parse_cb = da9062_parse_dt, .desc.ops = &da9062_buck_ops, .desc.min_uV = (530) * 1000, .desc.uV_step = (10) * 1000, @@ -740,12 +869,17 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = { __builtin_ffs((int)DA9062AA_BUCK4_CONF_MASK) - 1, sizeof(unsigned int) * 8 - __builtin_clz(DA9062AA_BUCK4_CONF_MASK) - 1), + .vsel_gpi = REG_FIELD(DA9062AA_BUCK4_CONT, + __builtin_ffs((int)DA9062AA_VBUCK4_GPI_MASK) - 1, + sizeof(unsigned int) * 8 - + __builtin_clz(DA9062AA_VBUCK4_GPI_MASK) - 1), }, { .desc.id = DA9062_ID_LDO1, .desc.name = "DA9062 LDO1", .desc.of_match = of_match_ptr("ldo1"), .desc.regulators_node = of_match_ptr("regulators"), + .desc.of_parse_cb = da9062_parse_dt, .desc.ops = &da9062_ldo_ops, .desc.min_uV = (900) * 1000, .desc.uV_step = (50) * 1000, @@ -769,6 +903,10 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = { __builtin_ffs((int)DA9062AA_LDO1_CONF_MASK) - 1, sizeof(unsigned int) * 8 - __builtin_clz(DA9062AA_LDO1_CONF_MASK) - 1), + .vsel_gpi = REG_FIELD(DA9062AA_LDO1_CONT, + __builtin_ffs((int)DA9062AA_VLDO1_GPI_MASK) - 1, + sizeof(unsigned int) * 8 - + __builtin_clz(DA9062AA_VLDO1_GPI_MASK) - 1), .oc_event = REG_FIELD(DA9062AA_STATUS_D, __builtin_ffs((int)DA9062AA_LDO1_ILIM_MASK) - 1, sizeof(unsigned int) * 8 - @@ -779,6 +917,7 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = { .desc.name = "DA9062 LDO2", .desc.of_match = of_match_ptr("ldo2"), .desc.regulators_node = of_match_ptr("regulators"), + .desc.of_parse_cb = da9062_parse_dt, .desc.ops = &da9062_ldo_ops, .desc.min_uV = (900) * 1000, .desc.uV_step = (50) * 1000, @@ -802,6 +941,10 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = { __builtin_ffs((int)DA9062AA_LDO2_CONF_MASK) - 1, sizeof(unsigned int) * 8 - __builtin_clz(DA9062AA_LDO2_CONF_MASK) - 1), + .vsel_gpi = REG_FIELD(DA9062AA_LDO2_CONT, + __builtin_ffs((int)DA9062AA_VLDO2_GPI_MASK) - 1, + sizeof(unsigned int) * 8 - + __builtin_clz(DA9062AA_VLDO2_GPI_MASK) - 1), .oc_event = REG_FIELD(DA9062AA_STATUS_D, __builtin_ffs((int)DA9062AA_LDO2_ILIM_MASK) - 1, sizeof(unsigned int) * 8 - @@ -812,6 +955,7 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = { .desc.name = "DA9062 LDO3", .desc.of_match = of_match_ptr("ldo3"), .desc.regulators_node = of_match_ptr("regulators"), + .desc.of_parse_cb = da9062_parse_dt, .desc.ops = &da9062_ldo_ops, .desc.min_uV = (900) * 1000, .desc.uV_step = (50) * 1000, @@ -835,6 +979,10 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = { __builtin_ffs((int)DA9062AA_LDO3_CONF_MASK) - 1, sizeof(unsigned int) * 8 - __builtin_clz(DA9062AA_LDO3_CONF_MASK) - 1), + .vsel_gpi = REG_FIELD(DA9062AA_LDO3_CONT, + __builtin_ffs((int)DA9062AA_VLDO3_GPI_MASK) - 1, + sizeof(unsigned int) * 8 - + __builtin_clz(DA9062AA_VLDO3_GPI_MASK) - 1), .oc_event = REG_FIELD(DA9062AA_STATUS_D, __builtin_ffs((int)DA9062AA_LDO3_ILIM_MASK) - 1, sizeof(unsigned int) * 8 - @@ -845,6 +993,7 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = { .desc.name = "DA9062 LDO4", .desc.of_match = of_match_ptr("ldo4"), .desc.regulators_node = of_match_ptr("regulators"), + .desc.of_parse_cb = da9062_parse_dt, .desc.ops = &da9062_ldo_ops, .desc.min_uV = (900) * 1000, .desc.uV_step = (50) * 1000, @@ -868,6 +1017,10 @@ static const struct da9062_regulator_info local_da9062_regulator_info[] = { __builtin_ffs((int)DA9062AA_LDO4_CONF_MASK) - 1, sizeof(unsigned int) * 8 - __builtin_clz(DA9062AA_LDO4_CONF_MASK) - 1), + .vsel_gpi = REG_FIELD(DA9062AA_LDO4_CONT, + __builtin_ffs((int)DA9062AA_VLDO4_GPI_MASK) - 1, + sizeof(unsigned int) * 8 - + __builtin_clz(DA9062AA_VLDO4_GPI_MASK) - 1), .oc_event = REG_FIELD(DA9062AA_STATUS_D, __builtin_ffs((int)DA9062AA_LDO4_ILIM_MASK) - 1, sizeof(unsigned int) * 8 - @@ -988,6 +1141,15 @@ static int da9062_regulator_probe(struct platform_device *pdev) return PTR_ERR(regl->suspend_sleep); } + if (regl->info->vsel_gpi.reg) { + regl->vsel_gpi = devm_regmap_field_alloc( + &pdev->dev, + chip->regmap, + regl->info->vsel_gpi); + if (IS_ERR(regl->vsel_gpi)) + return PTR_ERR(regl->vsel_gpi); + } + /* Register regulator */ memset(&config, 0, sizeof(config)); config.dev = chip->dev; @@ -997,6 +1159,8 @@ static int da9062_regulator_probe(struct platform_device *pdev) regl->rdev = devm_regulator_register(&pdev->dev, ®l->desc, &config); if (IS_ERR(regl->rdev)) { + if (PTR_ERR(regl->rdev) == -EPROBE_DEFER) + return -EPROBE_DEFER; dev_err(&pdev->dev, "Failed to register %s regulator\n", regl->desc.name); -- 2.20.1