Received: by 2002:a25:824b:0:0:0:0:0 with SMTP id d11csp1820824ybn; Thu, 26 Sep 2019 02:44:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqxfIHrwTF+h2ZLjziG+zT9uEG7hg12UQyZY6ruhAH+tQeObNWZvylBzxCGhxC0B9z4V+zjy X-Received: by 2002:a17:906:6c8:: with SMTP id v8mr2237693ejb.252.1569491044424; Thu, 26 Sep 2019 02:44:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569491044; cv=none; d=google.com; s=arc-20160816; b=hHh4+2mA/rU8S/GmCY69ovGctIe2BflIg58QB/B+DS6r+BxiirwT1ocnNTB3yxR4rA oPHI20SXFL9lSSp0mF1eSWFaTyqxcnQB/stKSHKKZRS4OMAWmSMVObuqAt+LJqkt4aXK eJlE48rCy0d2g9YxkWkfe22HN6IsverlihEC2SudHzD26iD1DN9V45D3juf3Ml5xHYVK hD4u0a7M1QyBJtFqOCDCpTMbRWjiTfOvO4IcQcJ3vasfgClfInnCMYt+g2mdUy6PCq8/ 8xVgiyVTERV17Tm4D02U8+jBRrwuPIurbyyc/RFUTVxcRezbyYYgbZoua3LTes63acot MMag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:user-agent:in-reply-to :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=i/4hqawS5o7WeJFdtrEkTvf1Vh69zpqw5IrwTVU4eSs=; b=e8l9AZNOpu3HI86j4wfZ/B4qGaLwqCOVGltzsAMYp9YGHrJepnWwOD6N3tKfQTkHRh MFxXXEKdbb18xt+llM0ALGzOs/JyNwqHpQyycsl9vUR6DUJMR/Shvue1bQozepr1ZQZI Uax/BBp4eIT4V+gi9WVF3VBKqtoWOMuPAn1mkzEuvXfa8qR9tSlO9ZhI2FwRrPSU3b0k 5Adndq4P3/y4hw2CpTHfLqvZrdVJsWFW62JIJnMF1Ezs0hn5MQbkE74o4/XwJFF9roZ3 iWXGU/E/+mSalIilp4cMo1E1AXjOsurSPD9AnDEPY2MIg6r49dmvEovlvzZ8YjbET/Ho JXFg== 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 e50si993903edb.177.2019.09.26.02.43.41; Thu, 26 Sep 2019 02:44:04 -0700 (PDT) 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 S2438509AbfIYQAF (ORCPT + 99 others); Wed, 25 Sep 2019 12:00:05 -0400 Received: from metis.ext.pengutronix.de ([85.220.165.71]:42579 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731737AbfIYQAE (ORCPT ); Wed, 25 Sep 2019 12:00:04 -0400 Received: from pty.hi.pengutronix.de ([2001:67c:670:100:1d::c5]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1iD9hu-0004J7-Op; Wed, 25 Sep 2019 17:59:58 +0200 Received: from mfe by pty.hi.pengutronix.de with local (Exim 4.89) (envelope-from ) id 1iD9ht-0007QO-TZ; Wed, 25 Sep 2019 17:59:57 +0200 Date: Wed, 25 Sep 2019 17:59:57 +0200 From: Marco Felsch To: Adam Thomson Cc: Support Opensource , "lee.jones@linaro.org" , "robh+dt@kernel.org" , "lgirdwood@gmail.com" , "broonie@kernel.org" , Steve Twiss , "kernel@pengutronix.de" , "devicetree@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH 3/5] regulator: da9062: add voltage selection gpio support Message-ID: <20190925155957.de6odahy2ebhzx5c@pengutronix.de> References: <20190917124246.11732-1-m.felsch@pengutronix.de> <20190917124246.11732-4-m.felsch@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Sent-From: Pengutronix Hildesheim X-URL: http://www.pengutronix.de/ X-IRC: #ptxdist @freenode X-Accept-Language: de,en X-Accept-Content-Type: text/plain X-Uptime: 17:51:58 up 130 days, 22:10, 84 users, load average: 0.10, 0.04, 0.01 User-Agent: NeoMutt/20170113 (1.7.2) X-SA-Exim-Connect-IP: 2001:67c:670:100:1d::c5 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 Hi Adam, On 19-09-24 09:48, Adam Thomson wrote: > On 17 September 2019 13:43, Marco Felsch wrote: > > > 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 > > --- > > drivers/regulator/da9062-regulator.c | 149 +++++++++++++++++++++++++++ > > 1 file changed, 149 insertions(+) > > > > diff --git a/drivers/regulator/da9062-regulator.c b/drivers/regulator/da9062- > > regulator.c > > index 9b2ca472f70c..9d6eb7625948 100644 > > --- a/drivers/regulator/da9062-regulator.c > > +++ b/drivers/regulator/da9062-regulator.c > > @@ -7,6 +7,7 @@ > > #include > > #include > > #include > > +#include > > #include > > #include > > #include > > @@ -15,6 +16,7 @@ > > #include > > #include > > #include > > +#include > > #include > > > > /* Regulator IDs */ > > @@ -50,6 +52,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 +68,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 +355,65 @@ 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 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; > > If we use the generic bindings names then the above will change I guess. Yes. > > + } > > + > > + /* > > + * 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 unbound action. > > + */ > > + 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); > > + goto free; > > + } > > + > > + if (!gpi) { > > + ret = 0; > > + goto free; > > + } > > + > > + /* We need the local number */ > > + nr = da9062_gpio_get_hwgpio(gpi); > > + if (nr < 1 || nr > 3) { > > + ret = -EINVAL; > > + goto free; > > + } > > + > > + ret = regmap_field_write(regl->vsel_gpi, nr); > > Actually thinking about this some more, should we really be setting alternate > functions of the GPIO here? Would this not be done through GPIO/Pinmux > frameworks? That way the GPIO would be blocked off from other's requesting it. > This seems a little unsafe, unless I'm mistaken. The GPIO is used as input, see the flags I passed to devm_gpiod_get_from_of_node(). What I did here is to tell the regulator to listen to the gpio input instead of the sequencer. But as I said the gpio is still configured as input which is absolutly correct. Please check [1] chapter 7.7.1 [1] https://www.dialog-semiconductor.com/sites/default/files/da9062-a_datasheet_2v3.pdf Regards, Marco > > + > > +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 +421,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 +452,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 +493,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 +534,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 +568,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 +582,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 +606,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 +620,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 +644,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 +658,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 +682,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 +700,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 +731,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 +772,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 +813,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 +854,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 +888,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 +902,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 +926,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 +940,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 +964,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 +978,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 +1002,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 +1126,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 +1144,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 > > -- Pengutronix e.K. | | Industrial Linux Solutions | http://www.pengutronix.de/ | Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |