clk: imx8mm: rename lcdif pixel clock
PATCH RESEND 1/2 clk: imx8mm: rename lcdif pixel clock
Rename 'lcdif' pixel clock related names to 'disp' names, since:
First, the lcdif pixel clock is not supplied to LCDIF controller directly, but to some LPCG clock in display mix. So rename it to 'disp' pixel clock is more accurate.
Second, in the imx8mn CCM specification which is designed after imx8mm, this same pixel root clock name has been modified from 'LCDIF_PIXEL_CLK_ROOT' to 'DISPLAY_PIXEL_CLK_ROOT'.
--- drivers/clk/imx/clk-imx8mm.c | 4 ++-- include/dt-bindings/clock/imx8mm-clock.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/clk/imx/clk-imx8mm.c +2 -2
@@ -210,7 +210,7 @@ static const char *imx8mm_pcie1_aux_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pstatic const char *imx8mm_dc_pixel_sels[] = {"osc_24m" ,"video_pll1_out" ,"audio_pll2_out" ,"audio_pll1_out" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" ,"clk_ext4" , }; -static const char *imx8mm_lcdif_pixel_sels[] = {"osc_24m" ,"video_pll1_out" ,"audio_pll2_out" ,"audio_pll1_out" , +static const char *imx8mm_disp_pixel_sels[] = {"osc_24m" ,"video_pll1_out" ,"audio_pll2_out" ,"audio_pll1_out" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" ,"clk_ext4" , };static const char *imx8mm_sai1_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" ,"video_pll1_out" ,
@@ -535,7 +535,7 @@ static int __init imx8mm_clocks_init(struct device_node *ccm_node) clks[IMX8MM_CLK_PCIE1_PHY ] =imx8m_clk_composite ("pcie1_phy" , imx8mm_pcie1_phy_sels, base +0xa380 ); clks[IMX8MM_CLK_PCIE1_AUX ] =imx8m_clk_composite ("pcie1_aux" , imx8mm_pcie1_aux_sels, base +0xa400 ); clks[IMX8MM_CLK_DC_PIXEL ] =imx8m_clk_composite ("dc_pixel" , imx8mm_dc_pixel_sels, base +0xa480 ); - clks[IMX8MM_CLK_LCDIF_PIXEL ] =imx8m_clk_composite ("lcdif_pixel" , imx8mm_lcdif_pixel_sels, base +0xa500 ); + clks[IMX8MM_CLK_DISP_PIXEL ] =imx8m_clk_composite ("disp_pixel" , imx8mm_disp_pixel_sels, base +0xa500 ); clks[IMX8MM_CLK_SAI1 ] =imx8m_clk_composite ("sai1" , imx8mm_sai1_sels, base +0xa580 ); clks[IMX8MM_CLK_SAI2 ] =imx8m_clk_composite ("sai2" , imx8mm_sai2_sels, base +0xa600 ); clks[IMX8MM_CLK_SAI3 ] =imx8m_clk_composite ("sai3" , imx8mm_sai3_sels, base +0xa680 );
include/dt-bindings/clock/imx8mm-clock.h +1 -1
@@ -119,7 +119,7 @@#define IMX8MM_CLK_PCIE1_PHY 104#define IMX8MM_CLK_PCIE1_AUX 105#define IMX8MM_CLK_DC_PIXEL 106 -#define IMX8MM_CLK_LCDIF_PIXEL 107 +#define IMX8MM_CLK_DISP_PIXEL 107#define IMX8MM_CLK_SAI1 108#define IMX8MM_CLK_SAI2 109#define IMX8MM_CLK_SAI3 110
Signature · 1 line
2.17.1
PATCH RESEND 2/2 clk: imx8mm: rename 'share_count_dcss' to 'share_count_disp'
Rename 'share_count_dcss' to 'share_count_disp', since the DCSS module does not exist on imx8mm platform. So rename it to avoid any unnecessary confusion.
--- drivers/clk/imx/clk-imx8mm.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/clk/imx/clk-imx8mm.c +5 -5
@@ -22,7 +22,7 @@ static u32 share_count_sai3;static u32 share_count_sai4;static u32 share_count_sai5;static u32 share_count_sai6; -static u32 share_count_dcss; +static u32 share_count_disp;static u32 share_count_pdm;static u32 share_count_nand;
@@ -644,10 +644,10 @@ static int __init imx8mm_clocks_init(struct device_node *ccm_node) clks[IMX8MM_CLK_VPU_G2_ROOT ] =imx_clk_gate4 ("vpu_g2_root_clk" ,"vpu_g2" , base +0x45a0 ,0 ); clks[IMX8MM_CLK_PDM_ROOT ] =imx_clk_gate2_shared2 ("pdm_root_clk" ,"pdm" , base +0x45b0 ,0 , &share_count_pdm); clks[IMX8MM_CLK_PDM_IPG ] =imx_clk_gate2_shared2 ("pdm_ipg_clk" ,"ipg_audio_root" , base +0x45b0 ,0 , &share_count_pdm); - clks[IMX8MM_CLK_DISP_ROOT ] =imx_clk_gate2_shared2 ("disp_root_clk" ,"disp_dc8000" , base +0x45d0 ,0 , &share_count_dcss); - clks[IMX8MM_CLK_DISP_AXI_ROOT ] =imx_clk_gate2_shared2 ("disp_axi_root_clk" ,"disp_axi" , base +0x45d0 ,0 , &share_count_dcss); - clks[IMX8MM_CLK_DISP_APB_ROOT ] =imx_clk_gate2_shared2 ("disp_apb_root_clk" ,"disp_apb" , base +0x45d0 ,0 , &share_count_dcss); - clks[IMX8MM_CLK_DISP_RTRM_ROOT ] =imx_clk_gate2_shared2 ("disp_rtrm_root_clk" ,"disp_rtrm" , base +0x45d0 ,0 , &share_count_dcss); + clks[IMX8MM_CLK_DISP_ROOT ] =imx_clk_gate2_shared2 ("disp_root_clk" ,"disp_dc8000" , base +0x45d0 ,0 , &share_count_disp); + clks[IMX8MM_CLK_DISP_AXI_ROOT ] =imx_clk_gate2_shared2 ("disp_axi_root_clk" ,"disp_axi" , base +0x45d0 ,0 , &share_count_disp); + clks[IMX8MM_CLK_DISP_APB_ROOT ] =imx_clk_gate2_shared2 ("disp_apb_root_clk" ,"disp_apb" , base +0x45d0 ,0 , &share_count_disp); + clks[IMX8MM_CLK_DISP_RTRM_ROOT ] =imx_clk_gate2_shared2 ("disp_rtrm_root_clk" ,"disp_rtrm" , base +0x45d0 ,0 , &share_count_disp); clks[IMX8MM_CLK_USDHC3_ROOT ] =imx_clk_gate4 ("usdhc3_root_clk" ,"usdhc3" , base +0x45e0 ,0 ); clks[IMX8MM_CLK_TMU_ROOT ] =imx_clk_gate4 ("tmu_root_clk" ,"ipg_root" , base +0x4620 ,0 ); clks[IMX8MM_CLK_VPU_DEC_ROOT ] =imx_clk_gate4 ("vpu_dec_root_clk" ,"vpu_bus" , base +0x4630 ,0 );
Signature · 1 line
2.17.1
Quoted 11 lines · Fancy Fang
Rename 'lcdif' pixel clock related names to 'disp' names, since:
First, the lcdif pixel clock is not supplied to LCDIF controller directly, but to some LPCG clock in display mix. So rename it to 'disp' pixel clock is more accurate.
Second, in the imx8mn CCM specification which is designed after imx8mm, this same pixel root clock name has been modified from '
LCDIF_PIXEL_CLK_ROOT' to 'DISPLAY_PIXEL_CLK_ROOT'.Signed-off-by Fancy Fang <[email protected]>
For the entire series.
Quoted 43 lines
--- drivers/clk/imx/clk-imx8mm.c | 4 ++-- include/dt-bindings/clock/imx8mm-clock.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)drivers/clk/imx/clk-imx8mm.c +2
-2@@ -210,7 +210,7 @@ static const char *imx8mm_pcie1_aux_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pstatic const char *imx8mm_dc_pixel_sels[] = {"osc_24m" ,"video_pll1_out" ,"audio_pll2_out" ,"audio_pll1_out" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" ,"clk_ext4" , }; -static const char *imx8mm_lcdif_pixel_sels[] = {"osc_24m" ,"video_pll1_out" ,"audio_pll2_out" ,"audio_pll1_out" , +static const char *imx8mm_disp_pixel_sels[] = {"osc_24m" ,"video_pll1_out" ,"audio_pll2_out" ,"audio_pll1_out" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" ,"clk_ext4" , };static const char *imx8mm_sai1_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" ,"video_pll1_out" ,@@ -535,7 +535,7 @@ static int __init imx8mm_clocks_init(struct device_node *ccm_node) clks[IMX8MM_CLK_PCIE1_PHY ] =imx8m_clk_composite ("pcie1_phy" , imx8mm_pcie1_phy_sels, base +0xa380 ); clks[IMX8MM_CLK_PCIE1_AUX ] =imx8m_clk_composite ("pcie1_aux" , imx8mm_pcie1_aux_sels, base +0xa400 ); clks[IMX8MM_CLK_DC_PIXEL ] =imx8m_clk_composite ("dc_pixel" , imx8mm_dc_pixel_sels, base +0xa480 ); - clks[IMX8MM_CLK_LCDIF_PIXEL ] =imx8m_clk_composite ("lcdif_pixel" , imx8mm_lcdif_pixel_sels, base +0xa500 ); + clks[IMX8MM_CLK_DISP_PIXEL ] =imx8m_clk_composite ("disp_pixel" , imx8mm_disp_pixel_sels, base +0xa500 ); clks[IMX8MM_CLK_SAI1 ] =imx8m_clk_composite ("sai1" , imx8mm_sai1_sels, base +0xa580 ); clks[IMX8MM_CLK_SAI2 ] =imx8m_clk_composite ("sai2" , imx8mm_sai2_sels, base +0xa600 ); clks[IMX8MM_CLK_SAI3 ] =imx8m_clk_composite ("sai3" , imx8mm_sai3_sels, base +0xa680 );include/dt-bindings/clock/imx8mm-clock.h +1
-1@@ -119,7 +119,7 @@#define IMX8MM_CLK_PCIE1_PHY 104#define IMX8MM_CLK_PCIE1_AUX 105#define IMX8MM_CLK_DC_PIXEL 106 -#define IMX8MM_CLK_LCDIF_PIXEL 107 +#define IMX8MM_CLK_DISP_PIXEL 107#define IMX8MM_CLK_SAI1 108#define IMX8MM_CLK_SAI2 109#define IMX8MM_CLK_SAI3 110Signature · 1 line
2.17.1
Quoted 6 lines · Fancy Fang
Rename 'lcdif' pixel clock related names to 'disp' names, since:
First, the lcdif pixel clock is not supplied to LCDIF controller directly, but to some LPCG clock in display mix. So rename it to 'disp' pixel clock is more accurate.
Quoted 6 lines
Second, in the imx8mn CCM specification which is designed after imx8mm, this same pixel root clock name has been modified from '
LCDIF_PIXEL_CLK_ROOT' to 'DISPLAY_PIXEL_CLK_ROOT'.Signed-off-by Fancy Fang <[email protected]>---
When you resend patches, please state the reason for resending.
Shawn
Quoted 42 lines
drivers/clk/imx/clk-imx8mm.c | 4 ++-- include/dt-bindings/clock/imx8mm-clock.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)drivers/clk/imx/clk-imx8mm.c +2
-2@@ -210,7 +210,7 @@ static const char *imx8mm_pcie1_aux_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pstatic const char *imx8mm_dc_pixel_sels[] = {"osc_24m" ,"video_pll1_out" ,"audio_pll2_out" ,"audio_pll1_out" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" ,"clk_ext4" , }; -static const char *imx8mm_lcdif_pixel_sels[] = {"osc_24m" ,"video_pll1_out" ,"audio_pll2_out" ,"audio_pll1_out" , +static const char *imx8mm_disp_pixel_sels[] = {"osc_24m" ,"video_pll1_out" ,"audio_pll2_out" ,"audio_pll1_out" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" ,"clk_ext4" , };static const char *imx8mm_sai1_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" ,"video_pll1_out" ,@@ -535,7 +535,7 @@ static int __init imx8mm_clocks_init(struct device_node *ccm_node) clks[IMX8MM_CLK_PCIE1_PHY ] =imx8m_clk_composite ("pcie1_phy" , imx8mm_pcie1_phy_sels, base +0xa380 ); clks[IMX8MM_CLK_PCIE1_AUX ] =imx8m_clk_composite ("pcie1_aux" , imx8mm_pcie1_aux_sels, base +0xa400 ); clks[IMX8MM_CLK_DC_PIXEL ] =imx8m_clk_composite ("dc_pixel" , imx8mm_dc_pixel_sels, base +0xa480 ); - clks[IMX8MM_CLK_LCDIF_PIXEL ] =imx8m_clk_composite ("lcdif_pixel" , imx8mm_lcdif_pixel_sels, base +0xa500 ); + clks[IMX8MM_CLK_DISP_PIXEL ] =imx8m_clk_composite ("disp_pixel" , imx8mm_disp_pixel_sels, base +0xa500 ); clks[IMX8MM_CLK_SAI1 ] =imx8m_clk_composite ("sai1" , imx8mm_sai1_sels, base +0xa580 ); clks[IMX8MM_CLK_SAI2 ] =imx8m_clk_composite ("sai2" , imx8mm_sai2_sels, base +0xa600 ); clks[IMX8MM_CLK_SAI3 ] =imx8m_clk_composite ("sai3" , imx8mm_sai3_sels, base +0xa680 );include/dt-bindings/clock/imx8mm-clock.h +1
-1@@ -119,7 +119,7 @@#define IMX8MM_CLK_PCIE1_PHY 104#define IMX8MM_CLK_PCIE1_AUX 105#define IMX8MM_CLK_DC_PIXEL 106 -#define IMX8MM_CLK_LCDIF_PIXEL 107 +#define IMX8MM_CLK_DISP_PIXEL 107#define IMX8MM_CLK_SAI1 108#define IMX8MM_CLK_SAI2 109#define IMX8MM_CLK_SAI3 110Signature · 1 line
2.17.1