RE: [PATCH V2 05/10] clk: imx8mp: use imx8m_clk_hw_composite_core to simplify code

From: Peng Fan
Date: Mon Apr 27 2020 - 04:57:57 EST

Next message: Peng Fan: "RE: [PATCH V2 06/10] clk: imx8m: migrate A53 clk root to use composite core"
Previous message: Johan Jonker: "Re: [PATCH v2 2/3] arm64: dts: rockchip: rk3399-roc-pc: Fix MMC numbering for LED triggers"
In reply to: Aisheng Dong: "RE: [PATCH V2 05/10] clk: imx8mp: use imx8m_clk_hw_composite_core to simplify code"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

> Subject: RE: [PATCH V2 05/10] clk: imx8mp: use
> imx8m_clk_hw_composite_core to simplify code
>
> > From: Peng Fan <peng.fan@xxxxxxx>
> > Sent: Thursday, March 12, 2020 6:20 PM
> >
> > Use imx8m_clk_hw_composite_core to simpliy clks that belong to core clk
> slice.
> >
> > Signed-off-by: Peng Fan <peng.fan@xxxxxxx>
>
> Should we also deprecated the old clock ids which will not be supported by
> driver anymore?

To keep dt backward compatible, those ids are kept as what we did for other
i.MX8M platform.

Thanks,
Peng.

> Otherwise:
> Reviewed-by: Dong Aisheng <aisheng.dong@xxxxxxx>
>
> Regards
> Aisheng
>
> > ---
> > drivers/clk/imx/clk-imx8mp.c | 47
> > +++++++++++---------------------
> > include/dt-bindings/clock/imx8mp-clock.h | 11 +++++++-
> > 2 files changed, 26 insertions(+), 32 deletions(-)
> >
> > diff --git a/drivers/clk/imx/clk-imx8mp.c
> > b/drivers/clk/imx/clk-imx8mp.c index
> > a7613c7355c8..998e9e63f831 100644
> > --- a/drivers/clk/imx/clk-imx8mp.c
> > +++ b/drivers/clk/imx/clk-imx8mp.c
> > @@ -546,33 +546,18 @@ static int imx8mp_clocks_probe(struct
> > platform_device *pdev)
> > hws[IMX8MP_SYS_PLL2_500M] =
> > imx_clk_hw_fixed_factor("sys_pll2_500m", "sys_pll2_500m_cg", 1, 2);
> > hws[IMX8MP_SYS_PLL2_1000M] =
> > imx_clk_hw_fixed_factor("sys_pll2_1000m", "sys_pll2_out", 1, 1);
> >
> > - hws[IMX8MP_CLK_A53_SRC] = imx_clk_hw_mux2("arm_a53_src",
> > ccm_base + 0x8000, 24, 3, imx8mp_a53_sels,
> ARRAY_SIZE(imx8mp_a53_sels));
> > - hws[IMX8MP_CLK_M7_SRC] = imx_clk_hw_mux2("arm_m7_src",
> > ccm_base + 0x8080, 24, 3, imx8mp_m7_sels,
> ARRAY_SIZE(imx8mp_m7_sels));
> > - hws[IMX8MP_CLK_ML_SRC] = imx_clk_hw_mux2("ml_src", ccm_base +
> > 0x8100, 24, 3, imx8mp_ml_sels, ARRAY_SIZE(imx8mp_ml_sels));
> > - hws[IMX8MP_CLK_GPU3D_CORE_SRC] =
> > imx_clk_hw_mux2("gpu3d_core_src", ccm_base + 0x8180, 24, 3,
> > imx8mp_gpu3d_core_sels, ARRAY_SIZE(imx8mp_gpu3d_core_sels));
> > - hws[IMX8MP_CLK_GPU3D_SHADER_SRC] =
> > imx_clk_hw_mux2("gpu3d_shader_src", ccm_base + 0x8200, 24, 3,
> > imx8mp_gpu3d_shader_sels, ARRAY_SIZE(imx8mp_gpu3d_shader_sels));
> > - hws[IMX8MP_CLK_GPU2D_SRC] = imx_clk_hw_mux2("gpu2d_src",
> > ccm_base + 0x8280, 24, 3, imx8mp_gpu2d_sels,
> > ARRAY_SIZE(imx8mp_gpu2d_sels));
> > - hws[IMX8MP_CLK_AUDIO_AXI_SRC] =
> imx_clk_hw_mux2("audio_axi_src",
> > ccm_base + 0x8300, 24, 3, imx8mp_audio_axi_sels,
> > ARRAY_SIZE(imx8mp_audio_axi_sels));
> > - hws[IMX8MP_CLK_HSIO_AXI_SRC] = imx_clk_hw_mux2("hsio_axi_src",
> > ccm_base + 0x8380, 24, 3, imx8mp_hsio_axi_sels,
> > ARRAY_SIZE(imx8mp_hsio_axi_sels));
> > - hws[IMX8MP_CLK_MEDIA_ISP_SRC] =
> imx_clk_hw_mux2("media_isp_src",
> > ccm_base + 0x8400, 24, 3, imx8mp_media_isp_sels,
> > ARRAY_SIZE(imx8mp_media_isp_sels));
> > - hws[IMX8MP_CLK_A53_CG] = imx_clk_hw_gate3("arm_a53_cg",
> > "arm_a53_src", ccm_base + 0x8000, 28);
> > - hws[IMX8MP_CLK_M4_CG] = imx_clk_hw_gate3("arm_m7_cg",
> > "arm_m7_src", ccm_base + 0x8080, 28);
> > - hws[IMX8MP_CLK_ML_CG] = imx_clk_hw_gate3("ml_cg", "ml_src",
> > ccm_base + 0x8100, 28);
> > - hws[IMX8MP_CLK_GPU3D_CORE_CG] =
> > imx_clk_hw_gate3("gpu3d_core_cg", "gpu3d_core_src", ccm_base +
> 0x8180,
> > 28);
> > - hws[IMX8MP_CLK_GPU3D_SHADER_CG] =
> > imx_clk_hw_gate3("gpu3d_shader_cg", "gpu3d_shader_src", ccm_base +
> > 0x8200, 28);
> > - hws[IMX8MP_CLK_GPU2D_CG] = imx_clk_hw_gate3("gpu2d_cg",
> > "gpu2d_src", ccm_base + 0x8280, 28);
> > - hws[IMX8MP_CLK_AUDIO_AXI_CG] =
> imx_clk_hw_gate3("audio_axi_cg",
> > "audio_axi_src", ccm_base + 0x8300, 28);
> > - hws[IMX8MP_CLK_HSIO_AXI_CG] = imx_clk_hw_gate3("hsio_axi_cg",
> > "hsio_axi_src", ccm_base + 0x8380, 28);
> > - hws[IMX8MP_CLK_MEDIA_ISP_CG] =
> imx_clk_hw_gate3("media_isp_cg",
> > "media_isp_src", ccm_base + 0x8400, 28);
> > - hws[IMX8MP_CLK_A53_DIV] = imx_clk_hw_divider2("arm_a53_div",
> > "arm_a53_cg", ccm_base + 0x8000, 0, 3);
> > - hws[IMX8MP_CLK_M7_DIV] = imx_clk_hw_divider2("arm_m7_div",
> > "arm_m7_cg", ccm_base + 0x8080, 0, 3);
> > - hws[IMX8MP_CLK_ML_DIV] = imx_clk_hw_divider2("ml_div", "ml_cg",
> > ccm_base + 0x8100, 0, 3);
> > - hws[IMX8MP_CLK_GPU3D_CORE_DIV] =
> > imx_clk_hw_divider2("gpu3d_core_div", "gpu3d_core_cg", ccm_base +
> > 0x8180, 0, 3);
> > - hws[IMX8MP_CLK_GPU3D_SHADER_DIV] =
> > imx_clk_hw_divider2("gpu3d_shader_div", "gpu3d_shader_cg", ccm_base +
> > 0x8200, 0, 3);
> > - hws[IMX8MP_CLK_GPU2D_DIV] = imx_clk_hw_divider2("gpu2d_div",
> > "gpu2d_cg", ccm_base + 0x8280, 0, 3);
> > - hws[IMX8MP_CLK_AUDIO_AXI_DIV] =
> > imx_clk_hw_divider2("audio_axi_div", "audio_axi_cg", ccm_base +
> > 0x8300, 0, 3);
> > - hws[IMX8MP_CLK_HSIO_AXI_DIV] =
> imx_clk_hw_divider2("hsio_axi_div",
> > "hsio_axi_cg", ccm_base + 0x8380, 0, 3);
> > - hws[IMX8MP_CLK_MEDIA_ISP_DIV] =
> > imx_clk_hw_divider2("media_isp_div", "media_isp_cg", ccm_base +
> > 0x8400, 0, 3);
> > + hws[IMX8MP_CLK_A53_DIV] =
> > imx8m_clk_hw_composite_core("arm_a53_div", imx8mp_a53_sels,
> ccm_base
> > + 0x8000);
> > + hws[IMX8MP_CLK_A53_SRC] = hws[IMX8MP_CLK_A53_DIV];
> > + hws[IMX8MP_CLK_A53_CG] = hws[IMX8MP_CLK_A53_DIV];
> > + hws[IMX8MP_CLK_M7_CORE] =
> > imx8m_clk_hw_composite_core("m7_core", imx8mp_m7_sels, ccm_base +
> > 0x8080);
> > + hws[IMX8MP_CLK_ML_CORE] =
> > imx8m_clk_hw_composite_core("ml_core", imx8mp_ml_sels, ccm_base +
> > 0x8100);
> > + hws[IMX8MP_CLK_GPU3D_CORE] =
> > imx8m_clk_hw_composite_core("gpu3d_core", imx8mp_gpu3d_core_sels,
> > ccm_base + 0x8180);
> > + hws[IMX8MP_CLK_GPU3D_SHADER_CORE] =
> > imx8m_clk_hw_composite("gpu3d_shader_core",
> imx8mp_gpu3d_shader_sels,
> > ccm_base + 0x8200);
> > + hws[IMX8MP_CLK_GPU2D_CORE] =
> > imx8m_clk_hw_composite("gpu2d_core", imx8mp_gpu2d_sels, ccm_base +
> > 0x8280);
> > + hws[IMX8MP_CLK_AUDIO_AXI] =
> imx8m_clk_hw_composite("audio_axi",
> > imx8mp_audio_axi_sels, ccm_base + 0x8300);
> > + hws[IMX8MP_CLK_AUDIO_AXI_SRC] = hws[IMX8MP_CLK_AUDIO_AXI];
> > + hws[IMX8MP_CLK_HSIO_AXI] = imx8m_clk_hw_composite("hsio_axi",
> > imx8mp_hsio_axi_sels, ccm_base + 0x8380);
> > + hws[IMX8MP_CLK_MEDIA_ISP] =
> imx8m_clk_hw_composite("media_isp",
> > +imx8mp_media_isp_sels, ccm_base + 0x8400);
> >
> > /* CORE SEL */
> > hws[IMX8MP_CLK_A53_CORE] = imx_clk_hw_mux2("arm_a53_core",
> ccm_base
> > + 0x9880, 24, 1, imx8mp_a53_core_sels,
> > ARRAY_SIZE(imx8mp_a53_core_sels));
> > @@ -713,8 +698,8 @@ static int imx8mp_clocks_probe(struct
> > platform_device
> > *pdev)
> > hws[IMX8MP_CLK_SDMA1_ROOT] =
> imx_clk_hw_gate4("sdma1_root_clk",
> > "ipg_root", ccm_base + 0x43a0, 0);
> > hws[IMX8MP_CLK_ENET_QOS_ROOT] =
> > imx_clk_hw_gate4("enet_qos_root_clk", "sim_enet_root_clk", ccm_base +
> > 0x43b0, 0);
> > hws[IMX8MP_CLK_SIM_ENET_ROOT] =
> > imx_clk_hw_gate4("sim_enet_root_clk", "enet_axi", ccm_base + 0x4400,
> 0);
> > - hws[IMX8MP_CLK_GPU2D_ROOT] =
> imx_clk_hw_gate4("gpu2d_root_clk",
> > "gpu2d_div", ccm_base + 0x4450, 0);
> > - hws[IMX8MP_CLK_GPU3D_ROOT] =
> imx_clk_hw_gate4("gpu3d_root_clk",
> > "gpu3d_core_div", ccm_base + 0x4460, 0);
> > + hws[IMX8MP_CLK_GPU2D_ROOT] =
> imx_clk_hw_gate4("gpu2d_root_clk",
> > "gpu2d_core", ccm_base + 0x4450, 0);
> > + hws[IMX8MP_CLK_GPU3D_ROOT] =
> imx_clk_hw_gate4("gpu3d_root_clk",
> > +"gpu3d_core", ccm_base + 0x4460, 0);
> > hws[IMX8MP_CLK_SNVS_ROOT] = imx_clk_hw_gate4("snvs_root_clk",
> > "ipg_root", ccm_base + 0x4470, 0);
> > hws[IMX8MP_CLK_UART1_ROOT] =
> imx_clk_hw_gate4("uart1_root_clk",
> > "uart1", ccm_base + 0x4490, 0);
> > hws[IMX8MP_CLK_UART2_ROOT] =
> imx_clk_hw_gate4("uart2_root_clk",
> > "uart2", ccm_base + 0x44a0, 0); @@ -731,7 +716,7 @@ static int
> > imx8mp_clocks_probe(struct platform_device *pdev)
> > hws[IMX8MP_CLK_GPU_ROOT] = imx_clk_hw_gate4("gpu_root_clk",
> > "gpu_axi", ccm_base + 0x4570, 0);
> > hws[IMX8MP_CLK_VPU_VC8KE_ROOT] =
> > imx_clk_hw_gate4("vpu_vc8ke_root_clk", "vpu_vc8000e", ccm_base +
> > 0x4590, 0);
> > hws[IMX8MP_CLK_VPU_G2_ROOT] =
> > imx_clk_hw_gate4("vpu_g2_root_clk", "vpu_g2", ccm_base + 0x45a0, 0);
> > - hws[IMX8MP_CLK_NPU_ROOT] = imx_clk_hw_gate4("npu_root_clk",
> > "ml_div", ccm_base + 0x45b0, 0);
> > + hws[IMX8MP_CLK_NPU_ROOT] = imx_clk_hw_gate4("npu_root_clk",
> > "ml_core",
> > +ccm_base + 0x45b0, 0);
> > hws[IMX8MP_CLK_HSIO_ROOT] = imx_clk_hw_gate4("hsio_root_clk",
> > "ipg_root", ccm_base + 0x45c0, 0);
> > hws[IMX8MP_CLK_MEDIA_APB_ROOT] =
> > imx_clk_hw_gate2_shared2("media_apb_root_clk", "media_apb",
> ccm_base +
> > 0x45d0, 0, &share_count_media);
> > hws[IMX8MP_CLK_MEDIA_AXI_ROOT] =
> > imx_clk_hw_gate2_shared2("media_axi_root_clk", "media_axi", ccm_base
> +
> > 0x45d0, 0, &share_count_media); @@ -739,7 +724,7 @@ static int
> > imx8mp_clocks_probe(struct platform_device *pdev)
> > hws[IMX8MP_CLK_MEDIA_CAM2_PIX_ROOT] =
> > imx_clk_hw_gate2_shared2("media_cam2_pix_root_clk",
> "media_cam2_pix",
> > ccm_base + 0x45d0, 0, &share_count_media);
> > hws[IMX8MP_CLK_MEDIA_DISP1_PIX_ROOT] =
> > imx_clk_hw_gate2_shared2("media_disp1_pix_root_clk",
> > "media_disp1_pix", ccm_base + 0x45d0, 0, &share_count_media);
> > hws[IMX8MP_CLK_MEDIA_DISP2_PIX_ROOT] =
> > imx_clk_hw_gate2_shared2("media_disp2_pix_root_clk",
> > "media_disp2_pix", ccm_base + 0x45d0, 0, &share_count_media);
> > - hws[IMX8MP_CLK_MEDIA_ISP_ROOT] =
> > imx_clk_hw_gate2_shared2("media_isp_root_clk", "media_isp_div",
> > ccm_base
> > + 0x45d0, 0, &share_count_media);
> > + hws[IMX8MP_CLK_MEDIA_ISP_ROOT] =
> > +imx_clk_hw_gate2_shared2("media_isp_root_clk", "media_isp",
> ccm_base
> > ++ 0x45d0, 0, &share_count_media);
> >
> > hws[IMX8MP_CLK_USDHC3_ROOT] =
> > imx_clk_hw_gate4("usdhc3_root_clk", "usdhc3", ccm_base + 0x45e0, 0);
> > hws[IMX8MP_CLK_HDMI_ROOT] = imx_clk_hw_gate4("hdmi_root_clk",
> > "hdmi_axi", ccm_base + 0x45f0, 0); diff --git
> > a/include/dt-bindings/clock/imx8mp-clock.h
> > b/include/dt-bindings/clock/imx8mp-clock.h
> > index 46c69cd66c62..8430bc4fd182 100644
> > --- a/include/dt-bindings/clock/imx8mp-clock.h
> > +++ b/include/dt-bindings/clock/imx8mp-clock.h
> > @@ -313,6 +313,15 @@
> > #define IMX8MP_SYS_PLL2_333M_CG 303
> > #define IMX8MP_SYS_PLL2_500M_CG 304
> >
> > -#define IMX8MP_CLK_END 305
> > +#define IMX8MP_CLK_M7_CORE 305
> > +#define IMX8MP_CLK_ML_CORE 306
> > +#define IMX8MP_CLK_GPU3D_CORE 307
> > +#define IMX8MP_CLK_GPU3D_SHADER_CORE 308
> > +#define IMX8MP_CLK_GPU2D_CORE 309
> > +#define IMX8MP_CLK_AUDIO_AXI 310
> > +#define IMX8MP_CLK_HSIO_AXI 311
> > +#define IMX8MP_CLK_MEDIA_ISP 312
> > +
> > +#define IMX8MP_CLK_END 313
> >
> > #endif
> > --
> > 2.16.4

Next message: Peng Fan: "RE: [PATCH V2 06/10] clk: imx8m: migrate A53 clk root to use composite core"
Previous message: Johan Jonker: "Re: [PATCH v2 2/3] arm64: dts: rockchip: rk3399-roc-pc: Fix MMC numbering for LED triggers"
In reply to: Aisheng Dong: "RE: [PATCH V2 05/10] clk: imx8mp: use imx8m_clk_hw_composite_core to simplify code"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]