From: Peng Fan <peng.fan@oss.nxp.com>
To: Marek Vasut <marex@denx.de>
Cc: linux-clk@vger.kernel.org, Conor Dooley <conor+dt@kernel.org>,
Fabio Estevam <festevam@gmail.com>,
Jaroslav Kysela <perex@perex.cz>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>,
Michael Turquette <mturquette@baylibre.com>,
Michael Walle <michael@walle.cc>,
Nicolin Chen <nicoleotsuka@gmail.com>,
Rob Herring <robh@kernel.org>,
Shengjiu Wang <shengjiu.wang@gmail.com>,
Stephen Boyd <sboyd@kernel.org>, Takashi Iwai <tiwai@suse.com>,
Xiubo Li <Xiubo.Lee@gmail.com>,
devicetree@vger.kernel.org, linux-sound@vger.kernel.org
Subject: Re: [PATCH v2 4/4] clk: fsl-sai: Add MCLK generation support
Date: Mon, 30 Dec 2024 09:28:36 +0800 [thread overview]
Message-ID: <20241230012836.GC28662@localhost.localdomain> (raw)
In-Reply-To: <20241226162234.40141-4-marex@denx.de>
On Thu, Dec 26, 2024 at 05:22:24PM +0100, Marek Vasut wrote:
>The driver currently supports generating BCLK. There are systems which
>require generation of MCLK instead. Register new MCLK clock and handle
>clock-cells = <1> to differentiate between BCLK and MCLK. In case of a
>legacy system with clock-cells = <0>, the driver behaves as before, i.e.
>always returns BCLK.
>
>Signed-off-by: Marek Vasut <marex@denx.de>
>---
>Cc: Conor Dooley <conor+dt@kernel.org>
>Cc: Fabio Estevam <festevam@gmail.com>
>Cc: Jaroslav Kysela <perex@perex.cz>
>Cc: Krzysztof Kozlowski <krzk+dt@kernel.org>
>Cc: Liam Girdwood <lgirdwood@gmail.com>
>Cc: Mark Brown <broonie@kernel.org>
>Cc: Michael Turquette <mturquette@baylibre.com>
>Cc: Michael Walle <michael@walle.cc>
>Cc: Nicolin Chen <nicoleotsuka@gmail.com>
>Cc: Rob Herring <robh@kernel.org>
>Cc: Shengjiu Wang <shengjiu.wang@gmail.com>
>Cc: Stephen Boyd <sboyd@kernel.org>
>Cc: Takashi Iwai <tiwai@suse.com>
>Cc: Xiubo Li <Xiubo.Lee@gmail.com>
>Cc: devicetree@vger.kernel.org
>Cc: linux-clk@vger.kernel.org
>Cc: linux-sound@vger.kernel.org
>---
>V2: No change
>---
> drivers/clk/clk-fsl-sai.c | 81 ++++++++++++++++++++++++++++++++-------
> 1 file changed, 67 insertions(+), 14 deletions(-)
>
>diff --git a/drivers/clk/clk-fsl-sai.c b/drivers/clk/clk-fsl-sai.c
>index 628e53a3a26fa..0f8e2f2662d87 100644
>--- a/drivers/clk/clk-fsl-sai.c
>+++ b/drivers/clk/clk-fsl-sai.c
>@@ -7,6 +7,7 @@
>
> #include <linux/module.h>
> #include <linux/platform_device.h>
>+#include <linux/clk.h>
> #include <linux/clk-provider.h>
> #include <linux/err.h>
> #include <linux/of.h>
>@@ -15,27 +16,44 @@
>
> #define I2S_CSR 0x00
> #define I2S_CR2 0x08
>+#define I2S_MCR 0x100
> #define CSR_BCE_BIT 28
>+#define CSR_TE_BIT 31
> #define CR2_BCD BIT(24)
> #define CR2_DIV_SHIFT 0
> #define CR2_DIV_WIDTH 8
>+#define MCR_MOE BIT(30)
>
> struct fsl_sai_clk {
>- struct clk_divider div;
>- struct clk_gate gate;
>+ struct clk_divider bclk_div;
>+ struct clk_divider mclk_div;
>+ struct clk_gate bclk_gate;
>+ struct clk_gate mclk_gate;
>+ struct clk_hw *bclk_hw;
>+ struct clk_hw *mclk_hw;
> spinlock_t lock;
> };
>
> struct fsl_sai_data {
> unsigned int offset; /* Register offset */
>+ bool have_mclk; /* Have MCLK control */
> };
>
>+static struct clk_hw *
>+fsl_sai_of_clk_get(struct of_phandle_args *clkspec, void *data)
>+{
>+ struct fsl_sai_clk *sai_clk = data;
>+
>+ return clkspec->args[0] ? sai_clk->mclk_hw : sai_clk->bclk_hw;
>+}
>+
> static int fsl_sai_clk_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> const struct fsl_sai_data *data = device_get_match_data(dev);
>- struct fsl_sai_clk *sai_clk;
> struct clk_parent_data pdata = { .index = 0 };
>+ struct fsl_sai_clk *sai_clk;
>+ struct clk *clk_bus;
> void __iomem *base;
> struct clk_hw *hw;
>
>@@ -47,39 +65,74 @@ static int fsl_sai_clk_probe(struct platform_device *pdev)
> if (IS_ERR(base))
> return PTR_ERR(base);
>
>+ clk_bus = devm_clk_get_enabled(dev, "bus");
>+ if (IS_ERR(clk_bus))
>+ return PTR_ERR(clk_bus);
>+
This only applies to i.MX?
> spin_lock_init(&sai_clk->lock);
>
Regards,
Peng
next prev parent reply other threads:[~2024-12-30 0:22 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-26 16:22 [PATCH v2 1/4] dt-bindings: clock: fsl-sai: Document i.MX8M support Marek Vasut
2024-12-26 16:22 ` [PATCH v2 2/4] clk: fsl-sai: Add i.MX8M support with 8 byte register offset Marek Vasut
2024-12-30 1:24 ` Peng Fan
2024-12-26 16:22 ` [PATCH v2 3/4] dt-bindings: clock: fsl-sai: Document clock-cells = <1> support Marek Vasut
2024-12-27 17:50 ` Conor Dooley
2024-12-26 16:22 ` [PATCH v2 4/4] clk: fsl-sai: Add MCLK generation support Marek Vasut
2024-12-30 1:28 ` Peng Fan [this message]
2024-12-30 0:47 ` Marek Vasut
2024-12-30 7:51 ` Michael Walle
2024-12-30 22:18 ` Marek Vasut
2025-01-02 9:58 ` Michael Walle
2025-01-02 13:34 ` Marek Vasut
2025-01-07 8:52 ` Michael Walle
2024-12-27 17:51 ` [PATCH v2 1/4] dt-bindings: clock: fsl-sai: Document i.MX8M support Conor Dooley
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=20241230012836.GC28662@localhost.localdomain \
--to=peng.fan@oss.nxp.com \
--cc=Xiubo.Lee@gmail.com \
--cc=broonie@kernel.org \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=festevam@gmail.com \
--cc=krzk+dt@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-clk@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=marex@denx.de \
--cc=michael@walle.cc \
--cc=mturquette@baylibre.com \
--cc=nicoleotsuka@gmail.com \
--cc=perex@perex.cz \
--cc=robh@kernel.org \
--cc=sboyd@kernel.org \
--cc=shengjiu.wang@gmail.com \
--cc=tiwai@suse.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).