[PATCH 0/4] clk: imx8mp: fix parents of AUDIOMIX DSP/OCRAM_A

[PATCH 0/4] clk: imx8mp: fix parents of AUDIOMIX DSP/OCRAM_A

[Laurentiu Mihalcea]

From: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>

Correct the parent of the AUDIOMIX DSP and OCRAM_A clock gates by setting
it to AUDIO_AXI_CLK_ROOT, instead of AUDIO_AHB_CLK_ROOT. Additionally, set
the frequency of AUDIO_AXI_CLK_ROOT to 800MHz instead of the current
400MHz.

Laurentiu Mihalcea (4):
  dt-bindings: clock: imx8mp: add axi clock
  clk: clk-imx8mp-audiomix: fix dsp/ocram_a clock parents
  arm64: dts: imx8mp: add AUDIO_AXI_CLK_ROOT to AUDIOMIX block
  arm64: dts: imx8mp: change AUDIO_AXI_CLK_ROOT freq. to 800MHz

 .../devicetree/bindings/clock/imx8mp-audiomix.yaml     | 10 ++++++----
 arch/arm64/boot/dts/freescale/imx8mp.dtsi              |  7 ++++---
 drivers/clk/imx/clk-imx8mp-audiomix.c                  |  6 +++---
 3 files changed, 13 insertions(+), 10 deletions(-)

-- 
2.34.1

[PATCH 1/4] dt-bindings: clock: imx8mp: add axi clock

[Laurentiu Mihalcea]

From: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>

The AUDIOMIX clock provider takes an additional clock: AUDIO_AXI_CLK_ROOT.

Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
---
 .../devicetree/bindings/clock/imx8mp-audiomix.yaml     | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml b/Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml
index 6588a17a7d9a..0272c9527037 100644
--- a/Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml
+++ b/Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml
@@ -24,8 +24,8 @@ properties:
     maxItems: 1
 
   clocks:
-    minItems: 7
-    maxItems: 7
+    minItems: 8
+    maxItems: 8
 
   clock-names:
     items:
@@ -36,6 +36,7 @@ properties:
       - const: sai5
       - const: sai6
       - const: sai7
+      - const: axi
 
   '#clock-cells':
     const: 1
@@ -72,10 +73,11 @@ examples:
                  <&clk IMX8MP_CLK_SAI3>,
                  <&clk IMX8MP_CLK_SAI5>,
                  <&clk IMX8MP_CLK_SAI6>,
-                 <&clk IMX8MP_CLK_SAI7>;
+                 <&clk IMX8MP_CLK_SAI7>,
+                 <&clk IMX8MP_CLK_AUDIO_AXI_ROOT>;
         clock-names = "ahb",
                       "sai1", "sai2", "sai3",
-                      "sai5", "sai6", "sai7";
+                      "sai5", "sai6", "sai7", "axi";
         power-domains = <&pgc_audio>;
     };
 
-- 
2.34.1

Re: [PATCH 1/4] dt-bindings: clock: imx8mp: add axi clock

[Frank Li]

On Mon, Feb 17, 2025 at 11:57:15AM -0500, Laurentiu Mihalcea wrote:
> From: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
>
> The AUDIOMIX clock provider takes an additional clock: AUDIO_AXI_CLK_ROOT.
>
> Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
> ---
>  .../devicetree/bindings/clock/imx8mp-audiomix.yaml     | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml b/Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml
> index 6588a17a7d9a..0272c9527037 100644
> --- a/Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml
> +++ b/Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml
> @@ -24,8 +24,8 @@ properties:
>      maxItems: 1
>
>    clocks:
> -    minItems: 7
> -    maxItems: 7
> +    minItems: 8
> +    maxItems: 8

Are you sure clock axi is mandatory or optional clock?

If it is mandatory, you need update dts also, otherwise, there will many
DTB_CHECK warning.

If it is optional, minItems should be 7.

Please run CEHCK_DTB for arm64/dts/boot/freescale, make sure no new warning
added.

Frank
>
>    clock-names:
>      items:
> @@ -36,6 +36,7 @@ properties:
>        - const: sai5
>        - const: sai6
>        - const: sai7
> +      - const: axi
>
>    '#clock-cells':
>      const: 1
> @@ -72,10 +73,11 @@ examples:
>                   <&clk IMX8MP_CLK_SAI3>,
>                   <&clk IMX8MP_CLK_SAI5>,
>                   <&clk IMX8MP_CLK_SAI6>,
> -                 <&clk IMX8MP_CLK_SAI7>;
> +                 <&clk IMX8MP_CLK_SAI7>,
> +                 <&clk IMX8MP_CLK_AUDIO_AXI_ROOT>;
>          clock-names = "ahb",
>                        "sai1", "sai2", "sai3",
> -                      "sai5", "sai6", "sai7";
> +                      "sai5", "sai6", "sai7", "axi";
>          power-domains = <&pgc_audio>;
>      };
>
> --
> 2.34.1
>

Re: [PATCH 1/4] dt-bindings: clock: imx8mp: add axi clock

[Frank Li]

On Tue, Feb 18, 2025 at 11:05:51AM -0500, Frank Li wrote:
> On Mon, Feb 17, 2025 at 11:57:15AM -0500, Laurentiu Mihalcea wrote:
> > From: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
> >
> > The AUDIOMIX clock provider takes an additional clock: AUDIO_AXI_CLK_ROOT.
> >
> > Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
> > ---
> >  .../devicetree/bindings/clock/imx8mp-audiomix.yaml     | 10 ++++++----
> >  1 file changed, 6 insertions(+), 4 deletions(-)
> >
> > diff --git a/Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml b/Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml
> > index 6588a17a7d9a..0272c9527037 100644
> > --- a/Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml
> > +++ b/Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml
> > @@ -24,8 +24,8 @@ properties:
> >      maxItems: 1
> >
> >    clocks:
> > -    minItems: 7
> > -    maxItems: 7
> > +    minItems: 8
> > +    maxItems: 8
>
> Are you sure clock axi is mandatory or optional clock?
>
> If it is mandatory, you need update dts also, otherwise, there will many
> DTB_CHECK warning.
>
> If it is optional, minItems should be 7.
>
> Please run CEHCK_DTB for arm64/dts/boot/freescale, make sure no new warning
> added.

Sorry, I saw your dts update patch. Please forget my comments.

Frank

>
> Frank
> >
> >    clock-names:
> >      items:
> > @@ -36,6 +36,7 @@ properties:
> >        - const: sai5
> >        - const: sai6
> >        - const: sai7
> > +      - const: axi
> >
> >    '#clock-cells':
> >      const: 1
> > @@ -72,10 +73,11 @@ examples:
> >                   <&clk IMX8MP_CLK_SAI3>,
> >                   <&clk IMX8MP_CLK_SAI5>,
> >                   <&clk IMX8MP_CLK_SAI6>,
> > -                 <&clk IMX8MP_CLK_SAI7>;
> > +                 <&clk IMX8MP_CLK_SAI7>,
> > +                 <&clk IMX8MP_CLK_AUDIO_AXI_ROOT>;
> >          clock-names = "ahb",
> >                        "sai1", "sai2", "sai3",
> > -                      "sai5", "sai6", "sai7";
> > +                      "sai5", "sai6", "sai7", "axi";
> >          power-domains = <&pgc_audio>;
> >      };
> >
> > --
> > 2.34.1
> >

[PATCH 2/4] clk: clk-imx8mp-audiomix: fix dsp/ocram_a clock parents

[Laurentiu Mihalcea]

From: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>

The DSP and OCRAM_A modules from AUDIOMIX are clocked by
AUDIO_AXI_CLK_ROOT, not AUDIO_AHB_CLK_ROOT. Update the clock data
accordingly.

Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
---
 drivers/clk/imx/clk-imx8mp-audiomix.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/clk/imx/clk-imx8mp-audiomix.c b/drivers/clk/imx/clk-imx8mp-audiomix.c
index c409fc7e0618..775f62dddb11 100644
--- a/drivers/clk/imx/clk-imx8mp-audiomix.c
+++ b/drivers/clk/imx/clk-imx8mp-audiomix.c
@@ -180,14 +180,14 @@ static struct clk_imx8mp_audiomix_sel sels[] = {
 	CLK_GATE("asrc", ASRC_IPG),
 	CLK_GATE("pdm", PDM_IPG),
 	CLK_GATE("earc", EARC_IPG),
-	CLK_GATE("ocrama", OCRAMA_IPG),
+	CLK_GATE_PARENT("ocrama", OCRAMA_IPG, "axi"),
 	CLK_GATE("aud2htx", AUD2HTX_IPG),
 	CLK_GATE_PARENT("earc_phy", EARC_PHY, "sai_pll_out_div2"),
 	CLK_GATE("sdma2", SDMA2_ROOT),
 	CLK_GATE("sdma3", SDMA3_ROOT),
 	CLK_GATE("spba2", SPBA2_ROOT),
-	CLK_GATE("dsp", DSP_ROOT),
-	CLK_GATE("dspdbg", DSPDBG_ROOT),
+	CLK_GATE_PARENT("dsp", DSP_ROOT, "axi"),
+	CLK_GATE_PARENT("dspdbg", DSPDBG_ROOT, "axi"),
 	CLK_GATE("edma", EDMA_ROOT),
 	CLK_GATE_PARENT("audpll", AUDPLL_ROOT, "osc_24m"),
 	CLK_GATE("mu2", MU2_ROOT),
-- 
2.34.1

[PATCH 3/4] arm64: dts: imx8mp: add AUDIO_AXI_CLK_ROOT to AUDIOMIX block

[Laurentiu Mihalcea]

From: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>

Needed because the DSP and OCRAM_A components from AUDIOMIX are clocked
by AUDIO_AXI_CLK_ROOT instead of AUDIO_AHB_CLK_ROOT.

Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
---
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
index e0d3b8cba221..86c3055789ba 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
@@ -1619,10 +1619,11 @@ audio_blk_ctrl: clock-controller@30e20000 {
 					 <&clk IMX8MP_CLK_SAI3>,
 					 <&clk IMX8MP_CLK_SAI5>,
 					 <&clk IMX8MP_CLK_SAI6>,
-					 <&clk IMX8MP_CLK_SAI7>;
+					 <&clk IMX8MP_CLK_SAI7>,
+					 <&clk IMX8MP_CLK_AUDIO_AXI_ROOT>;
 				clock-names = "ahb",
 					      "sai1", "sai2", "sai3",
-					      "sai5", "sai6", "sai7";
+					      "sai5", "sai6", "sai7", "axi";
 				power-domains = <&pgc_audio>;
 				assigned-clocks = <&clk IMX8MP_AUDIO_PLL1>,
 						  <&clk IMX8MP_AUDIO_PLL2>;
-- 
2.34.1

[PATCH 4/4] arm64: dts: imx8mp: change AUDIO_AXI_CLK_ROOT freq. to 800MHz

[Laurentiu Mihalcea]

From: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>

AUDIO_AXI_CLK_ROOT can't run at currently requested 600MHz w/ its parent
SYS_PLL1 configured at 800MHz. Configure it to run at 800MHz as some
applications running on the DSP expect the core to run at this frequency
anyways. This change also affects the AUDIOMIX NoC.

Signed-off-by: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
---
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
index 86c3055789ba..54147bce3b83 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
@@ -834,7 +834,7 @@ pgc_audio: power-domain@5 {
 						assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_800M>,
 									 <&clk IMX8MP_SYS_PLL1_800M>;
 						assigned-clock-rates = <400000000>,
-								       <600000000>;
+								       <800000000>;
 					};
 
 					pgc_gpu2d: power-domain@6 {
-- 
2.34.1

Re: [PATCH 0/4] clk: imx8mp: fix parents of AUDIOMIX DSP/OCRAM_A

[Iuliana Prodan]

On 2/17/2025 6:57 PM, Laurentiu Mihalcea wrote:
> From: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
>
> Correct the parent of the AUDIOMIX DSP and OCRAM_A clock gates by setting
> it to AUDIO_AXI_CLK_ROOT, instead of AUDIO_AHB_CLK_ROOT. Additionally, set
> the frequency of AUDIO_AXI_CLK_ROOT to 800MHz instead of the current
> 400MHz.
>
> Laurentiu Mihalcea (4):
>    dt-bindings: clock: imx8mp: add axi clock
>    clk: clk-imx8mp-audiomix: fix dsp/ocram_a clock parents
>    arm64: dts: imx8mp: add AUDIO_AXI_CLK_ROOT to AUDIOMIX block
>    arm64: dts: imx8mp: change AUDIO_AXI_CLK_ROOT freq. to 800MHz
>
>   .../devicetree/bindings/clock/imx8mp-audiomix.yaml     | 10 ++++++----
>   arch/arm64/boot/dts/freescale/imx8mp.dtsi              |  7 ++++---
>   drivers/clk/imx/clk-imx8mp-audiomix.c                  |  6 +++---
>   3 files changed, 13 insertions(+), 10 deletions(-)

For the series:
Reviewed-by: Iuliana Prodan <iuliana.prodan@nxp.com>

Thanks,
Iulia

RE: [PATCH 0/4] clk: imx8mp: fix parents of AUDIOMIX DSP/OCRAM_A

[Peng Fan (OSS)]

Hi Laurentiu,

> linux-arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org
> Subject: [PATCH 0/4] clk: imx8mp: fix parents of AUDIOMIX
> DSP/OCRAM_A
> 
> From: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
> 
> Correct the parent of the AUDIOMIX DSP and OCRAM_A clock gates by
> setting it to AUDIO_AXI_CLK_ROOT, instead of AUDIO_AHB_CLK_ROOT.
> Additionally, set the frequency of AUDIO_AXI_CLK_ROOT to 800MHz
> instead of the current 400MHz.

The patchset looks good to me, just one nit, 
Should fixes tag be added for the patchset?

Regards,
Peng.

> 
> Laurentiu Mihalcea (4):
>   dt-bindings: clock: imx8mp: add axi clock
>   clk: clk-imx8mp-audiomix: fix dsp/ocram_a clock parents
>   arm64: dts: imx8mp: add AUDIO_AXI_CLK_ROOT to AUDIOMIX block
>   arm64: dts: imx8mp: change AUDIO_AXI_CLK_ROOT freq. to 800MHz
> 
>  .../devicetree/bindings/clock/imx8mp-audiomix.yaml     | 10 ++++++---
> -
>  arch/arm64/boot/dts/freescale/imx8mp.dtsi              |  7 ++++---
>  drivers/clk/imx/clk-imx8mp-audiomix.c                  |  6 +++---
>  3 files changed, 13 insertions(+), 10 deletions(-)
> 
> --
> 2.34.1

Re: [PATCH 0/4] clk: imx8mp: fix parents of AUDIOMIX DSP/OCRAM_A

[Laurentiu Mihalcea]

On 2/18/25 08:43, Peng Fan (OSS) wrote:
> Hi Laurentiu,
>
>> linux-arm-kernel@lists.infradead.org; linux-kernel@vger.kernel.org
>> Subject: [PATCH 0/4] clk: imx8mp: fix parents of AUDIOMIX
>> DSP/OCRAM_A
>>
>> From: Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
>>
>> Correct the parent of the AUDIOMIX DSP and OCRAM_A clock gates by
>> setting it to AUDIO_AXI_CLK_ROOT, instead of AUDIO_AHB_CLK_ROOT.
>> Additionally, set the frequency of AUDIO_AXI_CLK_ROOT to 800MHz
>> instead of the current 400MHz.
> The patchset looks good to me, just one nit, 
> Should fixes tag be added for the patchset?


sure, will send a V2 with that