From: "Andreas Färber" <afaerber@suse.de>
To: linux-lpwan@lists.infradead.org
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
"Andreas Färber" <afaerber@suse.de>,
"Ben Whitten" <ben.whitten@gmail.com>,
"David S. Miller" <davem@davemloft.net>
Subject: [PATCH lora-next 05/11] net: lora: sx130x: Fix regmap field toggles
Date: Sun, 6 Jan 2019 09:37:48 +0100 [thread overview]
Message-ID: <20190106083754.6004-6-afaerber@suse.de> (raw)
In-Reply-To: <20190106083754.6004-1-afaerber@suse.de>
When toggling the value of a regmap field, such as for F_RADIO_RST or
F_EMERGENCY_FORCE_HOST_CTRL, we need to ensure it gets written out.
Sadly the timing of the writes got lost in the regmap field conversion.
Introduce an sx130x_field_force_write() helper for this.
While at it, make trivial sx130x_field_write() static inline, too.
Cc: Ben Whitten <ben.whitten@gmail.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
drivers/net/lora/sx130x.c | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/net/lora/sx130x.c b/drivers/net/lora/sx130x.c
index 4ba02836a35d..457f2396d9ee 100644
--- a/drivers/net/lora/sx130x.c
+++ b/drivers/net/lora/sx130x.c
@@ -174,12 +174,18 @@ const struct regmap_config sx130x_regmap_config = {
};
EXPORT_SYMBOL_GPL(sx130x_regmap_config);
-static int sx130x_field_write(struct sx130x_priv *priv,
+static inline int sx130x_field_write(struct sx130x_priv *priv,
enum sx130x_fields field_id, u8 val)
{
return regmap_field_write(priv->regmap_fields[field_id], val);
}
+static inline int sx130x_field_force_write(struct sx130x_priv *priv,
+ enum sx130x_fields field_id, u8 val)
+{
+ return regmap_field_force_write(priv->regmap_fields[field_id], val);
+}
+
static int sx130x_soft_reset(struct sx130x_priv *priv)
{
int ret;
@@ -373,7 +379,7 @@ static int sx130x_agc_calibrate(struct sx130x_priv *priv)
return -EIO;
}
- ret = sx130x_field_write(priv, F_EMERGENCY_FORCE_HOST_CTRL, 0);
+ ret = sx130x_field_force_write(priv, F_EMERGENCY_FORCE_HOST_CTRL, 0);
if (ret) {
dev_err(priv->dev, "emergency force failed\n");
return ret;
@@ -694,7 +700,7 @@ int sx130x_probe(struct device *dev)
msleep(500);
- ret = sx130x_field_write(priv, F_RADIO_RST, 1);
+ ret = sx130x_field_force_write(priv, F_RADIO_RST, 1);
if (ret) {
dev_err(dev, "radio assert reset failed (%d)\n", ret);
return ret;
--
2.16.4
next prev parent reply other threads:[~2019-01-06 8:37 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-06 8:37 [PATCH lora-next 00/11] net: lora: sx130x: Fixes for enabling regcache Andreas Färber
2019-01-06 8:37 ` [PATCH lora-next 01/11] net: lora: sx125x: Abort on wrong version Andreas Färber
2019-01-06 8:37 ` [PATCH lora-next 02/11] net: lora: sx130x: Fix error codes Andreas Färber
2019-01-06 8:37 ` [PATCH lora-next 03/11] net: lora: sx130x: Revert drop of sx1301_soft_reset() Andreas Färber
2019-01-06 8:37 ` [PATCH lora-next 04/11] net: lora: sx130x: Fix soft reset Andreas Färber
2019-01-06 8:37 ` Andreas Färber [this message]
2019-01-06 8:37 ` [PATCH lora-next 06/11] net: lora: sx130x: Force regmap field write before sleep Andreas Färber
2019-01-06 8:37 ` [PATCH lora-next 07/11] net: lora: sx130x: Force regmap field writes before function boundaries Andreas Färber
2019-01-06 8:37 ` [PATCH lora-next 08/11] net: lora: sx130x: Force regmap field write before reading status Andreas Färber
2019-01-06 8:37 ` [PATCH lora-next 09/11] net: lora: sx130x: Mark AGCSTS register as volatile Andreas Färber
2019-01-06 8:37 ` [PATCH lora-next 10/11] net: lora: sx130x: Mark MCU_CTRL " Andreas Färber
2019-01-06 8:37 ` [PATCH lora-next 11/11] net: lora: sx130x: Enable regmap caching Andreas Färber
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=20190106083754.6004-6-afaerber@suse.de \
--to=afaerber@suse.de \
--cc=ben.whitten@gmail.com \
--cc=davem@davemloft.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-lpwan@lists.infradead.org \
--cc=netdev@vger.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).