summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaibo Chen <haibo.chen@nxp.com>2025-03-14 19:01:45 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-03-28 21:59:00 +0100
commit0bd1486e4bb38d2a892077765286d7e62cc9a073 (patch)
tree8c9b8d27f37c026a8f7973120932ae4b6103c9a4
parent06ffbb4d9864ed1c8ad0bde986a9248cb6f4d248 (diff)
downloadlinux-0bd1486e4bb38d2a892077765286d7e62cc9a073.tar.gz
linux-0bd1486e4bb38d2a892077765286d7e62cc9a073.tar.bz2
linux-0bd1486e4bb38d2a892077765286d7e62cc9a073.zip
can: flexcan: disable transceiver during system PM
commit 5a19143124be42900b3fbc9ada3c919632eb45eb upstream. During system PM, if no wakeup requirement, disable transceiver to save power. Fixes: 4de349e786a3 ("can: flexcan: fix resume function") Cc: stable@vger.kernel.org Reviewed-by: Frank Li <frank.li@nxp.com> Signed-off-by: Haibo Chen <haibo.chen@nxp.com> Link: https://patch.msgid.link/20250314110145.899179-2-haibo.chen@nxp.com [mkl: add newlines] Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/can/flexcan/flexcan-core.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/net/can/flexcan/flexcan-core.c b/drivers/net/can/flexcan/flexcan-core.c
index 0e7704c41801..c25ecf608335 100644
--- a/drivers/net/can/flexcan/flexcan-core.c
+++ b/drivers/net/can/flexcan/flexcan-core.c
@@ -2230,6 +2230,10 @@ static int __maybe_unused flexcan_suspend(struct device *device)
flexcan_chip_interrupts_disable(dev);
+ err = flexcan_transceiver_disable(priv);
+ if (err)
+ return err;
+
err = pinctrl_pm_select_sleep_state(device);
if (err)
return err;
@@ -2262,10 +2266,16 @@ static int __maybe_unused flexcan_resume(struct device *device)
if (err)
return err;
- err = flexcan_chip_start(dev);
+ err = flexcan_transceiver_enable(priv);
if (err)
return err;
+ err = flexcan_chip_start(dev);
+ if (err) {
+ flexcan_transceiver_disable(priv);
+ return err;
+ }
+
flexcan_chip_interrupts_enable(dev);
}