[PATCH 1/2] arm64: dts: imx8mp: Remove the reference to audio ipg clock on imx8mp

[PATCH 1/2] arm64: dts: imx8mp: Remove the reference to audio ipg clock on imx8mp

[Jacky Bai]

On i.MX8MP, there is no audio ipg clock, so remove the wrong reference
to this clock in dts file.

Signed-off-by: Jacky Bai <ping.bai@nxp.com>
---
 arch/arm64/boot/dts/freescale/imx8mp.dtsi | 2 --
 1 file changed, 2 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
index c2d51a46cb3c..0283c22c2bd3 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
@@ -407,7 +407,6 @@ clk: clock-controller@30380000 {
 						  <&clk IMX8MP_CLK_GIC>,
 						  <&clk IMX8MP_CLK_AUDIO_AHB>,
 						  <&clk IMX8MP_CLK_AUDIO_AXI_SRC>,
-						  <&clk IMX8MP_CLK_IPG_AUDIO_ROOT>,
 						  <&clk IMX8MP_AUDIO_PLL1>,
 						  <&clk IMX8MP_AUDIO_PLL2>;
 				assigned-clock-parents = <&clk IMX8MP_SYS_PLL1_800M>,
@@ -423,7 +422,6 @@ clk: clock-controller@30380000 {
 						       <500000000>,
 						       <400000000>,
 						       <800000000>,
-						       <400000000>,
 						       <393216000>,
 						       <361267200>;
 			};
-- 
2.26.2

[PATCH 2/2] clk: imx: Remove the audio ipg clock from imx8mp

[Jacky Bai]

There is no audio ipg clock on i.MX8MP, so remove this from
the clock driver.

Signed-off-by: Jacky Bai <ping.bai@nxp.com>
---
 drivers/clk/imx/clk-imx8mp.c             | 1 -
 include/dt-bindings/clock/imx8mp-clock.h | 1 -
 2 files changed, 2 deletions(-)

diff --git a/drivers/clk/imx/clk-imx8mp.c b/drivers/clk/imx/clk-imx8mp.c
index e39c9c907c38..12837304545d 100644
--- a/drivers/clk/imx/clk-imx8mp.c
+++ b/drivers/clk/imx/clk-imx8mp.c
@@ -556,7 +556,6 @@ static int imx8mp_clocks_probe(struct platform_device *pdev)
 	hws[IMX8MP_CLK_MIPI_DSI_ESC_RX] = imx8m_clk_hw_composite_bus("mipi_dsi_esc_rx", imx8mp_mipi_dsi_esc_rx_sels, ccm_base + 0x9200);
 
 	hws[IMX8MP_CLK_IPG_ROOT] = imx_clk_hw_divider2("ipg_root", "ahb_root", ccm_base + 0x9080, 0, 1);
-	hws[IMX8MP_CLK_IPG_AUDIO_ROOT] = imx_clk_hw_divider2("ipg_audio_root", "audio_ahb", ccm_base + 0x9180, 0, 1);
 
 	hws[IMX8MP_CLK_DRAM_ALT] = imx8m_clk_hw_composite("dram_alt", imx8mp_dram_alt_sels, ccm_base + 0xa000);
 	hws[IMX8MP_CLK_DRAM_APB] = imx8m_clk_hw_composite_critical("dram_apb", imx8mp_dram_apb_sels, ccm_base + 0xa080);
diff --git a/include/dt-bindings/clock/imx8mp-clock.h b/include/dt-bindings/clock/imx8mp-clock.h
index 43927a1b9e94..235c7a00d379 100644
--- a/include/dt-bindings/clock/imx8mp-clock.h
+++ b/include/dt-bindings/clock/imx8mp-clock.h
@@ -117,7 +117,6 @@
 #define IMX8MP_CLK_AUDIO_AHB			108
 #define IMX8MP_CLK_MIPI_DSI_ESC_RX		109
 #define IMX8MP_CLK_IPG_ROOT			110
-#define IMX8MP_CLK_IPG_AUDIO_ROOT		111
 #define IMX8MP_CLK_DRAM_ALT			112
 #define IMX8MP_CLK_DRAM_APB			113
 #define IMX8MP_CLK_VPU_G1			114
-- 
2.26.2

Re: [PATCH 2/2] clk: imx: Remove the audio ipg clock from imx8mp

[Stephen Boyd]

Quoting Jacky Bai (2021-04-16 00:37:03)
> diff --git a/include/dt-bindings/clock/imx8mp-clock.h b/include/dt-bindings/clock/imx8mp-clock.h
> index 43927a1b9e94..235c7a00d379 100644
> --- a/include/dt-bindings/clock/imx8mp-clock.h
> +++ b/include/dt-bindings/clock/imx8mp-clock.h
> @@ -117,7 +117,6 @@
>  #define IMX8MP_CLK_AUDIO_AHB                   108
>  #define IMX8MP_CLK_MIPI_DSI_ESC_RX             109
>  #define IMX8MP_CLK_IPG_ROOT                    110
> -#define IMX8MP_CLK_IPG_AUDIO_ROOT              111

Maybe just add a comment saying it isn't there? Or remove it in three
months time once DTS no longer references it?

Removing this here means that it has to merge whenever the DTS doesn't
reference it anymore which causes a cross tree dependency.

>  #define IMX8MP_CLK_DRAM_ALT                    112
>  #define IMX8MP_CLK_DRAM_APB                    113
>  #define IMX8MP_CLK_VPU_G1                      114

RE: [PATCH 2/2] clk: imx: Remove the audio ipg clock from imx8mp

[Jacky Bai]

> -----Original Message-----
> From: Stephen Boyd [mailto:sboyd@kernel.org]
> Sent: Saturday, April 17, 2021 7:57 AM
> To: Jacky Bai <ping.bai@nxp.com>; Abel Vesa <abel.vesa@nxp.com>;
> robh+dt@kernel.org; s.hauer@pengutronix.de; shawnguo@kernel.org
> Cc: festevam@gmail.com; devicetree@vger.kernel.org;
> linux-clk@vger.kernel.org; dl-linux-imx <linux-imx@nxp.com>
> Subject: Re: [PATCH 2/2] clk: imx: Remove the audio ipg clock from imx8mp
> 
> Quoting Jacky Bai (2021-04-16 00:37:03)
> > diff --git a/include/dt-bindings/clock/imx8mp-clock.h
> > b/include/dt-bindings/clock/imx8mp-clock.h
> > index 43927a1b9e94..235c7a00d379 100644
> > --- a/include/dt-bindings/clock/imx8mp-clock.h
> > +++ b/include/dt-bindings/clock/imx8mp-clock.h
> > @@ -117,7 +117,6 @@
> >  #define IMX8MP_CLK_AUDIO_AHB                   108
> >  #define IMX8MP_CLK_MIPI_DSI_ESC_RX             109
> >  #define IMX8MP_CLK_IPG_ROOT                    110
> > -#define IMX8MP_CLK_IPG_AUDIO_ROOT              111
> 
> Maybe just add a comment saying it isn't there? Or remove it in three months
> time once DTS no longer references it?
> 

Ok, will resolve this comments in V2. I can add some comments and keep it here for a while.

> Removing this here means that it has to merge whenever the DTS doesn't
> reference it anymore which causes a cross tree dependency.

Right, this delete will lead to the dependency with the dts tree for now.

BR
Jacky Bai

> 
> >  #define IMX8MP_CLK_DRAM_ALT                    112
> >  #define IMX8MP_CLK_DRAM_APB                    113
> >  #define IMX8MP_CLK_VPU_G1                      114