All of lore.kernel.org
 help / color / mirror / Atom feed
From: linus.walleij@linaro.org (Linus Walleij)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 11/13] coresight: funnel: retrieve and handle atclk
Date: Fri, 17 Apr 2015 10:58:58 +0200	[thread overview]
Message-ID: <1429261140-13910-12-git-send-email-linus.walleij@linaro.org> (raw)
In-Reply-To: <1429261140-13910-1-git-send-email-linus.walleij@linaro.org>

As can be seen from the datasheet of the CoreSight
Components, DDI0314 table A-6 the funnel has a clock signal
apart from the AHB interconnect ("amba_pclk", that we're
already handling) called ATCLK, ARM Trace Clock, that SoC
implementers may provide from an entirely different clock
source. So to model this correctly create an optional
path for handling ATCLK alongside the PCLK so we don't
break old platforms that only define PCLK ("amba_pclk") but
still makes it possible for SoCs that have both clock signals
(such as the DB8500) to fetch and prepare/enable/disable/
unprepare both clocks.

The ATCLK is enabled and disabled using the runtime PM
callbacks.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
 drivers/coresight/coresight-funnel.c | 39 ++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/drivers/coresight/coresight-funnel.c b/drivers/coresight/coresight-funnel.c
index 330de2c88759..36c14ca4b916 100644
--- a/drivers/coresight/coresight-funnel.c
+++ b/drivers/coresight/coresight-funnel.c
@@ -21,6 +21,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/coresight.h>
 #include <linux/amba/bus.h>
+#include <linux/clk.h>
 
 #include "coresight-priv.h"
 
@@ -35,12 +36,14 @@
  * struct funnel_drvdata - specifics associated to a funnel component
  * @base:	memory mapped base address for this component.
  * @dev:	the device entity associated to this component.
+ * @atclk:	optional clock for the core parts of the funnel.
  * @csdev:	component vitals needed by the framework.
  * @priority:	port selection order.
  */
 struct funnel_drvdata {
 	void __iomem		*base;
 	struct device		*dev;
+	struct clk		*atclk;
 	struct coresight_device	*csdev;
 	unsigned long		priority;
 };
@@ -168,6 +171,7 @@ ATTRIBUTE_GROUPS(coresight_funnel);
 
 static int funnel_probe(struct amba_device *adev, const struct amba_id *id)
 {
+	int ret;
 	void __iomem *base;
 	struct device *dev = &adev->dev;
 	struct coresight_platform_data *pdata = NULL;
@@ -188,6 +192,12 @@ static int funnel_probe(struct amba_device *adev, const struct amba_id *id)
 		return -ENOMEM;
 
 	drvdata->dev = &adev->dev;
+	drvdata->atclk = devm_clk_get(&adev->dev, "atclk"); /* optional */
+	if (!IS_ERR(drvdata->atclk)) {
+		ret = clk_prepare_enable(drvdata->atclk);
+		if (ret)
+			return ret;
+	}
 	dev_set_drvdata(dev, drvdata);
 
 	/* Validity for the resource is already checked by the AMBA core */
@@ -224,6 +234,34 @@ static int funnel_remove(struct amba_device *adev)
 	return 0;
 }
 
+#ifdef CONFIG_PM
+static int funnel_runtime_suspend(struct device *dev)
+{
+	struct amba_device *adev = to_amba_device(dev);
+	struct funnel_drvdata *drvdata = amba_get_drvdata(adev);
+
+	if (drvdata && !IS_ERR(drvdata->atclk))
+		clk_disable_unprepare(drvdata->atclk);
+
+	return 0;
+}
+
+static int funnel_runtime_resume(struct device *dev)
+{
+	struct amba_device *adev = to_amba_device(dev);
+	struct funnel_drvdata *drvdata = amba_get_drvdata(adev);
+
+	if (drvdata && !IS_ERR(drvdata->atclk))
+		clk_prepare_enable(drvdata->atclk);
+
+	return 0;
+}
+#endif
+
+static const struct dev_pm_ops funnel_dev_pm_ops = {
+	SET_RUNTIME_PM_OPS(funnel_runtime_suspend, funnel_runtime_resume, NULL)
+};
+
 static struct amba_id funnel_ids[] = {
 	{
 		.id     = 0x0003b908,
@@ -236,6 +274,7 @@ static struct amba_driver funnel_driver = {
 	.drv = {
 		.name	= "coresight-funnel",
 		.owner	= THIS_MODULE,
+		.pm	= &funnel_dev_pm_ops,
 	},
 	.probe		= funnel_probe,
 	.remove		= funnel_remove,
-- 
1.9.3

  parent reply	other threads:[~2015-04-17  8:58 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-17  8:58 [PATCH 00/13] Enable CoreSight for the Ux500 Linus Walleij
2015-04-17  8:58 ` [PATCH 01/13] coresight: etm: print what version of ETM/PTM is detected Linus Walleij
2015-04-17  8:58 ` [PATCH 02/13] coresight: support the TPIU version found in Ux500 Linus Walleij
2015-04-17  8:58 ` [PATCH 03/13] coresight: etm: let runtime PM handle core clock Linus Walleij
2015-04-17  9:06   ` Ulf Hansson
2015-04-17  8:58 ` [PATCH 04/13] coresight: tpiu: " Linus Walleij
2015-04-17  9:07   ` Ulf Hansson
2015-04-17  8:58 ` [PATCH 05/13] coresight: etb: " Linus Walleij
2015-04-17  9:08   ` Ulf Hansson
2015-04-17  8:58 ` [PATCH 06/13] coresight: funnel: " Linus Walleij
2015-04-17  9:09   ` Ulf Hansson
2015-04-17  8:58 ` [PATCH 07/13] coresight: tmc: " Linus Walleij
2015-04-17  9:10   ` Ulf Hansson
2015-04-17  8:58 ` [PATCH 08/13] coresight: etm: retrieve and handle atclk Linus Walleij
2015-04-17  9:18   ` Ulf Hansson
2015-04-17  8:58 ` [PATCH 09/13] coresight: tpiu: " Linus Walleij
2015-04-17  9:20   ` Ulf Hansson
2015-04-17  8:58 ` [PATCH 10/13] coresight: etb: " Linus Walleij
2015-04-17  9:21   ` Ulf Hansson
2015-04-17  8:58 ` Linus Walleij [this message]
2015-04-17  9:21   ` [PATCH 11/13] coresight: funnel: " Ulf Hansson
2015-04-17  8:58 ` [PATCH 12/13] coresight: replicator: " Linus Walleij
2015-04-17  9:31   ` Ulf Hansson
2015-04-17  8:59 ` [PATCH 13/13] ARM: ux500: add CoreSight blocks to DTS file Linus Walleij
2015-04-17 15:41   ` Mathieu Poirier
2015-04-17 15:53 ` [PATCH 00/13] Enable CoreSight for the Ux500 Mathieu Poirier
2015-04-24 14:53 ` Ivan T. Ivanov
2015-04-24 15:31   ` Ulf Hansson
2015-04-24 19:40     ` Ivan T. Ivanov

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=1429261140-13910-12-git-send-email-linus.walleij@linaro.org \
    --to=linus.walleij@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    /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.