Commit 1a4abba6 authored by Marc Kleine-Budde's avatar Marc Kleine-Budde

can: mcp251xfd: mcp251xfd_chip_wake(): renamed from mcp251xfd_chip_clock_enable()

This patch renames mcp251xfd_chip_clock_enable() into mcp251xfd_chip_wake() as
this function actually wakes the chip. Additionally the documentation is
adopted.

Link: https://lore.kernel.org/all/20220207131047.282110-12-mkl@pengutronix.deCo-developed-by: default avatarMagnus Aagaard Sørensen <mas@csselectronics.com>
Signed-off-by: default avatarMagnus Aagaard Sørensen <mas@csselectronics.com>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent 14193ea2
...@@ -292,22 +292,23 @@ mcp251xfd_chip_wait_for_osc_ready(const struct mcp251xfd_priv *priv, ...@@ -292,22 +292,23 @@ mcp251xfd_chip_wait_for_osc_ready(const struct mcp251xfd_priv *priv,
return -ETIMEDOUT; return -ETIMEDOUT;
} }
static int mcp251xfd_chip_clock_enable(const struct mcp251xfd_priv *priv) static int mcp251xfd_chip_wake(const struct mcp251xfd_priv *priv)
{ {
u32 osc, osc_reference, osc_mask; u32 osc, osc_reference, osc_mask;
int err; int err;
/* Set Power On Defaults for "Clock Output Divisor" and remove /* For normal sleep on MCP2517FD and MCP2518FD, clearing
* "Oscillator Disable" bit. * "Oscillator Disable" will wake the chip. For low power mode
* on MCP2518FD, asserting the chip select will wake the
* chip. Writing to the Oscillator register will wake it in
* both cases.
*/ */
osc = FIELD_PREP(MCP251XFD_REG_OSC_CLKODIV_MASK, osc = FIELD_PREP(MCP251XFD_REG_OSC_CLKODIV_MASK,
MCP251XFD_REG_OSC_CLKODIV_10); MCP251XFD_REG_OSC_CLKODIV_10);
osc_reference = MCP251XFD_REG_OSC_OSCRDY; osc_reference = MCP251XFD_REG_OSC_OSCRDY;
osc_mask = MCP251XFD_REG_OSC_OSCRDY | MCP251XFD_REG_OSC_PLLRDY; osc_mask = MCP251XFD_REG_OSC_OSCRDY | MCP251XFD_REG_OSC_PLLRDY;
/* Note: /* If the controller is in Sleep Mode the following write only
*
* If the controller is in Sleep Mode the following write only
* removes the "Oscillator Disable" bit and powers it up. All * removes the "Oscillator Disable" bit and powers it up. All
* other bits are unaffected. * other bits are unaffected.
*/ */
...@@ -332,10 +333,10 @@ static int mcp251xfd_chip_softreset_do(const struct mcp251xfd_priv *priv) ...@@ -332,10 +333,10 @@ static int mcp251xfd_chip_softreset_do(const struct mcp251xfd_priv *priv)
const __be16 cmd = mcp251xfd_cmd_reset(); const __be16 cmd = mcp251xfd_cmd_reset();
int err; int err;
/* The Set Mode and SPI Reset command only seems to works if /* The Set Mode and SPI Reset command only works if the
* the controller is not in Sleep Mode. * controller is not in Sleep Mode.
*/ */
err = mcp251xfd_chip_clock_enable(priv); err = mcp251xfd_chip_wake(priv);
if (err) if (err)
return err; return err;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment