From: Faiz Abbas <faiz_abbas@ti.com>
To: <wg@grandegger.com>, <mkl@pengutronix.de>, <robh+dt@kernel.org>,
<mark.rutland@arm.com>
Cc: <linux-can@vger.kernel.org>, <netdev@vger.kernel.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<faiz_abbas@ti.com>, <nsekhar@ti.com>, <fcooper@ti.com>,
<robh@kernel.org>, <Wenyou.Yang@microchip.com>,
<sergei.shtylyov@cogentembedded.com>
Subject: [PATCH v6 3/6] can: m_can: Add PM Runtime
Date: Fri, 22 Dec 2017 19:01:25 +0530 [thread overview]
Message-ID: <1513949488-13026-4-git-send-email-faiz_abbas@ti.com> (raw)
In-Reply-To: <1513949488-13026-1-git-send-email-faiz_abbas@ti.com>
From: Franklin S Cooper Jr <fcooper@ti.com>
Add support for PM Runtime which is the new way to handle managing clocks.
However, to avoid breaking SoCs not using PM_RUNTIME leave the old clk
management approach in place.
PM_RUNTIME is required by OMAP based devices to handle clock management.
Therefore, this allows future Texas Instruments SoCs that have the MCAN IP
to work with this driver.
Signed-off-by: Franklin S Cooper Jr <fcooper@ti.com>
[nsekhar@ti.com: handle pm_runtime_get_sync() failure, fix some bugs]
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
---
drivers/net/can/m_can/m_can.c | 38 ++++++++++++++++++++++++++++++++++----
1 file changed, 34 insertions(+), 4 deletions(-)
diff --git a/drivers/net/can/m_can/m_can.c b/drivers/net/can/m_can/m_can.c
index f72116e..53e764f 100644
--- a/drivers/net/can/m_can/m_can.c
+++ b/drivers/net/can/m_can/m_can.c
@@ -23,6 +23,7 @@
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/platform_device.h>
+#include <linux/pm_runtime.h>
#include <linux/iopoll.h>
#include <linux/can/dev.h>
@@ -625,19 +626,33 @@ static int m_can_clk_start(struct m_can_priv *priv)
{
int err;
+ err = pm_runtime_get_sync(priv->device);
+ if (err) {
+ pm_runtime_put_noidle(priv->device);
+ return err;
+ }
+
err = clk_prepare_enable(priv->hclk);
if (err)
- return err;
+ goto pm_runtime_put;
err = clk_prepare_enable(priv->cclk);
if (err)
- clk_disable_unprepare(priv->hclk);
+ goto disable_hclk;
return err;
+
+disable_hclk:
+ clk_disable_unprepare(priv->hclk);
+pm_runtime_put:
+ pm_runtime_put_sync(priv->device);
+ return err;
}
static void m_can_clk_stop(struct m_can_priv *priv)
{
+ pm_runtime_put_sync(priv->device);
+
clk_disable_unprepare(priv->cclk);
clk_disable_unprepare(priv->hclk);
}
@@ -1577,13 +1592,20 @@ static int m_can_plat_probe(struct platform_device *pdev)
/* Enable clocks. Necessary to read Core Release in order to determine
* M_CAN version
*/
+ pm_runtime_enable(&pdev->dev);
+ ret = pm_runtime_get_sync(&pdev->dev);
+ if (ret) {
+ pm_runtime_put_noidle(&pdev->dev);
+ goto pm_runtime_fail;
+ }
+
ret = clk_prepare_enable(hclk);
if (ret)
- goto disable_hclk_ret;
+ goto pm_runtime_put;
ret = clk_prepare_enable(cclk);
if (ret)
- goto disable_cclk_ret;
+ goto disable_hclk_ret;
res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "m_can");
addr = devm_ioremap_resource(&pdev->dev, res);
@@ -1666,6 +1688,11 @@ static int m_can_plat_probe(struct platform_device *pdev)
clk_disable_unprepare(cclk);
disable_hclk_ret:
clk_disable_unprepare(hclk);
+pm_runtime_put:
+ pm_runtime_put_sync(&pdev->dev);
+pm_runtime_fail:
+ if (ret)
+ pm_runtime_disable(&pdev->dev);
failed_ret:
return ret;
}
@@ -1723,6 +1750,9 @@ static int m_can_plat_remove(struct platform_device *pdev)
struct net_device *dev = platform_get_drvdata(pdev);
unregister_m_can_dev(dev);
+
+ pm_runtime_disable(&pdev->dev);
+
platform_set_drvdata(pdev, NULL);
free_m_can_dev(dev);
--
2.7.4
next prev parent reply other threads:[~2017-12-22 13:31 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-22 13:31 [PATCH v6 0/6] Add M_CAN Support for Dra76 platform Faiz Abbas
2017-12-22 13:31 ` [PATCH v6 1/6] can: dev: Add support for limiting configured bitrate Faiz Abbas
2018-01-02 13:00 ` Marc Kleine-Budde
2018-01-03 12:19 ` Faiz Abbas
2018-01-02 16:15 ` Marc Kleine-Budde
2018-01-03 12:21 ` Faiz Abbas
2017-12-22 13:31 ` [PATCH v6 2/6] can: m_can: Add call to of_can_transceiver Faiz Abbas
2017-12-22 13:31 ` Faiz Abbas [this message]
2018-01-02 16:07 ` [PATCH v6 3/6] can: m_can: Add PM Runtime Marc Kleine-Budde
2018-01-03 12:39 ` Faiz Abbas
2018-01-03 14:25 ` Marc Kleine-Budde
2018-01-03 15:06 ` Faiz Abbas
2018-01-03 15:17 ` Marc Kleine-Budde
2018-01-04 15:17 ` Faiz Abbas
2018-01-04 15:18 ` Marc Kleine-Budde
2018-01-05 1:23 ` Yang, Wenyou
2017-12-22 13:31 ` [PATCH v6 4/6] can: m_can: Support higher speed CAN-FD bitrates Faiz Abbas
2018-01-02 13:35 ` Marc Kleine-Budde
2018-01-03 12:55 ` Faiz Abbas
2017-12-22 13:31 ` [PATCH v6 5/6] dt-bindings: can: m_can: Document new can transceiver binding Faiz Abbas
2017-12-22 13:31 ` [PATCH v6 6/6] dt-bindings: can: can-transceiver: Document new binding Faiz Abbas
2017-12-29 3:38 ` [PATCH v6 0/6] Add M_CAN Support for Dra76 platform Yang, Wenyou
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=1513949488-13026-4-git-send-email-faiz_abbas@ti.com \
--to=faiz_abbas@ti.com \
--cc=Wenyou.Yang@microchip.com \
--cc=devicetree@vger.kernel.org \
--cc=fcooper@ti.com \
--cc=linux-can@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mkl@pengutronix.de \
--cc=netdev@vger.kernel.org \
--cc=nsekhar@ti.com \
--cc=robh+dt@kernel.org \
--cc=robh@kernel.org \
--cc=sergei.shtylyov@cogentembedded.com \
--cc=wg@grandegger.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 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).