All of lore.kernel.org
 help / color / mirror / Atom feed
From: Puranjay Mohan <p-mohan@ti.com>
To: <linux-kernel@vger.kernel.org>
Cc: <bjorn.andersson@linaro.org>, <mathieu.poirier@linaro.org>,
	<krzysztof.kozlowski+dt@linaro.org>,
	<linux-remoteproc@vger.kernel.org>, <devicetree@vger.kernel.org>,
	<nm@ti.com>, <ssantosh@kernel.org>, <s-anna@ti.com>,
	<p-mohan@ti.com>, <linux-arm-kernel@lists.infradead.org>,
	<rogerq@kernel.org>, <grygorii.strashko@ti.com>,
	<vigneshr@ti.com>, <kishon@ti.com>, <robh@kernel.org>
Subject: [PATCH v4 6/6] remoteproc: pru: add support for configuring GPMUX based on client setup
Date: Fri, 3 Jun 2022 17:45:20 +0530	[thread overview]
Message-ID: <20220603121520.13730-7-p-mohan@ti.com> (raw)
In-Reply-To: <20220603121520.13730-1-p-mohan@ti.com>

From: Tero Kristo <t-kristo@ti.com>

Client device node property ti,pruss-gp-mux-sel can now be used to
configure the GPMUX config value for PRU.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
[s-anna@ti.com: simplify the pru id usage]
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Puranjay Mohan <p-mohan@ti.com>
---
 drivers/remoteproc/pru_rproc.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/drivers/remoteproc/pru_rproc.c b/drivers/remoteproc/pru_rproc.c
index 2977eb50631b..b532069fe259 100644
--- a/drivers/remoteproc/pru_rproc.c
+++ b/drivers/remoteproc/pru_rproc.c
@@ -123,6 +123,7 @@ struct pru_private_data {
  * @dbg_single_step: debug state variable to set PRU into single step mode
  * @dbg_continuous: debug state variable to restore PRU execution mode
  * @evt_count: number of mapped events
+ * @gpmux_save: saved value for gpmux config
  */
 struct pru_rproc {
 	int id;
@@ -141,6 +142,7 @@ struct pru_rproc {
 	u32 dbg_single_step;
 	u32 dbg_continuous;
 	u8 evt_count;
+	u8 gpmux_save;
 };
 
 static inline u32 pru_control_read_reg(struct pru_rproc *pru, unsigned int reg)
@@ -250,6 +252,7 @@ struct rproc *pru_rproc_get(struct device_node *np, int index,
 	struct device *dev;
 	const char *fw_name;
 	int ret;
+	u32 mux;
 
 	try_module_get(THIS_MODULE);
 
@@ -273,6 +276,22 @@ struct rproc *pru_rproc_get(struct device_node *np, int index,
 
 	mutex_unlock(&pru->lock);
 
+	ret = pruss_cfg_get_gpmux(pru->pruss, pru->id, &pru->gpmux_save);
+        if (ret) {
+                dev_err(dev, "failed to get cfg gpmux: %d\n", ret);
+                goto err;
+        }
+
+        ret = of_property_read_u32_index(np, "ti,pruss-gp-mux-sel", index,
+                                         &mux);
+        if (!ret) {
+                ret = pruss_cfg_set_gpmux(pru->pruss, pru->id, mux);
+                if (ret) {
+                        dev_err(dev, "failed to set cfg gpmux: %d\n", ret);
+                        goto err;
+                }
+        }
+
 	if (pru_id)
 		*pru_id = pru->id;
 
@@ -310,6 +329,7 @@ void pru_rproc_put(struct rproc *rproc)
 
 	pru = rproc->priv;
 
+	pruss_cfg_set_gpmux(pru->pruss, pru->id, pru->gpmux_save);
 	pru_rproc_set_firmware(rproc, NULL);
 
 	mutex_lock(&pru->lock);
-- 
2.17.1


WARNING: multiple messages have this Message-ID (diff)
From: Puranjay Mohan <p-mohan@ti.com>
To: <linux-kernel@vger.kernel.org>
Cc: nm@ti.com, devicetree@vger.kernel.org, grygorii.strashko@ti.com,
	vigneshr@ti.com, mathieu.poirier@linaro.org, kishon@ti.com,
	linux-remoteproc@vger.kernel.org, bjorn.andersson@linaro.org,
	rogerq@kernel.org, krzysztof.kozlowski+dt@linaro.org,
	ssantosh@kernel.org, p-mohan@ti.com, robh@kernel.org,
	linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 6/6] remoteproc: pru: add support for configuring GPMUX based on client setup
Date: Fri, 3 Jun 2022 17:45:20 +0530	[thread overview]
Message-ID: <20220603121520.13730-7-p-mohan@ti.com> (raw)
In-Reply-To: <20220603121520.13730-1-p-mohan@ti.com>

From: Tero Kristo <t-kristo@ti.com>

Client device node property ti,pruss-gp-mux-sel can now be used to
configure the GPMUX config value for PRU.

Signed-off-by: Tero Kristo <t-kristo@ti.com>
[s-anna@ti.com: simplify the pru id usage]
Signed-off-by: Suman Anna <s-anna@ti.com>
Signed-off-by: Puranjay Mohan <p-mohan@ti.com>
---
 drivers/remoteproc/pru_rproc.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/drivers/remoteproc/pru_rproc.c b/drivers/remoteproc/pru_rproc.c
index 2977eb50631b..b532069fe259 100644
--- a/drivers/remoteproc/pru_rproc.c
+++ b/drivers/remoteproc/pru_rproc.c
@@ -123,6 +123,7 @@ struct pru_private_data {
  * @dbg_single_step: debug state variable to set PRU into single step mode
  * @dbg_continuous: debug state variable to restore PRU execution mode
  * @evt_count: number of mapped events
+ * @gpmux_save: saved value for gpmux config
  */
 struct pru_rproc {
 	int id;
@@ -141,6 +142,7 @@ struct pru_rproc {
 	u32 dbg_single_step;
 	u32 dbg_continuous;
 	u8 evt_count;
+	u8 gpmux_save;
 };
 
 static inline u32 pru_control_read_reg(struct pru_rproc *pru, unsigned int reg)
@@ -250,6 +252,7 @@ struct rproc *pru_rproc_get(struct device_node *np, int index,
 	struct device *dev;
 	const char *fw_name;
 	int ret;
+	u32 mux;
 
 	try_module_get(THIS_MODULE);
 
@@ -273,6 +276,22 @@ struct rproc *pru_rproc_get(struct device_node *np, int index,
 
 	mutex_unlock(&pru->lock);
 
+	ret = pruss_cfg_get_gpmux(pru->pruss, pru->id, &pru->gpmux_save);
+        if (ret) {
+                dev_err(dev, "failed to get cfg gpmux: %d\n", ret);
+                goto err;
+        }
+
+        ret = of_property_read_u32_index(np, "ti,pruss-gp-mux-sel", index,
+                                         &mux);
+        if (!ret) {
+                ret = pruss_cfg_set_gpmux(pru->pruss, pru->id, mux);
+                if (ret) {
+                        dev_err(dev, "failed to set cfg gpmux: %d\n", ret);
+                        goto err;
+                }
+        }
+
 	if (pru_id)
 		*pru_id = pru->id;
 
@@ -310,6 +329,7 @@ void pru_rproc_put(struct rproc *rproc)
 
 	pru = rproc->priv;
 
+	pruss_cfg_set_gpmux(pru->pruss, pru->id, pru->gpmux_save);
 	pru_rproc_set_firmware(rproc, NULL);
 
 	mutex_lock(&pru->lock);
-- 
2.17.1


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2022-06-03 12:15 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-03 12:15 [PATCH v4 0/6] Introduce PRU remoteproc consumer API Puranjay Mohan
2022-06-03 12:15 ` Puranjay Mohan
2022-06-03 12:15 ` [PATCH v4 1/6] dt-bindings: remoteproc: Add PRU consumer bindings Puranjay Mohan
2022-06-03 12:15   ` Puranjay Mohan
2022-06-05 22:48   ` Rob Herring
2022-06-05 22:48     ` Rob Herring
2022-06-03 12:15 ` [PATCH v4 2/6] remoteproc: pru: Add APIs to get and put the PRU cores Puranjay Mohan
2022-06-03 12:15   ` Puranjay Mohan
2022-06-03 12:15 ` [PATCH v4 3/6] remoteproc: pru: Make sysfs entries read-only for PRU client driven boots Puranjay Mohan
2022-06-03 12:15   ` Puranjay Mohan
2022-06-03 12:15 ` [PATCH v4 4/6] remoteproc: pru: Add pru_rproc_set_ctable() function Puranjay Mohan
2022-06-03 12:15   ` Puranjay Mohan
2022-06-03 12:15 ` [PATCH v4 5/6] remoteproc: pru: Configure firmware based on client setup Puranjay Mohan
2022-06-03 12:15   ` Puranjay Mohan
2022-06-03 12:15 ` Puranjay Mohan [this message]
2022-06-03 12:15   ` [PATCH v4 6/6] remoteproc: pru: add support for configuring GPMUX " Puranjay Mohan
2022-06-06 15:56 ` [PATCH v4 0/6] Introduce PRU remoteproc consumer API Mathieu Poirier
2022-06-06 15:56   ` Mathieu Poirier
2022-06-06 16:15   ` Mathieu Poirier
2022-06-06 16:15     ` Mathieu Poirier
2022-06-07  5:03     ` Puranjay Mohan
2022-06-07  5:03       ` Puranjay Mohan

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=20220603121520.13730-7-p-mohan@ti.com \
    --to=p-mohan@ti.com \
    --cc=bjorn.andersson@linaro.org \
    --cc=devicetree@vger.kernel.org \
    --cc=grygorii.strashko@ti.com \
    --cc=kishon@ti.com \
    --cc=krzysztof.kozlowski+dt@linaro.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-remoteproc@vger.kernel.org \
    --cc=mathieu.poirier@linaro.org \
    --cc=nm@ti.com \
    --cc=robh@kernel.org \
    --cc=rogerq@kernel.org \
    --cc=s-anna@ti.com \
    --cc=ssantosh@kernel.org \
    --cc=vigneshr@ti.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 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.