[PATCH v3 0/3] clk: imx8mp: Add audio shared gate

mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed

* [PATCH v3 0/3] clk: imx8mp: Add audio shared gate
@ 2022-10-28  1:53 Shengjiu Wang
  2022-10-28  1:53 ` [PATCH v3 1/3] dt-bindings: clock: imx8mp: Add ids for the " Shengjiu Wang
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Shengjiu Wang @ 2022-10-28  1:53 UTC (permalink / raw)
  To: shengjiu.wang, abelvesa, mturquette, sboyd, shawnguo, s.hauer,
	kernel, festevam, linux-imx, robh+dt, krzysztof.kozlowski+dt,
	linux-clk, linux-arm-kernel, linux-kernel, devicetree, marex

Add audio shared gate because CCGR101 is shared

changes in v3:
- remove IMX8MP_CLK_AUDIO_ROOT

changes in v2:
- split dt-binding to separate patch

Abel Vesa (2):
  dt-bindings: clock: imx8mp: Add ids for the audio shared gate
  clk: imx8mp: Add audio shared gate

Shengjiu Wang (1):
  dt-bindings: clock: imx8mp: Remove unused IMX8MP_CLK_AUDIO_ROOT

 drivers/clk/imx/clk-imx8mp.c             | 11 ++++++++++-
 include/dt-bindings/clock/imx8mp-clock.h | 12 ++++++++++--
 2 files changed, 20 insertions(+), 3 deletions(-)

-- 
2.34.1


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH v3 1/3] dt-bindings: clock: imx8mp: Add ids for the audio shared gate
  2022-10-28  1:53 [PATCH v3 0/3] clk: imx8mp: Add audio shared gate Shengjiu Wang
@ 2022-10-28  1:53 ` Shengjiu Wang
  2022-10-28  1:53 ` [PATCH v3 2/3] clk: imx8mp: Add " Shengjiu Wang
  2022-10-28  1:53 ` [PATCH v3 3/3] dt-bindings: clock: imx8mp: Remove unused IMX8MP_CLK_AUDIO_ROOT Shengjiu Wang
  2 siblings, 0 replies; 6+ messages in thread
From: Shengjiu Wang @ 2022-10-28  1:53 UTC (permalink / raw)
  To: shengjiu.wang, abelvesa, mturquette, sboyd, shawnguo, s.hauer,
	kernel, festevam, linux-imx, robh+dt, krzysztof.kozlowski+dt,
	linux-clk, linux-arm-kernel, linux-kernel, devicetree, marex

From: Abel Vesa <abel.vesa@nxp.com>

All these IDs are for one single HW gate (CCGR101) that is shared
between these root clocks.

Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
---
 include/dt-bindings/clock/imx8mp-clock.h | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/include/dt-bindings/clock/imx8mp-clock.h b/include/dt-bindings/clock/imx8mp-clock.h
index 9d5cc2ddde89..2f6fec299662 100644
--- a/include/dt-bindings/clock/imx8mp-clock.h
+++ b/include/dt-bindings/clock/imx8mp-clock.h
@@ -324,8 +324,17 @@
 #define IMX8MP_CLK_CLKOUT2_SEL			317
 #define IMX8MP_CLK_CLKOUT2_DIV			318
 #define IMX8MP_CLK_CLKOUT2			319
+#define IMX8MP_CLK_AUDIO_AHB_ROOT		320
+#define IMX8MP_CLK_AUDIO_AXI_ROOT		321
+#define IMX8MP_CLK_SAI1_ROOT			322
+#define IMX8MP_CLK_SAI2_ROOT			323
+#define IMX8MP_CLK_SAI3_ROOT			324
+#define IMX8MP_CLK_SAI5_ROOT			325
+#define IMX8MP_CLK_SAI6_ROOT			326
+#define IMX8MP_CLK_SAI7_ROOT			327
+#define IMX8MP_CLK_PDM_ROOT			328
 
-#define IMX8MP_CLK_END				320
+#define IMX8MP_CLK_END				329
 
 #define IMX8MP_CLK_AUDIOMIX_SAI1_IPG		0
 #define IMX8MP_CLK_AUDIOMIX_SAI1_MCLK1		1
-- 
2.34.1


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH v3 2/3] clk: imx8mp: Add audio shared gate
  2022-10-28  1:53 [PATCH v3 0/3] clk: imx8mp: Add audio shared gate Shengjiu Wang
  2022-10-28  1:53 ` [PATCH v3 1/3] dt-bindings: clock: imx8mp: Add ids for the " Shengjiu Wang
@ 2022-10-28  1:53 ` Shengjiu Wang
  2022-10-28  1:53 ` [PATCH v3 3/3] dt-bindings: clock: imx8mp: Remove unused IMX8MP_CLK_AUDIO_ROOT Shengjiu Wang
  2 siblings, 0 replies; 6+ messages in thread
From: Shengjiu Wang @ 2022-10-28  1:53 UTC (permalink / raw)
  To: shengjiu.wang, abelvesa, mturquette, sboyd, shawnguo, s.hauer,
	kernel, festevam, linux-imx, robh+dt, krzysztof.kozlowski+dt,
	linux-clk, linux-arm-kernel, linux-kernel, devicetree, marex

From: Abel Vesa <abel.vesa@nxp.com>

According to the RM, the CCGR101 is shared for the following root clocks:
- AUDIO_AHB_CLK_ROOT
- AUDIO_AXI_CLK_ROOT
- SAI1_CLK_ROOT
- SAI2_CLK_ROOT
- SAI3_CLK_ROOT
- SAI5_CLK_ROOT
- SAI6_CLK_ROOT
- SAI7_CLK_ROOT
- PDM_CLK_ROOT

And correct clock MX8MP_CLK_AUDIO_ROOT to be IMX8MP_CLK_AUDIO_AHB_ROOT.

Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
---
 drivers/clk/imx/clk-imx8mp.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c
index 652ae58c2735..0ae3bc7bf8a1 100644
--- a/drivers/clk/imx/clk-imx8mp.c
+++ b/drivers/clk/imx/clk-imx8mp.c
@@ -17,6 +17,7 @@
 
 static u32 share_count_nand;
 static u32 share_count_media;
+static u32 share_count_audio;
 
 static const char * const pll_ref_sels[] = { "osc_24m", "dummy", "dummy", "dummy", };
 static const char * const audio_pll1_bypass_sels[] = {"audio_pll1", "audio_pll1_ref_sel", };
@@ -699,7 +700,15 @@ static int imx8mp_clocks_probe(struct platform_device *pdev)
 	hws[IMX8MP_CLK_HDMI_ROOT] = imx_clk_hw_gate4("hdmi_root_clk", "hdmi_axi", ccm_base + 0x45f0, 0);
 	hws[IMX8MP_CLK_TSENSOR_ROOT] = imx_clk_hw_gate4("tsensor_root_clk", "ipg_root", ccm_base + 0x4620, 0);
 	hws[IMX8MP_CLK_VPU_ROOT] = imx_clk_hw_gate4("vpu_root_clk", "vpu_bus", ccm_base + 0x4630, 0);
-	hws[IMX8MP_CLK_AUDIO_ROOT] = imx_clk_hw_gate4("audio_root_clk", "audio_ahb", ccm_base + 0x4650, 0);
+	hws[IMX8MP_CLK_AUDIO_AHB_ROOT] = imx_clk_hw_gate2_shared2("audio_ahb_root", "audio_ahb", ccm_base + 0x4650, 0, &share_count_audio);
+	hws[IMX8MP_CLK_AUDIO_AXI_ROOT] = imx_clk_hw_gate2_shared2("audio_axi_root", "audio_axi", ccm_base + 0x4650, 0, &share_count_audio);
+	hws[IMX8MP_CLK_SAI1_ROOT] = imx_clk_hw_gate2_shared2("sai1_root", "sai1", ccm_base + 0x4650, 0, &share_count_audio);
+	hws[IMX8MP_CLK_SAI2_ROOT] = imx_clk_hw_gate2_shared2("sai2_root", "sai2", ccm_base + 0x4650, 0, &share_count_audio);
+	hws[IMX8MP_CLK_SAI3_ROOT] = imx_clk_hw_gate2_shared2("sai3_root", "sai3", ccm_base + 0x4650, 0, &share_count_audio);
+	hws[IMX8MP_CLK_SAI5_ROOT] = imx_clk_hw_gate2_shared2("sai5_root", "sai5", ccm_base + 0x4650, 0, &share_count_audio);
+	hws[IMX8MP_CLK_SAI6_ROOT] = imx_clk_hw_gate2_shared2("sai6_root", "sai6", ccm_base + 0x4650, 0, &share_count_audio);
+	hws[IMX8MP_CLK_SAI7_ROOT] = imx_clk_hw_gate2_shared2("sai7_root", "sai7", ccm_base + 0x4650, 0, &share_count_audio);
+	hws[IMX8MP_CLK_PDM_ROOT] = imx_clk_hw_gate2_shared2("pdm_root", "pdm", ccm_base + 0x4650, 0, &share_count_audio);
 
 	hws[IMX8MP_CLK_ARM] = imx_clk_hw_cpu("arm", "arm_a53_core",
 					     hws[IMX8MP_CLK_A53_CORE]->clk,
-- 
2.34.1


^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH v3 3/3] dt-bindings: clock: imx8mp: Remove unused IMX8MP_CLK_AUDIO_ROOT
  2022-10-28  1:53 [PATCH v3 0/3] clk: imx8mp: Add audio shared gate Shengjiu Wang
  2022-10-28  1:53 ` [PATCH v3 1/3] dt-bindings: clock: imx8mp: Add ids for the " Shengjiu Wang
  2022-10-28  1:53 ` [PATCH v3 2/3] clk: imx8mp: Add " Shengjiu Wang
@ 2022-10-28  1:53 ` Shengjiu Wang
  2022-10-28  2:17   ` Krzysztof Kozlowski
  2 siblings, 1 reply; 6+ messages in thread
From: Shengjiu Wang @ 2022-10-28  1:53 UTC (permalink / raw)
  To: shengjiu.wang, abelvesa, mturquette, sboyd, shawnguo, s.hauer,
	kernel, festevam, linux-imx, robh+dt, krzysztof.kozlowski+dt,
	linux-clk, linux-arm-kernel, linux-kernel, devicetree, marex

Remove unused IMX8MP_CLK_AUDIO_ROOT which is replaced by
IMX8MP_CLK_AUDIO_AHB_ROOT.

Signed-off-by: Shengjiu Wang <shengjiu.wang@nxp.com>
---
 include/dt-bindings/clock/imx8mp-clock.h | 1 -
 1 file changed, 1 deletion(-)

diff --git a/include/dt-bindings/clock/imx8mp-clock.h b/include/dt-bindings/clock/imx8mp-clock.h
index 2f6fec299662..6619227f51ab 100644
--- a/include/dt-bindings/clock/imx8mp-clock.h
+++ b/include/dt-bindings/clock/imx8mp-clock.h
@@ -286,7 +286,6 @@
 #define IMX8MP_CLK_TSENSOR_ROOT			281
 #define IMX8MP_CLK_VPU_ROOT			282
 #define IMX8MP_CLK_MRPR_ROOT			283
-#define IMX8MP_CLK_AUDIO_ROOT			284
 #define IMX8MP_CLK_DRAM_ALT_ROOT		285
 #define IMX8MP_CLK_DRAM_CORE			286
 #define IMX8MP_CLK_ARM				287
-- 
2.34.1


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH v3 3/3] dt-bindings: clock: imx8mp: Remove unused IMX8MP_CLK_AUDIO_ROOT
  2022-10-28  1:53 ` [PATCH v3 3/3] dt-bindings: clock: imx8mp: Remove unused IMX8MP_CLK_AUDIO_ROOT Shengjiu Wang
@ 2022-10-28  2:17   ` Krzysztof Kozlowski
       [not found]     ` <CAA+D8AMTY=733JZujLrE2aG43=o-9JCg7VfOOq67rnxXKdn6PQ@mail.gmail.com>
  0 siblings, 1 reply; 6+ messages in thread
From: Krzysztof Kozlowski @ 2022-10-28  2:17 UTC (permalink / raw)
  To: Shengjiu Wang, shengjiu.wang, abelvesa, mturquette, sboyd,
	shawnguo, s.hauer, kernel, festevam, linux-imx, robh+dt,
	krzysztof.kozlowski+dt, linux-clk, linux-arm-kernel,
	linux-kernel, devicetree, marex

On 27/10/2022 21:53, Shengjiu Wang wrote:
> Remove unused IMX8MP_CLK_AUDIO_ROOT which is replaced by
> IMX8MP_CLK_AUDIO_AHB_ROOT.

You break users, so this should be a bit better explained.

Best regards,
Krzysztof


^ permalink raw reply	[flat|nested] 6+ messages in thread

[parent not found: <CAA+D8AMTY=733JZujLrE2aG43=o-9JCg7VfOOq67rnxXKdn6PQ@mail.gmail.com>]

* Re: [PATCH v3 3/3] dt-bindings: clock: imx8mp: Remove unused IMX8MP_CLK_AUDIO_ROOT
       [not found]     ` <CAA+D8AMTY=733JZujLrE2aG43=o-9JCg7VfOOq67rnxXKdn6PQ@mail.gmail.com>
@ 2022-10-28  2:26       ` Krzysztof Kozlowski
  0 siblings, 0 replies; 6+ messages in thread
From: Krzysztof Kozlowski @ 2022-10-28  2:26 UTC (permalink / raw)
  To: Shengjiu Wang
  Cc: Shengjiu Wang, abelvesa, mturquette, sboyd, shawnguo, s.hauer,
	kernel, festevam, linux-imx, robh+dt, krzysztof.kozlowski+dt,
	linux-clk, linux-arm-kernel, linux-kernel, devicetree, marex

On 27/10/2022 22:20, Shengjiu Wang wrote:
> On Fri, Oct 28, 2022 at 10:17 AM Krzysztof Kozlowski <
> krzysztof.kozlowski@linaro.org> wrote:
> 
>> On 27/10/2022 21:53, Shengjiu Wang wrote:
>>> Remove unused IMX8MP_CLK_AUDIO_ROOT which is replaced by
>>> IMX8MP_CLK_AUDIO_AHB_ROOT.
>>
>> You break users, so this should be a bit better explained.
>>
>> I do a search, but no one is using it...

The commit msg should explain the reason and it didn't. Also a reason
like "I did not find in Linux upstream a user" might not be enough. What
about U-boot? BSD? Other firmwares?

Best regards,
Krzysztof


^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-10-28  2:26 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-10-28  1:53 [PATCH v3 0/3] clk: imx8mp: Add audio shared gate Shengjiu Wang
2022-10-28  1:53 ` [PATCH v3 1/3] dt-bindings: clock: imx8mp: Add ids for the " Shengjiu Wang
2022-10-28  1:53 ` [PATCH v3 2/3] clk: imx8mp: Add " Shengjiu Wang
2022-10-28  1:53 ` [PATCH v3 3/3] dt-bindings: clock: imx8mp: Remove unused IMX8MP_CLK_AUDIO_ROOT Shengjiu Wang
2022-10-28  2:17   ` Krzysztof Kozlowski
     [not found]     ` <CAA+D8AMTY=733JZujLrE2aG43=o-9JCg7VfOOq67rnxXKdn6PQ@mail.gmail.com>
2022-10-28  2:26       ` Krzysztof Kozlowski

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®