summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDuy Nguyen <duy.nguyen.rh@renesas.com>2025-09-18 07:03:45 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-10-12 12:57:17 +0200
commit4a918985a35f616af634abb994be25cb528907d2 (patch)
treed0ac210f8f26b708aa4d8ed6e735410663751104 /drivers
parent1d2ef21f02baff0c109ad78b9e835fb4acb14533 (diff)
downloadlinux-4a918985a35f616af634abb994be25cb528907d2.tar.gz
linux-4a918985a35f616af634abb994be25cb528907d2.tar.bz2
linux-4a918985a35f616af634abb994be25cb528907d2.zip
can: rcar_canfd: Fix controller mode setting
[ Upstream commit 5cff263606a10102a0ea19ff579eaa18fd5577ad ] Driver configures register to choose controller mode before setting all channels to reset mode leading to failure. The patch corrects operation of mode setting. Signed-off-by: Duy Nguyen <duy.nguyen.rh@renesas.com> Signed-off-by: Tranh Ha <tranh.ha.xb@renesas.com> Link: https://patch.msgid.link/TYWPR01MB87434739F83E27EDCD23DF44B416A@TYWPR01MB8743.jpnprd01.prod.outlook.com Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/can/rcar/rcar_canfd.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c
index aa3df0d05b85..24dd15c91722 100644
--- a/drivers/net/can/rcar/rcar_canfd.c
+++ b/drivers/net/can/rcar/rcar_canfd.c
@@ -732,9 +732,6 @@ static int rcar_canfd_reset_controller(struct rcar_canfd_global *gpriv)
/* Reset Global error flags */
rcar_canfd_write(gpriv->base, RCANFD_GERFL, 0x0);
- /* Set the controller into appropriate mode */
- rcar_canfd_set_mode(gpriv);
-
/* Transition all Channels to reset mode */
for_each_set_bit(ch, &gpriv->channels_mask, gpriv->info->max_channels) {
rcar_canfd_clear_bit(gpriv->base,
@@ -754,6 +751,10 @@ static int rcar_canfd_reset_controller(struct rcar_canfd_global *gpriv)
return err;
}
}
+
+ /* Set the controller into appropriate mode */
+ rcar_canfd_set_mode(gpriv);
+
return 0;
}