From: Shengjiu Wang <shengjiu.wang@nxp.com>
To: abelvesa@kernel.org, peng.fan@nxp.com, mturquette@baylibre.com,
sboyd@kernel.org, robh@kernel.org, krzk+dt@kernel.org,
conor+dt@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de,
kernel@pengutronix.de, festevam@gmail.com, marex@denx.de,
imx@lists.linux.dev, shengjiu.wang@gmail.com
Cc: linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org
Subject: [PATCH 2/4] clk: imx: clk-audiomix: Add reset controller
Date: Mon, 6 May 2024 11:49:17 +0800 [thread overview]
Message-ID: <1714967359-27905-3-git-send-email-shengjiu.wang@nxp.com> (raw)
In-Reply-To: <1714967359-27905-1-git-send-email-shengjiu.wang@nxp.com>
Audiomix block control can be a reset controller for
Enhanced Audio Return Channel (eARC).
The eARC PHY software reset and eARC controller software
reset can be supported.
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
---
drivers/clk/imx/clk-imx8mp-audiomix.c | 82 +++++++++++++++++++++++++++
1 file changed, 82 insertions(+)
diff --git a/drivers/clk/imx/clk-imx8mp-audiomix.c b/drivers/clk/imx/clk-imx8mp-audiomix.c
index ae2c0f254225..58630b521e67 100644
--- a/drivers/clk/imx/clk-imx8mp-audiomix.c
+++ b/drivers/clk/imx/clk-imx8mp-audiomix.c
@@ -14,6 +14,7 @@
#include <linux/of.h>
#include <linux/platform_device.h>
#include <linux/pm_runtime.h>
+#include <linux/reset-controller.h>
#include <dt-bindings/clock/imx8mp-clock.h>
@@ -36,6 +37,8 @@
#define SAI_PLL_MNIT_CTL 0x410
#define IPG_LP_CTRL 0x504
+#define EARC_RESET_MASK 0x3
+
#define SAIn_MCLK1_PARENT(n) \
static const struct clk_parent_data \
clk_imx8mp_audiomix_sai##n##_mclk1_parents[] = { \
@@ -213,6 +216,7 @@ static const u16 audiomix_regs[] = {
struct clk_imx8mp_audiomix_priv {
void __iomem *base;
u32 regs_save[ARRAY_SIZE(audiomix_regs)];
+ struct reset_controller_dev rcdev;
/* Must be last */
struct clk_hw_onecell_data clk_data;
@@ -233,6 +237,80 @@ static void clk_imx8mp_audiomix_save_restore(struct device *dev, bool save)
}
}
+static int clk_imx8mp_audiomix_reset_set(struct reset_controller_dev *rcdev,
+ unsigned long id, bool assert)
+{
+ struct clk_imx8mp_audiomix_priv *drvdata = container_of(rcdev,
+ struct clk_imx8mp_audiomix_priv, rcdev);
+ unsigned int mask = BIT(id);
+ u32 reg;
+
+ pm_runtime_get_sync(rcdev->dev);
+
+ /* bit = 0 reset, bit = 1 unreset */
+ reg = readl(drvdata->base + EARC);
+ if (assert)
+ writel(reg & ~mask, drvdata->base + EARC);
+ else
+ writel(reg | mask, drvdata->base + EARC);
+
+ pm_runtime_put_sync(rcdev->dev);
+
+ return 0;
+}
+
+static int clk_imx8mp_audiomix_reset_reset(struct reset_controller_dev *rcdev,
+ unsigned long id)
+{
+ clk_imx8mp_audiomix_reset_set(rcdev, id, true);
+
+ return clk_imx8mp_audiomix_reset_set(rcdev, id, false);
+}
+
+static int clk_imx8mp_audiomix_reset_assert(struct reset_controller_dev *rcdev,
+ unsigned long id)
+{
+ return clk_imx8mp_audiomix_reset_set(rcdev, id, true);
+}
+
+static int clk_imx8mp_audiomix_reset_deassert(struct reset_controller_dev *rcdev,
+ unsigned long id)
+{
+ return clk_imx8mp_audiomix_reset_set(rcdev, id, false);
+}
+
+static int clk_imx8mp_audiomix_reset_xlate(struct reset_controller_dev *rcdev,
+ const struct of_phandle_args *reset_spec)
+{
+ unsigned long id = reset_spec->args[0];
+
+ if (!(BIT(id) & EARC_RESET_MASK))
+ return -EINVAL;
+
+ return id;
+}
+
+static const struct reset_control_ops clk_imx8mp_audiomix_reset_ops = {
+ .reset = clk_imx8mp_audiomix_reset_reset,
+ .assert = clk_imx8mp_audiomix_reset_assert,
+ .deassert = clk_imx8mp_audiomix_reset_deassert,
+};
+
+static int clk_imx8mp_audiomix_register_reset_controller(struct device *dev)
+{
+ struct clk_imx8mp_audiomix_priv *drvdata = dev_get_drvdata(dev);
+
+ drvdata->rcdev.owner = THIS_MODULE;
+ drvdata->rcdev.nr_resets = fls(EARC_RESET_MASK);
+ drvdata->rcdev.ops = &clk_imx8mp_audiomix_reset_ops;
+ drvdata->rcdev.of_node = dev->of_node;
+ drvdata->rcdev.dev = dev;
+ drvdata->rcdev.of_reset_n_cells = 1;
+ drvdata->rcdev.of_xlate = clk_imx8mp_audiomix_reset_xlate;
+
+ return devm_reset_controller_register(dev, &drvdata->rcdev);
+}
+
static int clk_imx8mp_audiomix_probe(struct platform_device *pdev)
{
struct clk_imx8mp_audiomix_priv *priv;
@@ -338,6 +416,10 @@ static int clk_imx8mp_audiomix_probe(struct platform_device *pdev)
if (ret)
goto err_clk_register;
+ ret = clk_imx8mp_audiomix_register_reset_controller(dev);
+ if (ret)
+ goto err_clk_register;
+
pm_runtime_put_sync(dev);
return 0;
--
2.34.1
next prev parent reply other threads:[~2024-05-06 4:17 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-06 3:49 [PATCH 0/4] clk: imx: clk-audiomix: Improvement for audiomix Shengjiu Wang
2024-05-06 3:49 ` [PATCH 1/4] dt-bindings: clock: imx8mp: Add #reset-cells property Shengjiu Wang
2024-05-06 6:23 ` Krzysztof Kozlowski
2024-05-06 6:50 ` Shengjiu Wang
2024-05-06 3:49 ` Shengjiu Wang [this message]
2024-05-06 3:49 ` [PATCH 3/4] clk: imx: clk-audiomix: Add CLK_SET_RATE_PARENT flags for clocks Shengjiu Wang
2024-05-06 3:49 ` [PATCH 4/4] clk: imx: clk-audiomix: Corrent parent clock for earc_phy and audpll Shengjiu Wang
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=1714967359-27905-3-git-send-email-shengjiu.wang@nxp.com \
--to=shengjiu.wang@nxp.com \
--cc=abelvesa@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=imx@lists.linux.dev \
--cc=kernel@pengutronix.de \
--cc=krzk+dt@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marex@denx.de \
--cc=mturquette@baylibre.com \
--cc=peng.fan@nxp.com \
--cc=robh@kernel.org \
--cc=s.hauer@pengutronix.de \
--cc=sboyd@kernel.org \
--cc=shawnguo@kernel.org \
--cc=shengjiu.wang@gmail.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
all inboxes | Powered by JetHome®