From: Johan Hovold <johan@kernel.org>
To: Andreas Kemnade <andreas@kemnade.info>
Cc: letux-kernel@openphoenux.org, johan@kernel.org,
robh+dt@kernel.org, mark.rutland@arm.com,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH v3 5/6] gnss: sirf: add a separate supply for a lna
Date: Tue, 22 Jan 2019 19:03:21 +0100 [thread overview]
Message-ID: <20190122180321.GS3691@localhost> (raw)
In-Reply-To: <20190116211812.6337-6-andreas@kemnade.info>
On Wed, Jan 16, 2019 at 10:18:11PM +0100, Andreas Kemnade wrote:
> Devices might have a separate lna between antenna input of the gps
> chip and the antenna which might have a separate supply.
>
> Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
> ---
> Changes in v3:
> - improved error checking
> - style cleanup
>
> Changes in v2:
> - handle lna also if there is no on-off gpio
> - rebase on changed 2/5
>
> drivers/gnss/sirf.c | 50 ++++++++++++++++++++++++++++++++++++++++++++------
> 1 file changed, 44 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gnss/sirf.c b/drivers/gnss/sirf.c
> index 943a2ec9b708..7de98edf198a 100644
> --- a/drivers/gnss/sirf.c
> +++ b/drivers/gnss/sirf.c
> @@ -41,6 +41,7 @@ struct sirf_data {
> struct serdev_device *serdev;
> speed_t speed;
> struct regulator *vcc;
> + struct regulator *lna;
> struct gpio_desc *on_off;
> struct gpio_desc *wakeup;
> int irq;
> @@ -293,21 +294,52 @@ static int sirf_set_active(struct sirf_data *data, bool active)
> static int sirf_runtime_suspend(struct device *dev)
> {
> struct sirf_data *data = dev_get_drvdata(dev);
> + int ret;
>
> - if (!data->on_off)
> - return regulator_disable(data->vcc);
> + if (data->on_off)
> + ret = sirf_set_active(data, false);
> + else
> + ret = regulator_disable(data->vcc);
> +
> + if (ret)
> + return ret;
>
> - return sirf_set_active(data, false);
> + ret = regulator_disable(data->lna);
> + if (ret) {
Use an error label for this to avoid the indentation.
> + int reenable_ret;
Rename ret2 and move to start of function.
> +
> + if (data->on_off)
> + reenable_ret = sirf_set_active(data, true);
> + else
> + reenable_ret = regulator_enable(data->vcc);
> +
> + if (reenable_ret)
> + dev_err(dev,
> + "failed to reenable power on failed suspend: %d\n",
> + reenable_ret);
> + }
> +
> + return ret;
> }
>
> static int sirf_runtime_resume(struct device *dev)
> {
> struct sirf_data *data = dev_get_drvdata(dev);
> + int ret;
> +
> + ret = regulator_enable(data->lna);
> + if (ret)
> + return ret;
>
> - if (!data->on_off)
> - return regulator_enable(data->vcc);
> + if (data->on_off)
> + ret = sirf_set_active(data, true);
> + else
> + ret = regulator_enable(data->vcc);
>
> - return sirf_set_active(data, true);
> + if (ret)
Use an error label here too for consistency (and if if ever add further
resources to be manipulated here).
> + regulator_disable(data->lna);
> +
> + return ret;
> }
>
> static int __maybe_unused sirf_suspend(struct device *dev)
> @@ -395,6 +427,12 @@ static int sirf_probe(struct serdev_device *serdev)
> goto err_put_device;
> }
>
> + data->lna = devm_regulator_get(dev, "lna");
> + if (IS_ERR(data->lna)) {
> + ret = PTR_ERR(data->lna);
> + goto err_put_device;
> + }
> +
> data->on_off = devm_gpiod_get_optional(dev, "sirf,onoff",
> GPIOD_OUT_LOW);
> if (IS_ERR(data->on_off))
Johan
next prev parent reply other threads:[~2019-01-22 18:03 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-16 21:18 [PATCH v3 0/6] gnss: sirf: add support for w2sg0004 + lna Andreas Kemnade
2019-01-16 21:18 ` [PATCH v3 1/6] gnss: sirf: write data to gnss only when the gnss device is open Andreas Kemnade
2019-01-16 21:18 ` [PATCH v3 2/6] gnss: sirf: set power state initially off Andreas Kemnade
2019-01-22 17:22 ` Johan Hovold
2019-01-16 21:18 ` [PATCH v3 3/6] gnss: sirf: add support for configurations without wakeup signal Andreas Kemnade
2019-01-22 17:56 ` Johan Hovold
2019-01-16 21:18 ` [PATCH v3 4/6] dt-bindings: gnss: add w2sg0004 compatible string Andreas Kemnade
2019-01-16 21:18 ` [PATCH v3 5/6] gnss: sirf: add a separate supply for a lna Andreas Kemnade
2019-01-22 18:03 ` Johan Hovold [this message]
2019-01-16 21:18 ` [PATCH v3 6/6] dt-bindings: gnss: add lna-supply property Andreas Kemnade
2019-01-17 15:58 ` Rob Herring
2019-01-22 18:11 ` Johan Hovold
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190122180321.GS3691@localhost \
--to=johan@kernel.org \
--cc=andreas@kemnade.info \
--cc=devicetree@vger.kernel.org \
--cc=letux-kernel@openphoenux.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).