| Message ID | 20220127141052.1900174-2-abel.vesa@nxp.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream, archived |
| Headers | show |
| Series | [1/2] arm: dts: imx7: Use audio_mclk_post_div instead audio_mclk_root_clk | expand |
> Subject: [PATCH 2/2] clk: imx: Remove audio_mclk_root_clk > > The audio_mclk_root_clk was added as a gate with the CCGR121 (0x4790), > but according to the reference manual, there is no such gate. The > CCGR121 belongs to ECSPI2 and it is not shared. > > Fixes: 8f6d8094b215b57 ("ARM: imx: add imx7d clk tree support") > Reported-by: David Wolfe <david.wolfe@nxp.com> > Signed-off-by: Abel Vesa <abel.vesa@nxp.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> > --- > drivers/clk/imx/clk-imx7d.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c index > c4e0f1c07192..3f6fd7ef2a68 100644 > --- a/drivers/clk/imx/clk-imx7d.c > +++ b/drivers/clk/imx/clk-imx7d.c > @@ -849,7 +849,6 @@ static void __init imx7d_clocks_init(struct > device_node *ccm_node) > hws[IMX7D_WDOG4_ROOT_CLK] = > imx_clk_hw_gate4("wdog4_root_clk", "wdog_post_div", base + 0x49f0, 0); > hws[IMX7D_KPP_ROOT_CLK] = imx_clk_hw_gate4("kpp_root_clk", > "ipg_root_clk", base + 0x4aa0, 0); > hws[IMX7D_CSI_MCLK_ROOT_CLK] = > imx_clk_hw_gate4("csi_mclk_root_clk", "csi_mclk_post_div", base + 0x4490, > 0); > - hws[IMX7D_AUDIO_MCLK_ROOT_CLK] = > imx_clk_hw_gate4("audio_mclk_root_clk", "audio_mclk_post_div", base + > 0x4790, 0); > hws[IMX7D_WRCLK_ROOT_CLK] = imx_clk_hw_gate4("wrclk_root_clk", > "wrclk_post_div", base + 0x47a0, 0); > hws[IMX7D_USB_CTRL_CLK] = imx_clk_hw_gate4("usb_ctrl_clk", > "ahb_root_clk", base + 0x4680, 0); > hws[IMX7D_USB_PHY1_CLK] = imx_clk_hw_gate4("usb_phy1_clk", > "pll_usb1_main_clk", base + 0x46a0, 0); > -- > 2.31.1
On 22-01-27 16:10:52, Abel Vesa wrote: > The audio_mclk_root_clk was added as a gate with the CCGR121 (0x4790), > but according to the reference manual, there is no such gate. The > CCGR121 belongs to ECSPI2 and it is not shared. > > Fixes: 8f6d8094b215b57 ("ARM: imx: add imx7d clk tree support") > Reported-by: David Wolfe <david.wolfe@nxp.com> > Signed-off-by: Abel Vesa <abel.vesa@nxp.com> Applied. > --- > drivers/clk/imx/clk-imx7d.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c > index c4e0f1c07192..3f6fd7ef2a68 100644 > --- a/drivers/clk/imx/clk-imx7d.c > +++ b/drivers/clk/imx/clk-imx7d.c > @@ -849,7 +849,6 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) > hws[IMX7D_WDOG4_ROOT_CLK] = imx_clk_hw_gate4("wdog4_root_clk", "wdog_post_div", base + 0x49f0, 0); > hws[IMX7D_KPP_ROOT_CLK] = imx_clk_hw_gate4("kpp_root_clk", "ipg_root_clk", base + 0x4aa0, 0); > hws[IMX7D_CSI_MCLK_ROOT_CLK] = imx_clk_hw_gate4("csi_mclk_root_clk", "csi_mclk_post_div", base + 0x4490, 0); > - hws[IMX7D_AUDIO_MCLK_ROOT_CLK] = imx_clk_hw_gate4("audio_mclk_root_clk", "audio_mclk_post_div", base + 0x4790, 0); > hws[IMX7D_WRCLK_ROOT_CLK] = imx_clk_hw_gate4("wrclk_root_clk", "wrclk_post_div", base + 0x47a0, 0); > hws[IMX7D_USB_CTRL_CLK] = imx_clk_hw_gate4("usb_ctrl_clk", "ahb_root_clk", base + 0x4680, 0); > hws[IMX7D_USB_PHY1_CLK] = imx_clk_hw_gate4("usb_phy1_clk", "pll_usb1_main_clk", base + 0x46a0, 0); > -- > 2.31.1 >
diff --git a/drivers/clk/imx/clk-imx7d.c b/drivers/clk/imx/clk-imx7d.c index c4e0f1c07192..3f6fd7ef2a68 100644 --- a/drivers/clk/imx/clk-imx7d.c +++ b/drivers/clk/imx/clk-imx7d.c @@ -849,7 +849,6 @@ static void __init imx7d_clocks_init(struct device_node *ccm_node) hws[IMX7D_WDOG4_ROOT_CLK] = imx_clk_hw_gate4("wdog4_root_clk", "wdog_post_div", base + 0x49f0, 0); hws[IMX7D_KPP_ROOT_CLK] = imx_clk_hw_gate4("kpp_root_clk", "ipg_root_clk", base + 0x4aa0, 0); hws[IMX7D_CSI_MCLK_ROOT_CLK] = imx_clk_hw_gate4("csi_mclk_root_clk", "csi_mclk_post_div", base + 0x4490, 0); - hws[IMX7D_AUDIO_MCLK_ROOT_CLK] = imx_clk_hw_gate4("audio_mclk_root_clk", "audio_mclk_post_div", base + 0x4790, 0); hws[IMX7D_WRCLK_ROOT_CLK] = imx_clk_hw_gate4("wrclk_root_clk", "wrclk_post_div", base + 0x47a0, 0); hws[IMX7D_USB_CTRL_CLK] = imx_clk_hw_gate4("usb_ctrl_clk", "ahb_root_clk", base + 0x4680, 0); hws[IMX7D_USB_PHY1_CLK] = imx_clk_hw_gate4("usb_phy1_clk", "pll_usb1_main_clk", base + 0x46a0, 0);
The audio_mclk_root_clk was added as a gate with the CCGR121 (0x4790), but according to the reference manual, there is no such gate. The CCGR121 belongs to ECSPI2 and it is not shared. Fixes: 8f6d8094b215b57 ("ARM: imx: add imx7d clk tree support") Reported-by: David Wolfe <david.wolfe@nxp.com> Signed-off-by: Abel Vesa <abel.vesa@nxp.com> --- drivers/clk/imx/clk-imx7d.c | 1 - 1 file changed, 1 deletion(-)