From: Marc Kleine-Budde <mkl@pengutronix.de>
To: linux-can@vger.kernel.org
Cc: "Magnus Aagaard Sørensen" <mas@csselectronics.com>,
"Marc Kleine-Budde" <mkl@pengutronix.de>
Subject: [PATCH v2 2/3] can: mcp251xfd: mcp251xfd_chip_timestamp_init():
Date: Fri, 16 Oct 2020 22:52:10 +0200 [thread overview]
Message-ID: <20201016205211.1141590-3-mkl@pengutronix.de> (raw)
In-Reply-To: <20201016205211.1141590-1-mkl@pengutronix.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
index c36f5f14d50c..b8304b7096d1 100644
--- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
+++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c
@@ -665,10 +665,11 @@ static int mcp251xfd_chip_clock_init(const struct mcp251xfd_priv *priv)
osc = MCP251XFD_REG_OSC_LPMEN |
FIELD_PREP(MCP251XFD_REG_OSC_CLKODIV_MASK,
MCP251XFD_REG_OSC_CLKODIV_10);
- err = regmap_write(priv->map_reg, MCP251XFD_REG_OSC, osc);
- if (err)
- return err;
+ return regmap_write(priv->map_reg, MCP251XFD_REG_OSC, osc);
+}
+static int mcp251xfd_chip_timestamp_init(const struct mcp251xfd_priv *priv)
+{
/* Set Time Base Counter Prescaler to 1.
*
* This means an overflow of the 32 bit Time Base Counter
@@ -1038,6 +1039,10 @@ static int mcp251xfd_chip_start(struct mcp251xfd_priv *priv)
if (err)
goto out_chip_stop;
+ err = mcp251xfd_chip_timestamp_init(priv);
+ if (err)
+ goto out_chip_stop;
+
err = mcp251xfd_set_bittiming(priv);
if (err)
goto out_chip_stop;
--
2.28.0
next prev parent reply other threads:[~2020-10-16 20:52 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-16 20:52 [PATCH v2 0/3] can: mcp251xfd: PLL support Marc Kleine-Budde
2020-10-16 20:52 ` [PATCH v2 1/3] can: mcp251xfd: mcp251xfd_chip_wake(): renamed from mcp251xfd_chip_clock_enable() Marc Kleine-Budde
2020-10-19 5:23 ` Magnus Aagaard Sørensen
2020-10-26 9:50 ` Thomas.Kopp
2020-10-26 10:31 ` Marc Kleine-Budde
2020-10-16 20:52 ` Marc Kleine-Budde [this message]
2020-10-16 20:52 ` [PATCH v2 3/3] can: mcp251xfd: add support for internal PLL Marc Kleine-Budde
2020-10-19 5:23 ` Magnus Aagaard Sørensen
2020-10-16 20:55 ` [PATCH v2 0/3] can: mcp251xfd: PLL support Marc Kleine-Budde
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=20201016205211.1141590-3-mkl@pengutronix.de \
--to=mkl@pengutronix.de \
--cc=linux-can@vger.kernel.org \
--cc=mas@csselectronics.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.