From: Andreas Kemnade <andreas@kemnade.info>
To: letux-kernel@openphoenux.org, johan@kernel.org,
robh+dt@kernel.org, mark.rutland@arm.com,
devicetree@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Andreas Kemnade <andreas@kemnade.info>
Subject: [PATCH v4 4/5] gnss: sirf: add a separate supply for a lna
Date: Thu, 24 Jan 2019 07:34:38 +0100 [thread overview]
Message-ID: <20190124063439.29897-5-andreas@kemnade.info> (raw)
In-Reply-To: <20190124063439.29897-1-andreas@kemnade.info>
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 v4:
- cleaned up error checking
- was 5/6 earlier
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 | 58 +++++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 52 insertions(+), 6 deletions(-)
diff --git a/drivers/gnss/sirf.c b/drivers/gnss/sirf.c
index b42a383e26e0..bd6bd9a94c55 100644
--- a/drivers/gnss/sirf.c
+++ b/drivers/gnss/sirf.c
@@ -40,6 +40,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;
@@ -300,21 +301,60 @@ 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 ret2;
+ int ret;
+
+ if (data->on_off)
+ ret = sirf_set_active(data, false);
+ else
+ ret = regulator_disable(data->vcc);
+
+ if (ret)
+ return ret;
+
+ ret = regulator_disable(data->lna);
+ if (ret)
+ goto err_reenable;
+
+ return 0;
+
+err_reenable:
+ if (data->on_off)
+ ret2 = sirf_set_active(data, true);
+ else
+ ret2 = regulator_enable(data->vcc);
- if (!data->on_off)
- return regulator_disable(data->vcc);
+ if (ret2)
+ dev_err(dev,
+ "failed to reenable power on failed suspend: %d\n",
+ ret2);
- return sirf_set_active(data, false);
+ return ret;
}
static int sirf_runtime_resume(struct device *dev)
{
struct sirf_data *data = dev_get_drvdata(dev);
+ int ret;
- if (!data->on_off)
- return regulator_enable(data->vcc);
+ ret = regulator_enable(data->lna);
+ if (ret)
+ return ret;
+
+ if (data->on_off)
+ ret = sirf_set_active(data, true);
+ else
+ ret = regulator_enable(data->vcc);
+
+ if (ret)
+ goto err_disable_lna;
- return sirf_set_active(data, true);
+ return 0;
+
+err_disable_lna:
+ regulator_disable(data->lna);
+
+ return ret;
}
static int __maybe_unused sirf_suspend(struct device *dev)
@@ -402,6 +442,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))
--
2.11.0
next prev parent reply other threads:[~2019-01-24 6:35 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-24 6:34 [PATCH v4 0/5] gnss: sirf: add support for w2sg0004 + lna Andreas Kemnade
2019-01-24 6:34 ` [PATCH v4 1/5] gnss: sirf: write data to gnss only when the gnss device is open Andreas Kemnade
2019-01-24 6:34 ` [PATCH v4 2/5] gnss: sirf: add support for configurations without wakeup signal Andreas Kemnade
2019-01-25 14:31 ` Johan Hovold
2019-01-24 6:34 ` [PATCH v4 3/5] dt-bindings: gnss: add w2sg0004 compatible string Andreas Kemnade
2019-01-24 6:34 ` Andreas Kemnade [this message]
2019-01-24 6:34 ` [PATCH v4 5/5] dt-bindings: gnss: add lna-supply property Andreas Kemnade
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=20190124063439.29897-5-andreas@kemnade.info \
--to=andreas@kemnade.info \
--cc=devicetree@vger.kernel.org \
--cc=johan@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).