clk: imx8mn: miscellaneous cleanups and bug fixes
v2 cover clk: imx8mn: miscellaneous cleanups and bug fixes
This series has been tested on the BSH SystemMaster (SMM) S2 board.
Changes in v2:
- Update the commit message.
- Add Fixes tag.
- Maintain IMX8MN_VPU_* constants to not break backward compatibility.
- Update the commit message.
- Add Fixes tag.
- Maintain IMX8MN_VIDEO_PLL1* constants to not break backward compatibility.
Dario Binacchi (5):
clk: imx8mn: rename vpu_pll to m7_alt_pll
clk: imx: replace osc_hdmi with dummy
clk: imx: rename video_pll1 to video_pll
clk: imx8mn: fix imx8mn_sai2_sels clocks list
clk: imx8mn: fix imx8mn_enet_phy_sels clocks list
drivers/clk/imx/clk-imx8mn.c | 116 +++++++++++------------ include/dt-bindings/clock/imx8mn-clock.h | 24 +++-- 2 files changed, 74 insertions(+), 66 deletions(-)
Signature · 1 line
2.32.0
PATCH v2 1/5 clk: imx8mn: rename vpu_pll to m7_alt_pll
The IMX8MN platform does not have any video processing unit (VPU), and indeed in the reference manual (document IMX8MNRM Rev 2, 07/2022) there is no occurrence of its pll. From an analysis of the code and the RM itself, I think vpu pll is used instead of m7 alternate pll, probably for copy and paste of code taken from modules of similar architectures.
As an example for all, if we consider the second row of the "Clock Root" table of chapter 5 (Clocks and Power Management) of the RM:
Clock Root offset Source Select (CCM_TARGET_ROOTn[MUX])
... ... ...
ARM_M7_CLK_ROOT 0x8080 000 - 24M_REF_CLK
001 - SYSTEM_PLL2_DIV5
010 - SYSTEM_PLL2_DIV4
011 - M7_ALT_PLL_CLK
100 - SYSTEM_PLL1_CLK
101 - AUDIO_PLL1_CLK
110 - VIDEO_PLL_CLK
111 - SYSTEM_PLL3_CLK
... ... ...but in the source code, the imx8mn_m7_sels clocks list contains vpu_pll for the source select bits 011b.
So, let's rename "vpu_pll" to "m7_alt_pll" to be consistent with the RM.
The IMX8MN_VPU_* constants have not been removed to ensure backward compatibility of the patch.
No functional changes intended.
---
Changes in v2:
- Update the commit message.
- Add Fixes tag.
- Maintain IMX8MN_VPU_* constants to not break backward compatibility.
drivers/clk/imx/clk-imx8mn.c | 16 ++++++++-------- include/dt-bindings/clock/imx8mn-clock.h | 12 ++++++++---- 2 files changed, 16 insertions(+), 12 deletions(-)
drivers/clk/imx/clk-imx8mn.c +8 -8
@@ -30,7 +30,7 @@ static const char * const audio_pll2_bypass_sels[] = {"audio_pll2", "audio_pll2_static const char *const video_pll1_bypass_sels[] = {"video_pll1" ,"video_pll1_ref_sel" , };static const char *const dram_pll_bypass_sels[] = {"dram_pll" ,"dram_pll_ref_sel" , };static const char *const gpu_pll_bypass_sels[] = {"gpu_pll" ,"gpu_pll_ref_sel" , }; -static const char *const vpu_pll_bypass_sels[] = {"vpu_pll" ,"vpu_pll_ref_sel" , }; +static const char *const m7_alt_pll_bypass_sels[] = {"m7_alt_pll" ,"m7_alt_pll_ref_sel" , };static const char *const arm_pll_bypass_sels[] = {"arm_pll" ,"arm_pll_ref_sel" , };static const char *const sys_pll3_bypass_sels[] = {"sys_pll3" ,"sys_pll3_ref_sel" , };
@@ -40,7 +40,7 @@ static const char * const imx8mn_a53_sels[] = {"osc_24m", "arm_pll_out", "sys_plstatic const char *const imx8mn_a53_core_sels[] = {"arm_a53_div" ,"arm_pll_out" , }; -static const char *const imx8mn_m7_sels[] = {"osc_24m" ,"sys_pll2_200m" ,"sys_pll2_250m" ,"vpu_pll_out" , +static const char *const imx8mn_m7_sels[] = {"osc_24m" ,"sys_pll2_200m" ,"sys_pll2_250m" ,"m7_alt_pll_out" ,"sys_pll1_800m" ,"audio_pll1_out" ,"video_pll1_out" ,"sys_pll3_out" , };static const char *const imx8mn_gpu_core_sels[] = {"osc_24m" ,"gpu_pll_out" ,"sys_pll1_800m" ,
@@ -252,10 +252,10 @@ static const char * const imx8mn_gpt6_sels[] = {"osc_24m", "sys_pll2_100m", "sys "audio_pll1_out", "clk_ext1", };static const char *const imx8mn_wdog_sels[] = {"osc_24m" ,"sys_pll1_133m" ,"sys_pll1_160m" , -"vpu_pll_out" ,"sys_pll2_125m" ,"sys_pll3_out" , +"m7_alt_pll_out" ,"sys_pll2_125m" ,"sys_pll3_out" ,"sys_pll1_80m" ,"sys_pll2_166m" , }; -static const char *const imx8mn_wrclk_sels[] = {"osc_24m" ,"sys_pll1_40m" ,"vpu_pll_out" , +static const char *const imx8mn_wrclk_sels[] = {"osc_24m" ,"sys_pll1_40m" ,"m7_alt_pll_out" ,"sys_pll3_out" ,"sys_pll2_200m" ,"sys_pll1_266m" ,"sys_pll2_500m" ,"sys_pll1_100m" , };
@@ -352,7 +352,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_VIDEO_PLL1_REF_SEL ] =imx_clk_hw_mux ("video_pll1_ref_sel" , base +0x28 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); hws[IMX8MN_DRAM_PLL_REF_SEL ] =imx_clk_hw_mux ("dram_pll_ref_sel" , base +0x50 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); hws[IMX8MN_GPU_PLL_REF_SEL ] =imx_clk_hw_mux ("gpu_pll_ref_sel" , base +0x64 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); - hws[IMX8MN_VPU_PLL_REF_SEL ] =imx_clk_hw_mux ("vpu_pll_ref_sel" , base +0x74 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); + hws[IMX8MN_M7_ALT_PLL_REF_SEL ] =imx_clk_hw_mux ("m7_alt_pll_ref_sel" , base +0x74 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); hws[IMX8MN_ARM_PLL_REF_SEL ] =imx_clk_hw_mux ("arm_pll_ref_sel" , base +0x84 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); hws[IMX8MN_SYS_PLL3_REF_SEL ] =imx_clk_hw_mux ("sys_pll3_ref_sel" , base +0x114 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels));
@@ -361,7 +361,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_VIDEO_PLL1 ] =imx_clk_hw_pll14xx ("video_pll1" ,"video_pll1_ref_sel" , base +0x28 , &imx_1443x_pll); hws[IMX8MN_DRAM_PLL ] =imx_clk_hw_pll14xx ("dram_pll" ,"dram_pll_ref_sel" , base +0x50 , &imx_1443x_dram_pll); hws[IMX8MN_GPU_PLL ] =imx_clk_hw_pll14xx ("gpu_pll" ,"gpu_pll_ref_sel" , base +0x64 , &imx_1416x_pll); - hws[IMX8MN_VPU_PLL ] =imx_clk_hw_pll14xx ("vpu_pll" ,"vpu_pll_ref_sel" , base +0x74 , &imx_1416x_pll); + hws[IMX8MN_M7_ALT_PLL ] =imx_clk_hw_pll14xx ("m7_alt_pll" ,"m7_alt_pll_ref_sel" , base +0x74 , &imx_1416x_pll); hws[IMX8MN_ARM_PLL ] =imx_clk_hw_pll14xx ("arm_pll" ,"arm_pll_ref_sel" , base +0x84 , &imx_1416x_pll); hws[IMX8MN_SYS_PLL1 ] =imx_clk_hw_fixed ("sys_pll1" ,800000000 ); hws[IMX8MN_SYS_PLL2 ] =imx_clk_hw_fixed ("sys_pll2" ,1000000000 );
@@ -373,7 +373,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_VIDEO_PLL1_BYPASS ] =imx_clk_hw_mux_flags ("video_pll1_bypass" , base +0x28 ,16 ,1 , video_pll1_bypass_sels,ARRAY_SIZE (video_pll1_bypass_sels),CLK_SET_RATE_PARENT ); hws[IMX8MN_DRAM_PLL_BYPASS ] =imx_clk_hw_mux_flags ("dram_pll_bypass" , base +0x50 ,16 ,1 , dram_pll_bypass_sels,ARRAY_SIZE (dram_pll_bypass_sels),CLK_SET_RATE_PARENT ); hws[IMX8MN_GPU_PLL_BYPASS ] =imx_clk_hw_mux_flags ("gpu_pll_bypass" , base +0x64 ,28 ,1 , gpu_pll_bypass_sels,ARRAY_SIZE (gpu_pll_bypass_sels),CLK_SET_RATE_PARENT ); - hws[IMX8MN_VPU_PLL_BYPASS ] =imx_clk_hw_mux_flags ("vpu_pll_bypass" , base +0x74 ,28 ,1 , vpu_pll_bypass_sels,ARRAY_SIZE (vpu_pll_bypass_sels),CLK_SET_RATE_PARENT ); + hws[IMX8MN_M7_ALT_PLL_BYPASS ] =imx_clk_hw_mux_flags ("m7_alt_pll_bypass" , base +0x74 ,28 ,1 , m7_alt_pll_bypass_sels,ARRAY_SIZE (m7_alt_pll_bypass_sels),CLK_SET_RATE_PARENT ); hws[IMX8MN_ARM_PLL_BYPASS ] =imx_clk_hw_mux_flags ("arm_pll_bypass" , base +0x84 ,28 ,1 , arm_pll_bypass_sels,ARRAY_SIZE (arm_pll_bypass_sels),CLK_SET_RATE_PARENT ); hws[IMX8MN_SYS_PLL3_BYPASS ] =imx_clk_hw_mux_flags ("sys_pll3_bypass" , base +0x114 ,28 ,1 , sys_pll3_bypass_sels,ARRAY_SIZE (sys_pll3_bypass_sels),CLK_SET_RATE_PARENT );
@@ -383,7 +383,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_VIDEO_PLL1_OUT ] =imx_clk_hw_gate ("video_pll1_out" ,"video_pll1_bypass" , base +0x28 ,13 ); hws[IMX8MN_DRAM_PLL_OUT ] =imx_clk_hw_gate ("dram_pll_out" ,"dram_pll_bypass" , base +0x50 ,13 ); hws[IMX8MN_GPU_PLL_OUT ] =imx_clk_hw_gate ("gpu_pll_out" ,"gpu_pll_bypass" , base +0x64 ,11 ); - hws[IMX8MN_VPU_PLL_OUT ] =imx_clk_hw_gate ("vpu_pll_out" ,"vpu_pll_bypass" , base +0x74 ,11 ); + hws[IMX8MN_M7_ALT_PLL_OUT ] =imx_clk_hw_gate ("m7_alt_pll_out" ,"m7_alt_pll_bypass" , base +0x74 ,11 ); hws[IMX8MN_ARM_PLL_OUT ] =imx_clk_hw_gate ("arm_pll_out" ,"arm_pll_bypass" , base +0x84 ,11 ); hws[IMX8MN_SYS_PLL3_OUT ] =imx_clk_hw_gate ("sys_pll3_out" ,"sys_pll3_bypass" , base +0x114 ,11 );
include/dt-bindings/clock/imx8mn-clock.h +8 -4
@@ -19,7 +19,8 @@#define IMX8MN_VIDEO_PLL1_REF_SEL 10#define IMX8MN_DRAM_PLL_REF_SEL 11#define IMX8MN_GPU_PLL_REF_SEL 12 -#define IMX8MN_VPU_PLL_REF_SEL 13 +#define IMX8MN_M7_ALT_PLL_REF_SEL 13 +#define IMX8MN_VPU_PLL_REF_SEL IMX8MN_M7_ALT_PLL_REF_SEL#define IMX8MN_ARM_PLL_REF_SEL 14#define IMX8MN_SYS_PLL1_REF_SEL 15#define IMX8MN_SYS_PLL2_REF_SEL 16
@@ -29,7 +30,8 @@#define IMX8MN_VIDEO_PLL1 20#define IMX8MN_DRAM_PLL 21#define IMX8MN_GPU_PLL 22 -#define IMX8MN_VPU_PLL 23 +#define IMX8MN_M7_ALT_PLL 23 +#define IMX8MN_VPU_PLL IMX8MN_M7_ALT_PLL#define IMX8MN_ARM_PLL 24#define IMX8MN_SYS_PLL1 25#define IMX8MN_SYS_PLL2 26
@@ -39,7 +41,8 @@#define IMX8MN_VIDEO_PLL1_BYPASS 30#define IMX8MN_DRAM_PLL_BYPASS 31#define IMX8MN_GPU_PLL_BYPASS 32 -#define IMX8MN_VPU_PLL_BYPASS 33 +#define IMX8MN_M7_ALT_PLL_BYPASS 33 +#define IMX8MN_VPU_PLL_BYPASS IMX8MN_M7_ALT_PLL_BYPASS#define IMX8MN_ARM_PLL_BYPASS 34#define IMX8MN_SYS_PLL1_BYPASS 35#define IMX8MN_SYS_PLL2_BYPASS 36
@@ -49,7 +52,8 @@#define IMX8MN_VIDEO_PLL1_OUT 40#define IMX8MN_DRAM_PLL_OUT 41#define IMX8MN_GPU_PLL_OUT 42 -#define IMX8MN_VPU_PLL_OUT 43 +#define IMX8MN_M7_ALT_PLL_OUT 43 +#define IMX8MN_VPU_PLL_OUT IMX8MN_M7_ALT_PLL_OUT#define IMX8MN_ARM_PLL_OUT 44#define IMX8MN_SYS_PLL1_OUT 45#define IMX8MN_SYS_PLL2_OUT 46
Signature · 1 line
2.32.0
Re: [PATCH v2 1/5] clk: imx8mn: rename vpu_pll to m7_alt_pll
Quoted 26 lines · Dario Binacchi
The IMX8MN platform does not have any video processing unit (VPU), and indeed in the reference manual (document IMX8MNRM Rev 2, 07/2022) there is no occurrence of its pll. From an analysis of the code and the RM itself, I think vpu pll is used instead of m7 alternate pll, probably for copy and paste of code taken from modules of similar architectures.
As an example for all, if we consider the second row of the "Clock Root" table of chapter 5 (Clocks and Power Management) of the RM:
Clock Root offset Source Select (CCM_TARGET_ROOTn[MUX])
... ... ...
ARM_M7_CLK_ROOT0x8080000 - 24M_REF_CLK001 - SYSTEM_PLL2_DIV5 010 - SYSTEM_PLL2_DIV4 011 - M7_ALT_PLL_CLK 100 - SYSTEM_PLL1_CLK 101 - AUDIO_PLL1_CLK 110 - VIDEO_PLL_CLK 111 - SYSTEM_PLL3_CLK ... ... ...but in the source code, the
imx8mn_m7_selsclocks list containsvpu_pllfor the source select bits 011b.So, let's rename "
vpu_pll" to "m7_alt_pll" to be consistent with the RM.
Quoted 8 lines
The IMX8MN_VPU_* constants have not been removed to ensure backward compatibility of the patch.
No functional changes intended.
Fixes 96d6392b54dbb ("clk: imx: Add support for i.MX8MN clock driver")Signed-off-by Dario Binacchi <[email protected]>
Quoted 129 lines
---
Changes in v2:
- Update the commit message.
- Add Fixes tag.
- Maintain IMX8MN_VPU_* constants to not break backward compatibility.drivers/clk/imx/clk-imx8mn.c | 16 ++++++++-------- include/dt-bindings/clock/imx8mn-clock.h | 12 ++++++++---- 2 files changed, 16 insertions(+), 12 deletions(-)drivers/clk/imx/clk-imx8mn.c +8
-8@@ -30,7 +30,7 @@ static const char * const audio_pll2_bypass_sels[] = {"audio_pll2", "audio_pll2_static const char *const video_pll1_bypass_sels[] = {"video_pll1" ,"video_pll1_ref_sel" , };static const char *const dram_pll_bypass_sels[] = {"dram_pll" ,"dram_pll_ref_sel" , };static const char *const gpu_pll_bypass_sels[] = {"gpu_pll" ,"gpu_pll_ref_sel" , }; -static const char *const vpu_pll_bypass_sels[] = {"vpu_pll" ,"vpu_pll_ref_sel" , }; +static const char *const m7_alt_pll_bypass_sels[] = {"m7_alt_pll" ,"m7_alt_pll_ref_sel" , };static const char *const arm_pll_bypass_sels[] = {"arm_pll" ,"arm_pll_ref_sel" , };static const char *const sys_pll3_bypass_sels[] = {"sys_pll3" ,"sys_pll3_ref_sel" , };@@ -40,7 +40,7 @@ static const char * const imx8mn_a53_sels[] = {"osc_24m", "arm_pll_out", "sys_plstatic const char *const imx8mn_a53_core_sels[] = {"arm_a53_div" ,"arm_pll_out" , }; -static const char *const imx8mn_m7_sels[] = {"osc_24m" ,"sys_pll2_200m" ,"sys_pll2_250m" ,"vpu_pll_out" , +static const char *const imx8mn_m7_sels[] = {"osc_24m" ,"sys_pll2_200m" ,"sys_pll2_250m" ,"m7_alt_pll_out" ,"sys_pll1_800m" ,"audio_pll1_out" ,"video_pll1_out" ,"sys_pll3_out" , };static const char *const imx8mn_gpu_core_sels[] = {"osc_24m" ,"gpu_pll_out" ,"sys_pll1_800m" ,@@ -252,10 +252,10 @@ static const char * const imx8mn_gpt6_sels[] = {"osc_24m", "sys_pll2_100m", "sys "audio_pll1_out", "clk_ext1", };static const char *const imx8mn_wdog_sels[] = {"osc_24m" ,"sys_pll1_133m" ,"sys_pll1_160m" , -"vpu_pll_out" ,"sys_pll2_125m" ,"sys_pll3_out" , +"m7_alt_pll_out" ,"sys_pll2_125m" ,"sys_pll3_out" ,"sys_pll1_80m" ,"sys_pll2_166m" , }; -static const char *const imx8mn_wrclk_sels[] = {"osc_24m" ,"sys_pll1_40m" ,"vpu_pll_out" , +static const char *const imx8mn_wrclk_sels[] = {"osc_24m" ,"sys_pll1_40m" ,"m7_alt_pll_out" ,"sys_pll3_out" ,"sys_pll2_200m" ,"sys_pll1_266m" ,"sys_pll2_500m" ,"sys_pll1_100m" , };@@ -352,7 +352,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_VIDEO_PLL1_REF_SEL ] =imx_clk_hw_mux ("video_pll1_ref_sel" , base +0x28 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); hws[IMX8MN_DRAM_PLL_REF_SEL ] =imx_clk_hw_mux ("dram_pll_ref_sel" , base +0x50 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); hws[IMX8MN_GPU_PLL_REF_SEL ] =imx_clk_hw_mux ("gpu_pll_ref_sel" , base +0x64 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); - hws[IMX8MN_VPU_PLL_REF_SEL ] =imx_clk_hw_mux ("vpu_pll_ref_sel" , base +0x74 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); + hws[IMX8MN_M7_ALT_PLL_REF_SEL ] =imx_clk_hw_mux ("m7_alt_pll_ref_sel" , base +0x74 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); hws[IMX8MN_ARM_PLL_REF_SEL ] =imx_clk_hw_mux ("arm_pll_ref_sel" , base +0x84 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); hws[IMX8MN_SYS_PLL3_REF_SEL ] =imx_clk_hw_mux ("sys_pll3_ref_sel" , base +0x114 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels));@@ -361,7 +361,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_VIDEO_PLL1 ] =imx_clk_hw_pll14xx ("video_pll1" ,"video_pll1_ref_sel" , base +0x28 , &imx_1443x_pll); hws[IMX8MN_DRAM_PLL ] =imx_clk_hw_pll14xx ("dram_pll" ,"dram_pll_ref_sel" , base +0x50 , &imx_1443x_dram_pll); hws[IMX8MN_GPU_PLL ] =imx_clk_hw_pll14xx ("gpu_pll" ,"gpu_pll_ref_sel" , base +0x64 , &imx_1416x_pll); - hws[IMX8MN_VPU_PLL ] =imx_clk_hw_pll14xx ("vpu_pll" ,"vpu_pll_ref_sel" , base +0x74 , &imx_1416x_pll); + hws[IMX8MN_M7_ALT_PLL ] =imx_clk_hw_pll14xx ("m7_alt_pll" ,"m7_alt_pll_ref_sel" , base +0x74 , &imx_1416x_pll); hws[IMX8MN_ARM_PLL ] =imx_clk_hw_pll14xx ("arm_pll" ,"arm_pll_ref_sel" , base +0x84 , &imx_1416x_pll); hws[IMX8MN_SYS_PLL1 ] =imx_clk_hw_fixed ("sys_pll1" ,800000000 ); hws[IMX8MN_SYS_PLL2 ] =imx_clk_hw_fixed ("sys_pll2" ,1000000000 );@@ -373,7 +373,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_VIDEO_PLL1_BYPASS ] =imx_clk_hw_mux_flags ("video_pll1_bypass" , base +0x28 ,16 ,1 , video_pll1_bypass_sels,ARRAY_SIZE (video_pll1_bypass_sels),CLK_SET_RATE_PARENT ); hws[IMX8MN_DRAM_PLL_BYPASS ] =imx_clk_hw_mux_flags ("dram_pll_bypass" , base +0x50 ,16 ,1 , dram_pll_bypass_sels,ARRAY_SIZE (dram_pll_bypass_sels),CLK_SET_RATE_PARENT ); hws[IMX8MN_GPU_PLL_BYPASS ] =imx_clk_hw_mux_flags ("gpu_pll_bypass" , base +0x64 ,28 ,1 , gpu_pll_bypass_sels,ARRAY_SIZE (gpu_pll_bypass_sels),CLK_SET_RATE_PARENT ); - hws[IMX8MN_VPU_PLL_BYPASS ] =imx_clk_hw_mux_flags ("vpu_pll_bypass" , base +0x74 ,28 ,1 , vpu_pll_bypass_sels,ARRAY_SIZE (vpu_pll_bypass_sels),CLK_SET_RATE_PARENT ); + hws[IMX8MN_M7_ALT_PLL_BYPASS ] =imx_clk_hw_mux_flags ("m7_alt_pll_bypass" , base +0x74 ,28 ,1 , m7_alt_pll_bypass_sels,ARRAY_SIZE (m7_alt_pll_bypass_sels),CLK_SET_RATE_PARENT ); hws[IMX8MN_ARM_PLL_BYPASS ] =imx_clk_hw_mux_flags ("arm_pll_bypass" , base +0x84 ,28 ,1 , arm_pll_bypass_sels,ARRAY_SIZE (arm_pll_bypass_sels),CLK_SET_RATE_PARENT ); hws[IMX8MN_SYS_PLL3_BYPASS ] =imx_clk_hw_mux_flags ("sys_pll3_bypass" , base +0x114 ,28 ,1 , sys_pll3_bypass_sels,ARRAY_SIZE (sys_pll3_bypass_sels),CLK_SET_RATE_PARENT );@@ -383,7 +383,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_VIDEO_PLL1_OUT ] =imx_clk_hw_gate ("video_pll1_out" ,"video_pll1_bypass" , base +0x28 ,13 ); hws[IMX8MN_DRAM_PLL_OUT ] =imx_clk_hw_gate ("dram_pll_out" ,"dram_pll_bypass" , base +0x50 ,13 ); hws[IMX8MN_GPU_PLL_OUT ] =imx_clk_hw_gate ("gpu_pll_out" ,"gpu_pll_bypass" , base +0x64 ,11 ); - hws[IMX8MN_VPU_PLL_OUT ] =imx_clk_hw_gate ("vpu_pll_out" ,"vpu_pll_bypass" , base +0x74 ,11 ); + hws[IMX8MN_M7_ALT_PLL_OUT ] =imx_clk_hw_gate ("m7_alt_pll_out" ,"m7_alt_pll_bypass" , base +0x74 ,11 ); hws[IMX8MN_ARM_PLL_OUT ] =imx_clk_hw_gate ("arm_pll_out" ,"arm_pll_bypass" , base +0x84 ,11 ); hws[IMX8MN_SYS_PLL3_OUT ] =imx_clk_hw_gate ("sys_pll3_out" ,"sys_pll3_bypass" , base +0x114 ,11 );include/dt-bindings/clock/imx8mn-clock.h +8
-4@@ -19,7 +19,8 @@#define IMX8MN_VIDEO_PLL1_REF_SEL 10#define IMX8MN_DRAM_PLL_REF_SEL 11#define IMX8MN_GPU_PLL_REF_SEL 12 -#define IMX8MN_VPU_PLL_REF_SEL 13 +#define IMX8MN_M7_ALT_PLL_REF_SEL 13 +#define IMX8MN_VPU_PLL_REF_SEL IMX8MN_M7_ALT_PLL_REF_SEL#define IMX8MN_ARM_PLL_REF_SEL 14#define IMX8MN_SYS_PLL1_REF_SEL 15#define IMX8MN_SYS_PLL2_REF_SEL 16@@ -29,7 +30,8 @@#define IMX8MN_VIDEO_PLL1 20#define IMX8MN_DRAM_PLL 21#define IMX8MN_GPU_PLL 22 -#define IMX8MN_VPU_PLL 23 +#define IMX8MN_M7_ALT_PLL 23 +#define IMX8MN_VPU_PLL IMX8MN_M7_ALT_PLL#define IMX8MN_ARM_PLL 24#define IMX8MN_SYS_PLL1 25#define IMX8MN_SYS_PLL2 26@@ -39,7 +41,8 @@#define IMX8MN_VIDEO_PLL1_BYPASS 30#define IMX8MN_DRAM_PLL_BYPASS 31#define IMX8MN_GPU_PLL_BYPASS 32 -#define IMX8MN_VPU_PLL_BYPASS 33 +#define IMX8MN_M7_ALT_PLL_BYPASS 33 +#define IMX8MN_VPU_PLL_BYPASS IMX8MN_M7_ALT_PLL_BYPASS#define IMX8MN_ARM_PLL_BYPASS 34#define IMX8MN_SYS_PLL1_BYPASS 35#define IMX8MN_SYS_PLL2_BYPASS 36@@ -49,7 +52,8 @@#define IMX8MN_VIDEO_PLL1_OUT 40#define IMX8MN_DRAM_PLL_OUT 41#define IMX8MN_GPU_PLL_OUT 42 -#define IMX8MN_VPU_PLL_OUT 43 +#define IMX8MN_M7_ALT_PLL_OUT 43 +#define IMX8MN_VPU_PLL_OUT IMX8MN_M7_ALT_PLL_OUT#define IMX8MN_ARM_PLL_OUT 44#define IMX8MN_SYS_PLL1_OUT 45#define IMX8MN_SYS_PLL2_OUT 46Signature · 1 line
2.32.0
PATCH v2 2/5 clk: imx: replace osc_hdmi with dummy
In reply to Dario BinacchiThere is no occurrence of the hdmi oscillator in the reference manual (document IMX8MNRM Rev 2, 07/2022). Further, if we consider the indexes 76-81 and 134 of the "Clock Root" table of chapter 5 of the RM, there is no entry for the source select bits 101b, which is the setting referenced by "osc_hdmi".
Fix by renaming "osc_hdmi" with "dummy", a clock which has already been used for missing source select bits.
Tested on the BSH SystemMaster (SMM) S2 board.
---
(no changes since v1)
drivers/clk/imx/clk-imx8mn.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/clk/imx/clk-imx8mn.c +6 -6
@@ -108,27 +108,27 @@ static const char * const imx8mn_disp_pixel_sels[] = {"osc_24m", "video_pll1_out "sys_pll3_out", "clk_ext4", };static const char *const imx8mn_sai2_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , +"video_pll1_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_sai3_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , +"video_pll1_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_sai5_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , +"video_pll1_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext2" ,"clk_ext3" , };static const char *const imx8mn_sai6_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , +"video_pll1_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_sai7_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , +"video_pll1_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_spdif1_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , +"video_pll1_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext2" ,"clk_ext3" , }; static const char * const imx8mn_enet_ref_sels[] = {"osc_24m", "sys_pll2_125m", "sys_pll2_50m",
Signature · 1 line
2.32.0
Re: [PATCH v2 2/5] clk: imx: replace osc_hdmi with dummy
Quoted 8 lines · Dario Binacchi
There is no occurrence of the hdmi oscillator in the reference manual (document IMX8MNRM Rev 2, 07/2022). Further, if we consider the indexes 76-81 and 134 of the "Clock Root" table of chapter 5 of the RM, there is no entry for the source select bits 101b, which is the setting referenced by "
osc_hdmi".
Fix by renaming "osc_hdmi" with "dummy", a clock which has already been used for missing source select bits.
Quoted 4 lines
Tested on the BSH SystemMaster (SMM) S2 board.
Fixes 96d6392b54dbb ("clk: imx: Add support for i.MX8MN clock driver")Signed-off-by Dario Binacchi <[email protected]>
I don't think this is correct. It might even break the EVKs HDMI support.
Peng, can you please confirm ?
Quoted 48 lines
---
(no changes since v1)
drivers/clk/imx/clk-imx8mn.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/clk/imx/clk-imx8mn.c +6
-6@@ -108,27 +108,27 @@ static const char * const imx8mn_disp_pixel_sels[] = {"osc_24m", "video_pll1_out "sys_pll3_out", "clk_ext4", };static const char *const imx8mn_sai2_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , +"video_pll1_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_sai3_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , +"video_pll1_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_sai5_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , +"video_pll1_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext2" ,"clk_ext3" , };static const char *const imx8mn_sai6_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , +"video_pll1_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_sai7_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , +"video_pll1_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_spdif1_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"osc_hdmi" , +"video_pll1_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext2" ,"clk_ext3" , }; static const char * const imx8mn_enet_ref_sels[] = {"osc_24m", "sys_pll2_125m", "sys_pll2_50m",Signature · 1 line
2.32.0
Peng Fan
reviewerRE: [PATCH v2 2/5] clk: imx: replace osc_hdmi with dummy
Quoted 14 lines
Subject: Re: [PATCH v2 2/5] clk: imx: replace
osc_hdmiwith dummyQuoted 11 lines · Dario Binacchi
There is no occurrence of the hdmi oscillator in the reference manual (document IMX8MNRM Rev 2, 07/2022). Further, if we consider the indexes
76-81 and 134 of the "Clock Root" table of chapter 5 of the RM, there is no entry for the source select bits 101b, which is the setting referenced by "osc_hdmi".
Fix by renaming "osc_hdmi" with "dummy", a clock which has already been used for missing source select bits.Tested on the BSH SystemMaster (SMM) S2 board.
Quoted 7 lines
Quoted 3 lines
Fixes 96d6392b54dbb ("clk: imx: Add support for i.MX8MN clockdriver")
Signed-off-by Dario Binacchi <[email protected]>I don't think this is correct. It might even break the EVKs HDMI support.
Peng, can you please confirm ?
The reference manual not has osc hdmi as clk sel. So It is ok to use dummy.
Regards,
Peng.
Quoted 70 lines
drivers/clk/imx/clk-imx8mn.c static const char * const
Quoted 13 lines
---
(no changes since v1)
drivers/clk/imx/clk-imx8mn.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)(quoted diff) +0
-0
b/drivers/clk/imx/clk-imx8mn.cindex72f9563a0ff6..0fae97e61e2c100644drivers/clk/imx/clk-imx8mn.c +0
-0@@ -108,27 +108,27 @@ static const char * constimx8mn_disp_pixel_sels[] = {"
osc_24m", "video_pll1_outdrivers/clk/imx/clk-imx8mn.c static const char * const · line 108
Quoted 1 line
drivers/clk/imx/clk-imx8mn.c +0
-0"sys_pll3_out","
clk_ext4", };drivers/clk/imx/clk-imx8mn.c static const char * const · line 109
Quoted 2 lines
drivers/clk/imx/clk-imx8mn.c +0
-0static const char *const imx8mn_sai2_sels[] = {"osc_24m" ,"
audio_pll1_out", "audio_pll2_out",drivers/clk/imx/clk-imx8mn.c static const char * const · line 110
Quoted 1 line
drivers/clk/imx/clk-imx8mn.c +0
-1- "video_pll1_out","
sys_pll1_133m", "osc_hdmi",drivers/clk/imx/clk-imx8mn.c static const char * const · line 110
Quoted 1 line
drivers/clk/imx/clk-imx8mn.c +1
-0+ "video_pll1_out","
sys_pll1_133m", "dummy",drivers/clk/imx/clk-imx8mn.c static const char * const imx8mn_disp_pixel_sels[] = {"osc_24m", "video_pll1_out
Quoted 3 lines
drivers/clk/imx/clk-imx8mn.c +0
-0"clk_ext3", "clk_ext4", }; static const char * const imx8mn_sai3_sels[] = {"osc_24m","
audio_pll1_out", "audio_pll2_out",drivers/clk/imx/clk-imx8mn.c static const char * const · line 114
Quoted 1 line
drivers/clk/imx/clk-imx8mn.c +0
-1- "video_pll1_out","
sys_pll1_133m", "osc_hdmi",drivers/clk/imx/clk-imx8mn.c static const char * const · line 114
Quoted 1 line
drivers/clk/imx/clk-imx8mn.c +1
-0+ "video_pll1_out","
sys_pll1_133m", "dummy",drivers/clk/imx/clk-imx8mn.c static const char * const imx8mn_disp_pixel_sels[] = {"osc_24m", "video_pll1_out
Quoted 3 lines
drivers/clk/imx/clk-imx8mn.c +0
-0"clk_ext3", "clk_ext4", }; static const char * const imx8mn_sai5_sels[] = {"osc_24m","
audio_pll1_out", "audio_pll2_out",drivers/clk/imx/clk-imx8mn.c static const char * const · line 118
Quoted 1 line
drivers/clk/imx/clk-imx8mn.c +0
-1- "video_pll1_out","
sys_pll1_133m", "osc_hdmi",drivers/clk/imx/clk-imx8mn.c static const char * const · line 118
Quoted 1 line
drivers/clk/imx/clk-imx8mn.c +1
-0+ "video_pll1_out","
sys_pll1_133m", "dummy",drivers/clk/imx/clk-imx8mn.c static const char * const imx8mn_disp_pixel_sels[] = {"osc_24m", "video_pll1_out
Quoted 3 lines
drivers/clk/imx/clk-imx8mn.c +0
-0"clk_ext2", "clk_ext3", }; static const char * const imx8mn_sai6_sels[] = {"osc_24m","
audio_pll1_out", "audio_pll2_out",drivers/clk/imx/clk-imx8mn.c static const char * const · line 122
Quoted 1 line
drivers/clk/imx/clk-imx8mn.c +0
-1- "video_pll1_out","
sys_pll1_133m", "osc_hdmi",drivers/clk/imx/clk-imx8mn.c static const char * const · line 122
Quoted 1 line
drivers/clk/imx/clk-imx8mn.c +1
-0+ "video_pll1_out","
sys_pll1_133m", "dummy",drivers/clk/imx/clk-imx8mn.c static const char * const imx8mn_disp_pixel_sels[] = {"osc_24m", "video_pll1_out
Quoted 3 lines
drivers/clk/imx/clk-imx8mn.c +0
-0"clk_ext3", "clk_ext4", }; static const char * const imx8mn_sai7_sels[] = {"osc_24m","
audio_pll1_out", "audio_pll2_out",drivers/clk/imx/clk-imx8mn.c static const char * const · line 126
Quoted 1 line
drivers/clk/imx/clk-imx8mn.c +0
-1- "video_pll1_out","
sys_pll1_133m", "osc_hdmi",drivers/clk/imx/clk-imx8mn.c static const char * const · line 126
Quoted 1 line
drivers/clk/imx/clk-imx8mn.c +1
-0+ "video_pll1_out","
sys_pll1_133m", "dummy",drivers/clk/imx/clk-imx8mn.c static const char * const imx8mn_disp_pixel_sels[] = {"osc_24m", "video_pll1_out
Quoted 3 lines
drivers/clk/imx/clk-imx8mn.c +0
-0"clk_ext3", "clk_ext4", }; static const char * const imx8mn_spdif1_sels[] = {"osc_24m","
audio_pll1_out", "audio_pll2_out",drivers/clk/imx/clk-imx8mn.c static const char * const · line 130
Quoted 1 line
drivers/clk/imx/clk-imx8mn.c +0
-1- "video_pll1_out","
sys_pll1_133m", "osc_hdmi",drivers/clk/imx/clk-imx8mn.c static const char * const · line 130
Quoted 1 line
drivers/clk/imx/clk-imx8mn.c +1
-0+ "video_pll1_out","
sys_pll1_133m", "dummy",Quoted 7 lines
drivers/clk/imx/clk-imx8mn.c +0
-1"clk_ext2", "clk_ext3", };static const char *const imx8mn_enet_ref_sels[] = {"osc_24m" , "sys_pll2_125m", "sys_pll2_50m", --2.32.0
PATCH v2 3/5 clk: imx: rename video_pll1 to video_pll
In reply to Dario BinacchiUnlike audio_pll1 and audio_pll2, there is no video_pll2. Further, the name used in the RM is video_pll. So, let's rename "video_pll1" to "video_pll" to be consistent with the RM and avoid misunderstandings.
The IMX8MN_VIDEO_PLL1* constants have not been removed to ensure backward compatibility of the patch.
No functional changes intended.
---
Changes in v2:
- Update the commit message.
- Add Fixes tag.
- Maintain IMX8MN_VIDEO_PLL1* constants to not break backward compatibility.
drivers/clk/imx/clk-imx8mn.c | 96 ++++++++++++------------ include/dt-bindings/clock/imx8mn-clock.h | 12 ++- 2 files changed, 56 insertions(+), 52 deletions(-)
drivers/clk/imx/clk-imx8mn.c +48 -48
@@ -27,7 +27,7 @@ static u32 share_count_nand;static const char *const pll_ref_sels[] = {"osc_24m" ,"dummy" ,"dummy" ,"dummy" , };static const char *const audio_pll1_bypass_sels[] = {"audio_pll1" ,"audio_pll1_ref_sel" , };static const char *const audio_pll2_bypass_sels[] = {"audio_pll2" ,"audio_pll2_ref_sel" , }; -static const char *const video_pll1_bypass_sels[] = {"video_pll1" ,"video_pll1_ref_sel" , }; +static const char *const video_pll_bypass_sels[] = {"video_pll" ,"video_pll_ref_sel" , };static const char *const dram_pll_bypass_sels[] = {"dram_pll" ,"dram_pll_ref_sel" , };static const char *const gpu_pll_bypass_sels[] = {"gpu_pll" ,"gpu_pll_ref_sel" , };static const char *const m7_alt_pll_bypass_sels[] = {"m7_alt_pll" ,"m7_alt_pll_ref_sel" , };
@@ -41,23 +41,23 @@ static const char * const imx8mn_a53_sels[] = {"osc_24m", "arm_pll_out", "sys_plstatic const char *const imx8mn_a53_core_sels[] = {"arm_a53_div" ,"arm_pll_out" , };static const char *const imx8mn_m7_sels[] = {"osc_24m" ,"sys_pll2_200m" ,"sys_pll2_250m" ,"m7_alt_pll_out" , -"sys_pll1_800m" ,"audio_pll1_out" ,"video_pll1_out" ,"sys_pll3_out" , }; +"sys_pll1_800m" ,"audio_pll1_out" ,"video_pll_out" ,"sys_pll3_out" , };static const char *const imx8mn_gpu_core_sels[] = {"osc_24m" ,"gpu_pll_out" ,"sys_pll1_800m" ,"sys_pll3_out" ,"sys_pll2_1000m" ,"audio_pll1_out" , -"video_pll1_out" ,"audio_pll2_out" , }; +"video_pll_out" ,"audio_pll2_out" , };static const char *const imx8mn_gpu_shader_sels[] = {"osc_24m" ,"gpu_pll_out" ,"sys_pll1_800m" ,"sys_pll3_out" ,"sys_pll2_1000m" ,"audio_pll1_out" , -"video_pll1_out" ,"audio_pll2_out" , }; +"video_pll_out" ,"audio_pll2_out" , };static const char *const imx8mn_main_axi_sels[] = {"osc_24m" ,"sys_pll2_333m" ,"sys_pll1_800m" ,"sys_pll2_250m" ,"sys_pll2_1000m" ,"audio_pll1_out" , -"video_pll1_out" ,"sys_pll1_100m" ,}; +"video_pll_out" ,"sys_pll1_100m" ,};static const char *const imx8mn_enet_axi_sels[] = {"osc_24m" ,"sys_pll1_266m" ,"sys_pll1_800m" ,"sys_pll2_250m" ,"sys_pll2_200m" ,"audio_pll1_out" , -"video_pll1_out" ,"sys_pll3_out" , }; +"video_pll_out" ,"sys_pll3_out" , };static const char *const imx8mn_nand_usdhc_sels[] = {"osc_24m" ,"sys_pll1_266m" ,"sys_pll1_800m" ,"sys_pll2_200m" ,"sys_pll1_133m" ,"sys_pll3_out" ,
@@ -77,23 +77,23 @@ static const char * const imx8mn_usb_bus_sels[] = {"osc_24m", "sys_pll2_500m", "static const char *const imx8mn_gpu_axi_sels[] = {"osc_24m" ,"sys_pll1_800m" ,"gpu_pll_out" ,"sys_pll3_out" ,"sys_pll2_1000m" ,"audio_pll1_out" , -"video_pll1_out" ,"audio_pll2_out" , }; +"video_pll_out" ,"audio_pll2_out" , };static const char *const imx8mn_gpu_ahb_sels[] = {"osc_24m" ,"sys_pll1_800m" ,"gpu_pll_out" ,"sys_pll3_out" ,"sys_pll2_1000m" ,"audio_pll1_out" , -"video_pll1_out" ,"audio_pll2_out" , }; +"video_pll_out" ,"audio_pll2_out" , };static const char *const imx8mn_noc_sels[] = {"osc_24m" ,"sys_pll1_800m" ,"sys_pll3_out" ,"sys_pll2_1000m" ,"sys_pll2_500m" ,"audio_pll1_out" , -"video_pll1_out" ,"audio_pll2_out" , }; +"video_pll_out" ,"audio_pll2_out" , };static const char *const imx8mn_ahb_sels[] = {"osc_24m" ,"sys_pll1_133m" ,"sys_pll1_800m" ,"sys_pll1_400m" ,"sys_pll2_125m" ,"sys_pll3_out" , -"audio_pll1_out" ,"video_pll1_out" , }; +"audio_pll1_out" ,"video_pll_out" , };static const char *const imx8mn_audio_ahb_sels[] = {"osc_24m" ,"sys_pll2_500m" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll2_166m" ,"sys_pll3_out" , -"audio_pll1_out" ,"video_pll1_out" , }; +"audio_pll1_out" ,"video_pll_out" , };static const char *const imx8mn_dram_alt_sels[] = {"osc_24m" ,"sys_pll1_800m" ,"sys_pll1_100m" ,"sys_pll2_500m" ,"sys_pll2_1000m" ,"sys_pll3_out" ,
@@ -103,49 +103,49 @@ static const char * const imx8mn_dram_apb_sels[] = {"osc_24m", "sys_pll2_200m","sys_pll1_160m" ,"sys_pll1_800m" ,"sys_pll3_out" , "sys_pll2_250m", "audio_pll2_out", }; -static const char *const imx8mn_disp_pixel_sels[] = {"osc_24m" ,"video_pll1_out" ,"audio_pll2_out" , +static const char *const imx8mn_disp_pixel_sels[] = {"osc_24m" ,"video_pll_out" ,"audio_pll2_out" ,"audio_pll1_out" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" ,"clk_ext4" , };static const char *const imx8mn_sai2_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"dummy" , +"video_pll_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_sai3_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"dummy" , +"video_pll_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_sai5_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"dummy" , +"video_pll_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext2" ,"clk_ext3" , };static const char *const imx8mn_sai6_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"dummy" , +"video_pll_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_sai7_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"dummy" , +"video_pll_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_spdif1_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"dummy" , +"video_pll_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext2" ,"clk_ext3" , };static const char *const imx8mn_enet_ref_sels[] = {"osc_24m" ,"sys_pll2_125m" ,"sys_pll2_50m" ,"sys_pll2_100m" ,"sys_pll1_160m" ,"audio_pll1_out" , -"video_pll1_out" ,"clk_ext4" , }; +"video_pll_out" ,"clk_ext4" , };static const char *const imx8mn_enet_timer_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"audio_pll1_out" ,"clk_ext1" ,"clk_ext2" ,"clk_ext3" , -"clk_ext4" ,"video_pll1_out" , }; +"clk_ext4" ,"video_pll_out" , };static const char *const imx8mn_enet_phy_sels[] = {"osc_24m" ,"sys_pll2_50m" ,"sys_pll2_125m" , -"sys_pll2_200m" ,"sys_pll2_500m" ,"video_pll1_out" , +"sys_pll2_200m" ,"sys_pll2_500m" ,"video_pll_out" ,"audio_pll2_out" , };static const char *const imx8mn_nand_sels[] = {"osc_24m" ,"sys_pll2_500m" ,"audio_pll1_out" ,"sys_pll1_400m" ,"audio_pll2_out" ,"sys_pll3_out" , -"sys_pll2_250m" ,"video_pll1_out" , }; +"sys_pll2_250m" ,"video_pll_out" , };static const char *const imx8mn_qspi_sels[] = {"osc_24m" ,"sys_pll1_400m" ,"sys_pll2_333m" , "sys_pll2_500m", "audio_pll2_out", "sys_pll1_266m",
@@ -160,19 +160,19 @@ static const char * const imx8mn_usdhc2_sels[] = {"osc_24m", "sys_pll1_400m", "s "audio_pll2_out", "sys_pll1_100m", };static const char *const imx8mn_i2c1_sels[] = {"osc_24m" ,"sys_pll1_160m" ,"sys_pll2_50m" , -"sys_pll3_out" ,"audio_pll1_out" ,"video_pll1_out" , +"sys_pll3_out" ,"audio_pll1_out" ,"video_pll_out" ,"audio_pll2_out" ,"sys_pll1_133m" , };static const char *const imx8mn_i2c2_sels[] = {"osc_24m" ,"sys_pll1_160m" ,"sys_pll2_50m" , -"sys_pll3_out" ,"audio_pll1_out" ,"video_pll1_out" , +"sys_pll3_out" ,"audio_pll1_out" ,"video_pll_out" ,"audio_pll2_out" ,"sys_pll1_133m" , };static const char *const imx8mn_i2c3_sels[] = {"osc_24m" ,"sys_pll1_160m" ,"sys_pll2_50m" , -"sys_pll3_out" ,"audio_pll1_out" ,"video_pll1_out" , +"sys_pll3_out" ,"audio_pll1_out" ,"video_pll_out" ,"audio_pll2_out" ,"sys_pll1_133m" , };static const char *const imx8mn_i2c4_sels[] = {"osc_24m" ,"sys_pll1_160m" ,"sys_pll2_50m" , -"sys_pll3_out" ,"audio_pll1_out" ,"video_pll1_out" , +"sys_pll3_out" ,"audio_pll1_out" ,"video_pll_out" ,"audio_pll2_out" ,"sys_pll1_133m" , }; static const char * const imx8mn_uart1_sels[] = {"osc_24m", "sys_pll1_80m", "sys_pll2_200m",
@@ -213,42 +213,42 @@ static const char * const imx8mn_ecspi2_sels[] = {"osc_24m", "sys_pll2_200m", "sstatic const char *const imx8mn_pwm1_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_160m" ,"sys_pll1_40m" ,"sys_pll3_out" ,"clk_ext1" , -"sys_pll1_80m" ,"video_pll1_out" , }; +"sys_pll1_80m" ,"video_pll_out" , };static const char *const imx8mn_pwm2_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_160m" ,"sys_pll1_40m" ,"sys_pll3_out" ,"clk_ext1" , -"sys_pll1_80m" ,"video_pll1_out" , }; +"sys_pll1_80m" ,"video_pll_out" , };static const char *const imx8mn_pwm3_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_160m" ,"sys_pll1_40m" ,"sys_pll3_out" ,"clk_ext2" , -"sys_pll1_80m" ,"video_pll1_out" , }; +"sys_pll1_80m" ,"video_pll_out" , };static const char *const imx8mn_pwm4_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_160m" ,"sys_pll1_40m" ,"sys_pll3_out" ,"clk_ext2" , -"sys_pll1_80m" ,"video_pll1_out" , }; +"sys_pll1_80m" ,"video_pll_out" , };static const char *const imx8mn_gpt1_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_400m" , -"sys_pll1_40m" ,"video_pll1_out" ,"sys_pll1_80m" , +"sys_pll1_40m" ,"video_pll_out" ,"sys_pll1_80m" ,"audio_pll1_out" ,"clk_ext1" , };static const char *const imx8mn_gpt2_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_400m" , -"sys_pll1_40m" ,"video_pll1_out" ,"sys_pll1_80m" , +"sys_pll1_40m" ,"video_pll_out" ,"sys_pll1_80m" ,"audio_pll1_out" ,"clk_ext1" , };static const char *const imx8mn_gpt3_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_400m" , -"sys_pll1_40m" ,"video_pll1_out" ,"sys_pll1_80m" , +"sys_pll1_40m" ,"video_pll_out" ,"sys_pll1_80m" ,"audio_pll1_out" ,"clk_ext1" , };static const char *const imx8mn_gpt4_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_400m" , -"sys_pll1_40m" ,"video_pll1_out" ,"sys_pll1_80m" , +"sys_pll1_40m" ,"video_pll_out" ,"sys_pll1_80m" ,"audio_pll1_out" ,"clk_ext1" , };static const char *const imx8mn_gpt5_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_400m" , -"sys_pll1_40m" ,"video_pll1_out" ,"sys_pll1_80m" , +"sys_pll1_40m" ,"video_pll_out" ,"sys_pll1_80m" ,"audio_pll1_out" ,"clk_ext1" , };static const char *const imx8mn_gpt6_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_400m" , -"sys_pll1_40m" ,"video_pll1_out" ,"sys_pll1_80m" , +"sys_pll1_40m" ,"video_pll_out" ,"sys_pll1_80m" ,"audio_pll1_out" ,"clk_ext1" , };static const char *const imx8mn_wdog_sels[] = {"osc_24m" ,"sys_pll1_133m" ,"sys_pll1_160m" ,
@@ -261,15 +261,15 @@ static const char * const imx8mn_wrclk_sels[] = {"osc_24m", "sys_pll1_40m", "m7_static const char *const imx8mn_dsi_core_sels[] = {"osc_24m" ,"sys_pll1_266m" ,"sys_pll2_250m" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" , -"audio_pll2_out" ,"video_pll1_out" , }; +"audio_pll2_out" ,"video_pll_out" , };static const char *const imx8mn_dsi_phy_sels[] = {"osc_24m" ,"sys_pll2_125m" ,"sys_pll2_100m" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"clk_ext2" , -"audio_pll2_out" ,"video_pll1_out" , }; +"audio_pll2_out" ,"video_pll_out" , };static const char *const imx8mn_dsi_dbi_sels[] = {"osc_24m" ,"sys_pll1_266m" ,"sys_pll2_100m" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" , -"audio_pll2_out" ,"video_pll1_out" , }; +"audio_pll2_out" ,"video_pll_out" , };static const char *const imx8mn_usdhc3_sels[] = {"osc_24m" ,"sys_pll1_400m" ,"sys_pll1_800m" ,"sys_pll2_500m" ,"sys_pll3_out" ,"sys_pll1_266m" ,
@@ -277,15 +277,15 @@ static const char * const imx8mn_usdhc3_sels[] = {"osc_24m", "sys_pll1_400m", "sstatic const char *const imx8mn_camera_pixel_sels[] = {"osc_24m" ,"sys_pll1_266m" ,"sys_pll2_250m" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" , -"audio_pll2_out" ,"video_pll1_out" , }; +"audio_pll2_out" ,"video_pll_out" , };static const char *const imx8mn_csi1_phy_sels[] = {"osc_24m" ,"sys_pll2_333m" ,"sys_pll2_100m" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"clk_ext2" , -"audio_pll2_out" ,"video_pll1_out" , }; +"audio_pll2_out" ,"video_pll_out" , };static const char *const imx8mn_csi2_phy_sels[] = {"osc_24m" ,"sys_pll2_333m" ,"sys_pll2_100m" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"clk_ext2" , -"audio_pll2_out" ,"video_pll1_out" , }; +"audio_pll2_out" ,"video_pll_out" , };static const char *const imx8mn_csi2_esc_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_80m" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" ,
@@ -306,9 +306,9 @@ static const char * const imx8mn_clko1_sels[] = {"osc_24m", "sys_pll1_800m", "du "dummy", "sys_pll1_80m", };static const char *const imx8mn_clko2_sels[] = {"osc_24m" ,"sys_pll2_200m" ,"sys_pll1_400m" ,"sys_pll2_166m" ,"sys_pll3_out" ,"audio_pll1_out" , -"video_pll1_out" ,"osc_32k" , }; +"video_pll_out" ,"osc_32k" , }; -static const char *const clkout_sels[] = {"audio_pll1_out" ,"audio_pll2_out" ,"video_pll1_out" , +static const char *const clkout_sels[] = {"audio_pll1_out" ,"audio_pll2_out" ,"video_pll_out" ,"dummy" ,"dummy" ,"gpu_pll_out" ,"dummy" ,"arm_pll_out" ,"sys_pll1" ,"sys_pll2" ,"sys_pll3" ,"dummy" ,"dummy" ,"osc_24m" ,"dummy" ,"osc_32k" };
@@ -349,7 +349,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_AUDIO_PLL1_REF_SEL ] =imx_clk_hw_mux ("audio_pll1_ref_sel" , base +0x0 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); hws[IMX8MN_AUDIO_PLL2_REF_SEL ] =imx_clk_hw_mux ("audio_pll2_ref_sel" , base +0x14 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); - hws[IMX8MN_VIDEO_PLL1_REF_SEL ] =imx_clk_hw_mux ("video_pll1_ref_sel" , base +0x28 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); + hws[IMX8MN_VIDEO_PLL_REF_SEL ] =imx_clk_hw_mux ("video_pll_ref_sel" , base +0x28 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); hws[IMX8MN_DRAM_PLL_REF_SEL ] =imx_clk_hw_mux ("dram_pll_ref_sel" , base +0x50 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); hws[IMX8MN_GPU_PLL_REF_SEL ] =imx_clk_hw_mux ("gpu_pll_ref_sel" , base +0x64 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); hws[IMX8MN_M7_ALT_PLL_REF_SEL ] =imx_clk_hw_mux ("m7_alt_pll_ref_sel" , base +0x74 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels));
@@ -358,7 +358,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_AUDIO_PLL1 ] =imx_clk_hw_pll14xx ("audio_pll1" ,"audio_pll1_ref_sel" , base, &imx_1443x_pll); hws[IMX8MN_AUDIO_PLL2 ] =imx_clk_hw_pll14xx ("audio_pll2" ,"audio_pll2_ref_sel" , base +0x14 , &imx_1443x_pll); - hws[IMX8MN_VIDEO_PLL1 ] =imx_clk_hw_pll14xx ("video_pll1" ,"video_pll1_ref_sel" , base +0x28 , &imx_1443x_pll); + hws[IMX8MN_VIDEO_PLL ] =imx_clk_hw_pll14xx ("video_pll" ,"video_pll_ref_sel" , base +0x28 , &imx_1443x_pll); hws[IMX8MN_DRAM_PLL ] =imx_clk_hw_pll14xx ("dram_pll" ,"dram_pll_ref_sel" , base +0x50 , &imx_1443x_dram_pll); hws[IMX8MN_GPU_PLL ] =imx_clk_hw_pll14xx ("gpu_pll" ,"gpu_pll_ref_sel" , base +0x64 , &imx_1416x_pll); hws[IMX8MN_M7_ALT_PLL ] =imx_clk_hw_pll14xx ("m7_alt_pll" ,"m7_alt_pll_ref_sel" , base +0x74 , &imx_1416x_pll);
@@ -370,7 +370,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev)/* PLL bypass out */ hws[IMX8MN_AUDIO_PLL1_BYPASS ] =imx_clk_hw_mux_flags ("audio_pll1_bypass" , base,16 ,1 , audio_pll1_bypass_sels,ARRAY_SIZE (audio_pll1_bypass_sels),CLK_SET_RATE_PARENT ); hws[IMX8MN_AUDIO_PLL2_BYPASS ] =imx_clk_hw_mux_flags ("audio_pll2_bypass" , base +0x14 ,16 ,1 , audio_pll2_bypass_sels,ARRAY_SIZE (audio_pll2_bypass_sels),CLK_SET_RATE_PARENT ); - hws[IMX8MN_VIDEO_PLL1_BYPASS ] =imx_clk_hw_mux_flags ("video_pll1_bypass" , base +0x28 ,16 ,1 , video_pll1_bypass_sels,ARRAY_SIZE (video_pll1_bypass_sels),CLK_SET_RATE_PARENT ); + hws[IMX8MN_VIDEO_PLL_BYPASS ] =imx_clk_hw_mux_flags ("video_pll_bypass" , base +0x28 ,16 ,1 , video_pll_bypass_sels,ARRAY_SIZE (video_pll_bypass_sels),CLK_SET_RATE_PARENT ); hws[IMX8MN_DRAM_PLL_BYPASS ] =imx_clk_hw_mux_flags ("dram_pll_bypass" , base +0x50 ,16 ,1 , dram_pll_bypass_sels,ARRAY_SIZE (dram_pll_bypass_sels),CLK_SET_RATE_PARENT ); hws[IMX8MN_GPU_PLL_BYPASS ] =imx_clk_hw_mux_flags ("gpu_pll_bypass" , base +0x64 ,28 ,1 , gpu_pll_bypass_sels,ARRAY_SIZE (gpu_pll_bypass_sels),CLK_SET_RATE_PARENT ); hws[IMX8MN_M7_ALT_PLL_BYPASS ] =imx_clk_hw_mux_flags ("m7_alt_pll_bypass" , base +0x74 ,28 ,1 , m7_alt_pll_bypass_sels,ARRAY_SIZE (m7_alt_pll_bypass_sels),CLK_SET_RATE_PARENT );
@@ -380,7 +380,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev)/* PLL out gate */ hws[IMX8MN_AUDIO_PLL1_OUT ] =imx_clk_hw_gate ("audio_pll1_out" ,"audio_pll1_bypass" , base,13 ); hws[IMX8MN_AUDIO_PLL2_OUT ] =imx_clk_hw_gate ("audio_pll2_out" ,"audio_pll2_bypass" , base +0x14 ,13 ); - hws[IMX8MN_VIDEO_PLL1_OUT ] =imx_clk_hw_gate ("video_pll1_out" ,"video_pll1_bypass" , base +0x28 ,13 ); + hws[IMX8MN_VIDEO_PLL_OUT ] =imx_clk_hw_gate ("video_pll_out" ,"video_pll_bypass" , base +0x28 ,13 ); hws[IMX8MN_DRAM_PLL_OUT ] =imx_clk_hw_gate ("dram_pll_out" ,"dram_pll_bypass" , base +0x50 ,13 ); hws[IMX8MN_GPU_PLL_OUT ] =imx_clk_hw_gate ("gpu_pll_out" ,"gpu_pll_bypass" , base +0x64 ,11 ); hws[IMX8MN_M7_ALT_PLL_OUT ] =imx_clk_hw_gate ("m7_alt_pll_out" ,"m7_alt_pll_bypass" , base +0x74 ,11 );
include/dt-bindings/clock/imx8mn-clock.h +8 -4
@@ -16,7 +16,8 @@#define IMX8MN_CLK_EXT4 7#define IMX8MN_AUDIO_PLL1_REF_SEL 8#define IMX8MN_AUDIO_PLL2_REF_SEL 9 -#define IMX8MN_VIDEO_PLL1_REF_SEL 10 +#define IMX8MN_VIDEO_PLL_REF_SEL 10 +#define IMX8MN_VIDEO_PLL1_REF_SEL IMX8MN_VIDEO_PLL_REF_SEL#define IMX8MN_DRAM_PLL_REF_SEL 11#define IMX8MN_GPU_PLL_REF_SEL 12#define IMX8MN_M7_ALT_PLL_REF_SEL 13
@@ -27,7 +28,8 @@#define IMX8MN_SYS_PLL3_REF_SEL 17#define IMX8MN_AUDIO_PLL1 18#define IMX8MN_AUDIO_PLL2 19 -#define IMX8MN_VIDEO_PLL1 20 +#define IMX8MN_VIDEO_PLL 20 +#define IMX8MN_VIDEO_PLL1 IMX8MN_VIDEO_PLL#define IMX8MN_DRAM_PLL 21#define IMX8MN_GPU_PLL 22#define IMX8MN_M7_ALT_PLL 23
@@ -38,7 +40,8 @@#define IMX8MN_SYS_PLL3 27#define IMX8MN_AUDIO_PLL1_BYPASS 28#define IMX8MN_AUDIO_PLL2_BYPASS 29 -#define IMX8MN_VIDEO_PLL1_BYPASS 30 +#define IMX8MN_VIDEO_PLL_BYPASS 30 +#define IMX8MN_VIDEO_PLL1_BYPASS IMX8MN_VIDEO_PLL_BYPASS#define IMX8MN_DRAM_PLL_BYPASS 31#define IMX8MN_GPU_PLL_BYPASS 32#define IMX8MN_M7_ALT_PLL_BYPASS 33
@@ -49,7 +52,8 @@#define IMX8MN_SYS_PLL3_BYPASS 37#define IMX8MN_AUDIO_PLL1_OUT 38#define IMX8MN_AUDIO_PLL2_OUT 39 -#define IMX8MN_VIDEO_PLL1_OUT 40 +#define IMX8MN_VIDEO_PLL_OUT 40 +#define IMX8MN_VIDEO_PLL1_OUT IMX8MN_VIDEO_PLL_OUT#define IMX8MN_DRAM_PLL_OUT 41#define IMX8MN_GPU_PLL_OUT 42#define IMX8MN_M7_ALT_PLL_OUT 43
Signature · 1 line
2.32.0
Re: [PATCH v2 3/5] clk: imx: rename video_pll1 to video_pll
Quoted 11 lines · Dario Binacchi
Unlike
audio_pll1andaudio_pll2, there is novideo_pll2. Further, the name used in the RM isvideo_pll. So, let's rename "video_pll1" to "video_pll" to be consistent with the RM and avoid misunderstandings.The IMX8MN_VIDEO_PLL1* constants have not been removed to ensure backward compatibility of the patch.
No functional changes intended.
Fixes 96d6392b54dbb ("clk: imx: Add support for i.MX8MN clock driver")Signed-off-by Dario Binacchi <[email protected]>
Quoted 355 lines
---
Changes in v2:
- Update the commit message.
- Add Fixes tag.
- Maintain IMX8MN_VIDEO_PLL1* constants to not break backward compatibility.drivers/clk/imx/clk-imx8mn.c | 96 ++++++++++++------------ include/dt-bindings/clock/imx8mn-clock.h | 12 ++- 2 files changed, 56 insertions(+), 52 deletions(-)drivers/clk/imx/clk-imx8mn.c +48
-48@@ -27,7 +27,7 @@ static u32 share_count_nand;static const char *const pll_ref_sels[] = {"osc_24m" ,"dummy" ,"dummy" ,"dummy" , };static const char *const audio_pll1_bypass_sels[] = {"audio_pll1" ,"audio_pll1_ref_sel" , };static const char *const audio_pll2_bypass_sels[] = {"audio_pll2" ,"audio_pll2_ref_sel" , }; -static const char *const video_pll1_bypass_sels[] = {"video_pll1" ,"video_pll1_ref_sel" , }; +static const char *const video_pll_bypass_sels[] = {"video_pll" ,"video_pll_ref_sel" , };static const char *const dram_pll_bypass_sels[] = {"dram_pll" ,"dram_pll_ref_sel" , };static const char *const gpu_pll_bypass_sels[] = {"gpu_pll" ,"gpu_pll_ref_sel" , };static const char *const m7_alt_pll_bypass_sels[] = {"m7_alt_pll" ,"m7_alt_pll_ref_sel" , };@@ -41,23 +41,23 @@ static const char * const imx8mn_a53_sels[] = {"osc_24m", "arm_pll_out", "sys_plstatic const char *const imx8mn_a53_core_sels[] = {"arm_a53_div" ,"arm_pll_out" , };static const char *const imx8mn_m7_sels[] = {"osc_24m" ,"sys_pll2_200m" ,"sys_pll2_250m" ,"m7_alt_pll_out" , -"sys_pll1_800m" ,"audio_pll1_out" ,"video_pll1_out" ,"sys_pll3_out" , }; +"sys_pll1_800m" ,"audio_pll1_out" ,"video_pll_out" ,"sys_pll3_out" , };static const char *const imx8mn_gpu_core_sels[] = {"osc_24m" ,"gpu_pll_out" ,"sys_pll1_800m" ,"sys_pll3_out" ,"sys_pll2_1000m" ,"audio_pll1_out" , -"video_pll1_out" ,"audio_pll2_out" , }; +"video_pll_out" ,"audio_pll2_out" , };static const char *const imx8mn_gpu_shader_sels[] = {"osc_24m" ,"gpu_pll_out" ,"sys_pll1_800m" ,"sys_pll3_out" ,"sys_pll2_1000m" ,"audio_pll1_out" , -"video_pll1_out" ,"audio_pll2_out" , }; +"video_pll_out" ,"audio_pll2_out" , };static const char *const imx8mn_main_axi_sels[] = {"osc_24m" ,"sys_pll2_333m" ,"sys_pll1_800m" ,"sys_pll2_250m" ,"sys_pll2_1000m" ,"audio_pll1_out" , -"video_pll1_out" ,"sys_pll1_100m" ,}; +"video_pll_out" ,"sys_pll1_100m" ,};static const char *const imx8mn_enet_axi_sels[] = {"osc_24m" ,"sys_pll1_266m" ,"sys_pll1_800m" ,"sys_pll2_250m" ,"sys_pll2_200m" ,"audio_pll1_out" , -"video_pll1_out" ,"sys_pll3_out" , }; +"video_pll_out" ,"sys_pll3_out" , };static const char *const imx8mn_nand_usdhc_sels[] = {"osc_24m" ,"sys_pll1_266m" ,"sys_pll1_800m" ,"sys_pll2_200m" ,"sys_pll1_133m" ,"sys_pll3_out" ,@@ -77,23 +77,23 @@ static const char * const imx8mn_usb_bus_sels[] = {"osc_24m", "sys_pll2_500m", "static const char *const imx8mn_gpu_axi_sels[] = {"osc_24m" ,"sys_pll1_800m" ,"gpu_pll_out" ,"sys_pll3_out" ,"sys_pll2_1000m" ,"audio_pll1_out" , -"video_pll1_out" ,"audio_pll2_out" , }; +"video_pll_out" ,"audio_pll2_out" , };static const char *const imx8mn_gpu_ahb_sels[] = {"osc_24m" ,"sys_pll1_800m" ,"gpu_pll_out" ,"sys_pll3_out" ,"sys_pll2_1000m" ,"audio_pll1_out" , -"video_pll1_out" ,"audio_pll2_out" , }; +"video_pll_out" ,"audio_pll2_out" , };static const char *const imx8mn_noc_sels[] = {"osc_24m" ,"sys_pll1_800m" ,"sys_pll3_out" ,"sys_pll2_1000m" ,"sys_pll2_500m" ,"audio_pll1_out" , -"video_pll1_out" ,"audio_pll2_out" , }; +"video_pll_out" ,"audio_pll2_out" , };static const char *const imx8mn_ahb_sels[] = {"osc_24m" ,"sys_pll1_133m" ,"sys_pll1_800m" ,"sys_pll1_400m" ,"sys_pll2_125m" ,"sys_pll3_out" , -"audio_pll1_out" ,"video_pll1_out" , }; +"audio_pll1_out" ,"video_pll_out" , };static const char *const imx8mn_audio_ahb_sels[] = {"osc_24m" ,"sys_pll2_500m" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll2_166m" ,"sys_pll3_out" , -"audio_pll1_out" ,"video_pll1_out" , }; +"audio_pll1_out" ,"video_pll_out" , };static const char *const imx8mn_dram_alt_sels[] = {"osc_24m" ,"sys_pll1_800m" ,"sys_pll1_100m" ,"sys_pll2_500m" ,"sys_pll2_1000m" ,"sys_pll3_out" ,@@ -103,49 +103,49 @@ static const char * const imx8mn_dram_apb_sels[] = {"osc_24m", "sys_pll2_200m","sys_pll1_160m" ,"sys_pll1_800m" ,"sys_pll3_out" , "sys_pll2_250m", "audio_pll2_out", }; -static const char *const imx8mn_disp_pixel_sels[] = {"osc_24m" ,"video_pll1_out" ,"audio_pll2_out" , +static const char *const imx8mn_disp_pixel_sels[] = {"osc_24m" ,"video_pll_out" ,"audio_pll2_out" ,"audio_pll1_out" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" ,"clk_ext4" , };static const char *const imx8mn_sai2_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"dummy" , +"video_pll_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_sai3_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"dummy" , +"video_pll_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_sai5_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"dummy" , +"video_pll_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext2" ,"clk_ext3" , };static const char *const imx8mn_sai6_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"dummy" , +"video_pll_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_sai7_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"dummy" , +"video_pll_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext3" ,"clk_ext4" , };static const char *const imx8mn_spdif1_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" , -"video_pll1_out" ,"sys_pll1_133m" ,"dummy" , +"video_pll_out" ,"sys_pll1_133m" ,"dummy" ,"clk_ext2" ,"clk_ext3" , };static const char *const imx8mn_enet_ref_sels[] = {"osc_24m" ,"sys_pll2_125m" ,"sys_pll2_50m" ,"sys_pll2_100m" ,"sys_pll1_160m" ,"audio_pll1_out" , -"video_pll1_out" ,"clk_ext4" , }; +"video_pll_out" ,"clk_ext4" , };static const char *const imx8mn_enet_timer_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"audio_pll1_out" ,"clk_ext1" ,"clk_ext2" ,"clk_ext3" , -"clk_ext4" ,"video_pll1_out" , }; +"clk_ext4" ,"video_pll_out" , };static const char *const imx8mn_enet_phy_sels[] = {"osc_24m" ,"sys_pll2_50m" ,"sys_pll2_125m" , -"sys_pll2_200m" ,"sys_pll2_500m" ,"video_pll1_out" , +"sys_pll2_200m" ,"sys_pll2_500m" ,"video_pll_out" ,"audio_pll2_out" , };static const char *const imx8mn_nand_sels[] = {"osc_24m" ,"sys_pll2_500m" ,"audio_pll1_out" ,"sys_pll1_400m" ,"audio_pll2_out" ,"sys_pll3_out" , -"sys_pll2_250m" ,"video_pll1_out" , }; +"sys_pll2_250m" ,"video_pll_out" , };static const char *const imx8mn_qspi_sels[] = {"osc_24m" ,"sys_pll1_400m" ,"sys_pll2_333m" , "sys_pll2_500m", "audio_pll2_out", "sys_pll1_266m",@@ -160,19 +160,19 @@ static const char * const imx8mn_usdhc2_sels[] = {"osc_24m", "sys_pll1_400m", "s "audio_pll2_out", "sys_pll1_100m", };static const char *const imx8mn_i2c1_sels[] = {"osc_24m" ,"sys_pll1_160m" ,"sys_pll2_50m" , -"sys_pll3_out" ,"audio_pll1_out" ,"video_pll1_out" , +"sys_pll3_out" ,"audio_pll1_out" ,"video_pll_out" ,"audio_pll2_out" ,"sys_pll1_133m" , };static const char *const imx8mn_i2c2_sels[] = {"osc_24m" ,"sys_pll1_160m" ,"sys_pll2_50m" , -"sys_pll3_out" ,"audio_pll1_out" ,"video_pll1_out" , +"sys_pll3_out" ,"audio_pll1_out" ,"video_pll_out" ,"audio_pll2_out" ,"sys_pll1_133m" , };static const char *const imx8mn_i2c3_sels[] = {"osc_24m" ,"sys_pll1_160m" ,"sys_pll2_50m" , -"sys_pll3_out" ,"audio_pll1_out" ,"video_pll1_out" , +"sys_pll3_out" ,"audio_pll1_out" ,"video_pll_out" ,"audio_pll2_out" ,"sys_pll1_133m" , };static const char *const imx8mn_i2c4_sels[] = {"osc_24m" ,"sys_pll1_160m" ,"sys_pll2_50m" , -"sys_pll3_out" ,"audio_pll1_out" ,"video_pll1_out" , +"sys_pll3_out" ,"audio_pll1_out" ,"video_pll_out" ,"audio_pll2_out" ,"sys_pll1_133m" , }; static const char * const imx8mn_uart1_sels[] = {"osc_24m", "sys_pll1_80m", "sys_pll2_200m",@@ -213,42 +213,42 @@ static const char * const imx8mn_ecspi2_sels[] = {"osc_24m", "sys_pll2_200m", "sstatic const char *const imx8mn_pwm1_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_160m" ,"sys_pll1_40m" ,"sys_pll3_out" ,"clk_ext1" , -"sys_pll1_80m" ,"video_pll1_out" , }; +"sys_pll1_80m" ,"video_pll_out" , };static const char *const imx8mn_pwm2_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_160m" ,"sys_pll1_40m" ,"sys_pll3_out" ,"clk_ext1" , -"sys_pll1_80m" ,"video_pll1_out" , }; +"sys_pll1_80m" ,"video_pll_out" , };static const char *const imx8mn_pwm3_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_160m" ,"sys_pll1_40m" ,"sys_pll3_out" ,"clk_ext2" , -"sys_pll1_80m" ,"video_pll1_out" , }; +"sys_pll1_80m" ,"video_pll_out" , };static const char *const imx8mn_pwm4_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_160m" ,"sys_pll1_40m" ,"sys_pll3_out" ,"clk_ext2" , -"sys_pll1_80m" ,"video_pll1_out" , }; +"sys_pll1_80m" ,"video_pll_out" , };static const char *const imx8mn_gpt1_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_400m" , -"sys_pll1_40m" ,"video_pll1_out" ,"sys_pll1_80m" , +"sys_pll1_40m" ,"video_pll_out" ,"sys_pll1_80m" ,"audio_pll1_out" ,"clk_ext1" , };static const char *const imx8mn_gpt2_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_400m" , -"sys_pll1_40m" ,"video_pll1_out" ,"sys_pll1_80m" , +"sys_pll1_40m" ,"video_pll_out" ,"sys_pll1_80m" ,"audio_pll1_out" ,"clk_ext1" , };static const char *const imx8mn_gpt3_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_400m" , -"sys_pll1_40m" ,"video_pll1_out" ,"sys_pll1_80m" , +"sys_pll1_40m" ,"video_pll_out" ,"sys_pll1_80m" ,"audio_pll1_out" ,"clk_ext1" , };static const char *const imx8mn_gpt4_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_400m" , -"sys_pll1_40m" ,"video_pll1_out" ,"sys_pll1_80m" , +"sys_pll1_40m" ,"video_pll_out" ,"sys_pll1_80m" ,"audio_pll1_out" ,"clk_ext1" , };static const char *const imx8mn_gpt5_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_400m" , -"sys_pll1_40m" ,"video_pll1_out" ,"sys_pll1_80m" , +"sys_pll1_40m" ,"video_pll_out" ,"sys_pll1_80m" ,"audio_pll1_out" ,"clk_ext1" , };static const char *const imx8mn_gpt6_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_400m" , -"sys_pll1_40m" ,"video_pll1_out" ,"sys_pll1_80m" , +"sys_pll1_40m" ,"video_pll_out" ,"sys_pll1_80m" ,"audio_pll1_out" ,"clk_ext1" , };static const char *const imx8mn_wdog_sels[] = {"osc_24m" ,"sys_pll1_133m" ,"sys_pll1_160m" ,@@ -261,15 +261,15 @@ static const char * const imx8mn_wrclk_sels[] = {"osc_24m", "sys_pll1_40m", "m7_static const char *const imx8mn_dsi_core_sels[] = {"osc_24m" ,"sys_pll1_266m" ,"sys_pll2_250m" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" , -"audio_pll2_out" ,"video_pll1_out" , }; +"audio_pll2_out" ,"video_pll_out" , };static const char *const imx8mn_dsi_phy_sels[] = {"osc_24m" ,"sys_pll2_125m" ,"sys_pll2_100m" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"clk_ext2" , -"audio_pll2_out" ,"video_pll1_out" , }; +"audio_pll2_out" ,"video_pll_out" , };static const char *const imx8mn_dsi_dbi_sels[] = {"osc_24m" ,"sys_pll1_266m" ,"sys_pll2_100m" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" , -"audio_pll2_out" ,"video_pll1_out" , }; +"audio_pll2_out" ,"video_pll_out" , };static const char *const imx8mn_usdhc3_sels[] = {"osc_24m" ,"sys_pll1_400m" ,"sys_pll1_800m" ,"sys_pll2_500m" ,"sys_pll3_out" ,"sys_pll1_266m" ,@@ -277,15 +277,15 @@ static const char * const imx8mn_usdhc3_sels[] = {"osc_24m", "sys_pll1_400m", "sstatic const char *const imx8mn_camera_pixel_sels[] = {"osc_24m" ,"sys_pll1_266m" ,"sys_pll2_250m" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" , -"audio_pll2_out" ,"video_pll1_out" , }; +"audio_pll2_out" ,"video_pll_out" , };static const char *const imx8mn_csi1_phy_sels[] = {"osc_24m" ,"sys_pll2_333m" ,"sys_pll2_100m" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"clk_ext2" , -"audio_pll2_out" ,"video_pll1_out" , }; +"audio_pll2_out" ,"video_pll_out" , };static const char *const imx8mn_csi2_phy_sels[] = {"osc_24m" ,"sys_pll2_333m" ,"sys_pll2_100m" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"clk_ext2" , -"audio_pll2_out" ,"video_pll1_out" , }; +"audio_pll2_out" ,"video_pll_out" , };static const char *const imx8mn_csi2_esc_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_80m" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" ,@@ -306,9 +306,9 @@ static const char * const imx8mn_clko1_sels[] = {"osc_24m", "sys_pll1_800m", "du "dummy", "sys_pll1_80m", };static const char *const imx8mn_clko2_sels[] = {"osc_24m" ,"sys_pll2_200m" ,"sys_pll1_400m" ,"sys_pll2_166m" ,"sys_pll3_out" ,"audio_pll1_out" , -"video_pll1_out" ,"osc_32k" , }; +"video_pll_out" ,"osc_32k" , }; -static const char *const clkout_sels[] = {"audio_pll1_out" ,"audio_pll2_out" ,"video_pll1_out" , +static const char *const clkout_sels[] = {"audio_pll1_out" ,"audio_pll2_out" ,"video_pll_out" ,"dummy" ,"dummy" ,"gpu_pll_out" ,"dummy" ,"arm_pll_out" ,"sys_pll1" ,"sys_pll2" ,"sys_pll3" ,"dummy" ,"dummy" ,"osc_24m" ,"dummy" ,"osc_32k" };@@ -349,7 +349,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_AUDIO_PLL1_REF_SEL ] =imx_clk_hw_mux ("audio_pll1_ref_sel" , base +0x0 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); hws[IMX8MN_AUDIO_PLL2_REF_SEL ] =imx_clk_hw_mux ("audio_pll2_ref_sel" , base +0x14 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); - hws[IMX8MN_VIDEO_PLL1_REF_SEL ] =imx_clk_hw_mux ("video_pll1_ref_sel" , base +0x28 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); + hws[IMX8MN_VIDEO_PLL_REF_SEL ] =imx_clk_hw_mux ("video_pll_ref_sel" , base +0x28 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); hws[IMX8MN_DRAM_PLL_REF_SEL ] =imx_clk_hw_mux ("dram_pll_ref_sel" , base +0x50 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); hws[IMX8MN_GPU_PLL_REF_SEL ] =imx_clk_hw_mux ("gpu_pll_ref_sel" , base +0x64 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels)); hws[IMX8MN_M7_ALT_PLL_REF_SEL ] =imx_clk_hw_mux ("m7_alt_pll_ref_sel" , base +0x74 ,0 ,2 , pll_ref_sels,ARRAY_SIZE (pll_ref_sels));@@ -358,7 +358,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) hws[IMX8MN_AUDIO_PLL1 ] =imx_clk_hw_pll14xx ("audio_pll1" ,"audio_pll1_ref_sel" , base, &imx_1443x_pll); hws[IMX8MN_AUDIO_PLL2 ] =imx_clk_hw_pll14xx ("audio_pll2" ,"audio_pll2_ref_sel" , base +0x14 , &imx_1443x_pll); - hws[IMX8MN_VIDEO_PLL1 ] =imx_clk_hw_pll14xx ("video_pll1" ,"video_pll1_ref_sel" , base +0x28 , &imx_1443x_pll); + hws[IMX8MN_VIDEO_PLL ] =imx_clk_hw_pll14xx ("video_pll" ,"video_pll_ref_sel" , base +0x28 , &imx_1443x_pll); hws[IMX8MN_DRAM_PLL ] =imx_clk_hw_pll14xx ("dram_pll" ,"dram_pll_ref_sel" , base +0x50 , &imx_1443x_dram_pll); hws[IMX8MN_GPU_PLL ] =imx_clk_hw_pll14xx ("gpu_pll" ,"gpu_pll_ref_sel" , base +0x64 , &imx_1416x_pll); hws[IMX8MN_M7_ALT_PLL ] =imx_clk_hw_pll14xx ("m7_alt_pll" ,"m7_alt_pll_ref_sel" , base +0x74 , &imx_1416x_pll);@@ -370,7 +370,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev)/* PLL bypass out */ hws[IMX8MN_AUDIO_PLL1_BYPASS ] =imx_clk_hw_mux_flags ("audio_pll1_bypass" , base,16 ,1 , audio_pll1_bypass_sels,ARRAY_SIZE (audio_pll1_bypass_sels),CLK_SET_RATE_PARENT ); hws[IMX8MN_AUDIO_PLL2_BYPASS ] =imx_clk_hw_mux_flags ("audio_pll2_bypass" , base +0x14 ,16 ,1 , audio_pll2_bypass_sels,ARRAY_SIZE (audio_pll2_bypass_sels),CLK_SET_RATE_PARENT ); - hws[IMX8MN_VIDEO_PLL1_BYPASS ] =imx_clk_hw_mux_flags ("video_pll1_bypass" , base +0x28 ,16 ,1 , video_pll1_bypass_sels,ARRAY_SIZE (video_pll1_bypass_sels),CLK_SET_RATE_PARENT ); + hws[IMX8MN_VIDEO_PLL_BYPASS ] =imx_clk_hw_mux_flags ("video_pll_bypass" , base +0x28 ,16 ,1 , video_pll_bypass_sels,ARRAY_SIZE (video_pll_bypass_sels),CLK_SET_RATE_PARENT ); hws[IMX8MN_DRAM_PLL_BYPASS ] =imx_clk_hw_mux_flags ("dram_pll_bypass" , base +0x50 ,16 ,1 , dram_pll_bypass_sels,ARRAY_SIZE (dram_pll_bypass_sels),CLK_SET_RATE_PARENT ); hws[IMX8MN_GPU_PLL_BYPASS ] =imx_clk_hw_mux_flags ("gpu_pll_bypass" , base +0x64 ,28 ,1 , gpu_pll_bypass_sels,ARRAY_SIZE (gpu_pll_bypass_sels),CLK_SET_RATE_PARENT ); hws[IMX8MN_M7_ALT_PLL_BYPASS ] =imx_clk_hw_mux_flags ("m7_alt_pll_bypass" , base +0x74 ,28 ,1 , m7_alt_pll_bypass_sels,ARRAY_SIZE (m7_alt_pll_bypass_sels),CLK_SET_RATE_PARENT );@@ -380,7 +380,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev)/* PLL out gate */ hws[IMX8MN_AUDIO_PLL1_OUT ] =imx_clk_hw_gate ("audio_pll1_out" ,"audio_pll1_bypass" , base,13 ); hws[IMX8MN_AUDIO_PLL2_OUT ] =imx_clk_hw_gate ("audio_pll2_out" ,"audio_pll2_bypass" , base +0x14 ,13 ); - hws[IMX8MN_VIDEO_PLL1_OUT ] =imx_clk_hw_gate ("video_pll1_out" ,"video_pll1_bypass" , base +0x28 ,13 ); + hws[IMX8MN_VIDEO_PLL_OUT ] =imx_clk_hw_gate ("video_pll_out" ,"video_pll_bypass" , base +0x28 ,13 ); hws[IMX8MN_DRAM_PLL_OUT ] =imx_clk_hw_gate ("dram_pll_out" ,"dram_pll_bypass" , base +0x50 ,13 ); hws[IMX8MN_GPU_PLL_OUT ] =imx_clk_hw_gate ("gpu_pll_out" ,"gpu_pll_bypass" , base +0x64 ,11 ); hws[IMX8MN_M7_ALT_PLL_OUT ] =imx_clk_hw_gate ("m7_alt_pll_out" ,"m7_alt_pll_bypass" , base +0x74 ,11 );include/dt-bindings/clock/imx8mn-clock.h +8
-4@@ -16,7 +16,8 @@#define IMX8MN_CLK_EXT4 7#define IMX8MN_AUDIO_PLL1_REF_SEL 8#define IMX8MN_AUDIO_PLL2_REF_SEL 9 -#define IMX8MN_VIDEO_PLL1_REF_SEL 10 +#define IMX8MN_VIDEO_PLL_REF_SEL 10 +#define IMX8MN_VIDEO_PLL1_REF_SEL IMX8MN_VIDEO_PLL_REF_SEL#define IMX8MN_DRAM_PLL_REF_SEL 11#define IMX8MN_GPU_PLL_REF_SEL 12#define IMX8MN_M7_ALT_PLL_REF_SEL 13@@ -27,7 +28,8 @@#define IMX8MN_SYS_PLL3_REF_SEL 17#define IMX8MN_AUDIO_PLL1 18#define IMX8MN_AUDIO_PLL2 19 -#define IMX8MN_VIDEO_PLL1 20 +#define IMX8MN_VIDEO_PLL 20 +#define IMX8MN_VIDEO_PLL1 IMX8MN_VIDEO_PLL#define IMX8MN_DRAM_PLL 21#define IMX8MN_GPU_PLL 22#define IMX8MN_M7_ALT_PLL 23@@ -38,7 +40,8 @@#define IMX8MN_SYS_PLL3 27#define IMX8MN_AUDIO_PLL1_BYPASS 28#define IMX8MN_AUDIO_PLL2_BYPASS 29 -#define IMX8MN_VIDEO_PLL1_BYPASS 30 +#define IMX8MN_VIDEO_PLL_BYPASS 30 +#define IMX8MN_VIDEO_PLL1_BYPASS IMX8MN_VIDEO_PLL_BYPASS#define IMX8MN_DRAM_PLL_BYPASS 31#define IMX8MN_GPU_PLL_BYPASS 32#define IMX8MN_M7_ALT_PLL_BYPASS 33@@ -49,7 +52,8 @@#define IMX8MN_SYS_PLL3_BYPASS 37#define IMX8MN_AUDIO_PLL1_OUT 38#define IMX8MN_AUDIO_PLL2_OUT 39 -#define IMX8MN_VIDEO_PLL1_OUT 40 +#define IMX8MN_VIDEO_PLL_OUT 40 +#define IMX8MN_VIDEO_PLL1_OUT IMX8MN_VIDEO_PLL_OUT#define IMX8MN_DRAM_PLL_OUT 41#define IMX8MN_GPU_PLL_OUT 42#define IMX8MN_M7_ALT_PLL_OUT 43Signature · 1 line
2.32.0
PATCH v2 4/5 clk: imx8mn: fix imx8mn_sai2_sels clocks list
In reply to Dario BinacchiAccording to the "Clock Root" table of the reference manual (document IMX8MNRM Rev 2, 07/2022):
Clock Root offset Source Select (CCM_TARGET_ROOTn[MUX])
... ... ...
SAI2_CLK_ROOT 0xA600 000 - 24M_REF_CLK
001 - AUDIO_PLL1_CLK
010 - AUDIO_PLL2_CLK
011 - VIDEO_PLL_CLK
100 - SYSTEM_PLL1_DIV6
110 - EXT_CLK_2
111 - EXT_CLK_3
... ... ...while the imx8mn_sai2_sels list contained clk_ext3 and clk_ext4 for source select bits 110b and 111b.
---
(no changes since v1)
drivers/clk/imx/clk-imx8mn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/imx/clk-imx8mn.c +1 -1
@@ -109,7 +109,7 @@ static const char * const imx8mn_disp_pixel_sels[] = {"osc_24m", "video_pll_out"static const char *const imx8mn_sai2_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" ,"video_pll_out" ,"sys_pll1_133m" ,"dummy" , -"clk_ext3" ,"clk_ext4" , }; +"clk_ext2" ,"clk_ext3" , };static const char *const imx8mn_sai3_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" ,"video_pll_out" ,"sys_pll1_133m" ,"dummy" ,
Signature · 1 line
2.32.0
Re: [PATCH v2 4/5] clk: imx8mn: fix imx8mn_sai2_sels clocks list
Quoted 14 lines · Dario Binacchi
According to the "Clock Root" table of the reference manual (document IMX8MNRM Rev 2, 07/2022):
Clock Root offset Source Select (CCM_TARGET_ROOTn[MUX])
... ... ...
SAI2_CLK_ROOT0xA600000 - 24M_REF_CLK001 - AUDIO_PLL1_CLK 010 - AUDIO_PLL2_CLK 011 - VIDEO_PLL_CLK 100 - SYSTEM_PLL1_DIV6 110 - EXT_CLK_2 111 - EXT_CLK_3 ... ... ...
Quoted 5 lines
while the
imx8mn_sai2_selslist containedclk_ext3andclk_ext4for source select bits 110b and 111b.Fixes 96d6392b54dbb ("clk: imx: Add support for i.MX8MN clock driver")Signed-off-by Dario Binacchi <[email protected]>
Quoted 23 lines
---
(no changes since v1)
drivers/clk/imx/clk-imx8mn.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/clk/imx/clk-imx8mn.c +1
-1@@ -109,7 +109,7 @@ static const char * const imx8mn_disp_pixel_sels[] = {"osc_24m", "video_pll_out"static const char *const imx8mn_sai2_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" ,"video_pll_out" ,"sys_pll1_133m" ,"dummy" , -"clk_ext3" ,"clk_ext4" , }; +"clk_ext2" ,"clk_ext3" , };static const char *const imx8mn_sai3_sels[] = {"osc_24m" ,"audio_pll1_out" ,"audio_pll2_out" ,"video_pll_out" ,"sys_pll1_133m" ,"dummy" ,Signature · 1 line
2.32.0
PATCH v2 5/5 clk: imx8mn: fix imx8mn_enet_phy_sels clocks list
In reply to Dario BinacchiAccording to the "Clock Root" table of the reference manual (document IMX8MNRM Rev 2, 07/2022):
Clock Root offset Source Select (CCM_TARGET_ROOTn[MUX])
... ... ...
ENET_PHY_REF_CLK_ROOT 0xAA80 000 - 24M_REF_CLK
001 - SYSTEM_PLL2_DIV20
010 - SYSTEM_PLL2_DIV8
011 - SYSTEM_PLL2_DIV5
100 - SYSTEM_PLL2_DIV2
101 - AUDIO_PLL1_CLK
110 - VIDEO_PLL_CLK
111 - AUDIO_PLL2_CLK
... ... ...while the imx8mn_enet_phy_sels list didn't contained audio_pll1_out for source select bits 101b.
---
(no changes since v1)
drivers/clk/imx/clk-imx8mn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/imx/clk-imx8mn.c +2 -2
@@ -140,8 +140,8 @@ static const char * const imx8mn_enet_timer_sels[] = {"osc_24m", "sys_pll2_100m" "clk_ext4", "video_pll_out", };static const char *const imx8mn_enet_phy_sels[] = {"osc_24m" ,"sys_pll2_50m" ,"sys_pll2_125m" , -"sys_pll2_200m" ,"sys_pll2_500m" ,"video_pll_out" , -"audio_pll2_out" , }; +"sys_pll2_200m" ,"sys_pll2_500m" ,"audio_pll1_out" , +"video_pll_out" ,"audio_pll2_out" , };static const char *const imx8mn_nand_sels[] = {"osc_24m" ,"sys_pll2_500m" ,"audio_pll1_out" , "sys_pll1_400m", "audio_pll2_out", "sys_pll3_out",
Signature · 1 line
2.32.0
Re: [PATCH v2 5/5] clk: imx8mn: fix imx8mn_enet_phy_sels clocks list
Quoted 15 lines · Dario Binacchi
According to the "Clock Root" table of the reference manual (document IMX8MNRM Rev 2, 07/2022):
Clock Root offset Source Select (CCM_TARGET_ROOTn[MUX])
... ... ...
ENET_PHY_REF_CLK_ROOT0xAA80000 - 24M_REF_CLK001 - SYSTEM_PLL2_DIV20 010 - SYSTEM_PLL2_DIV8 011 - SYSTEM_PLL2_DIV5 100 - SYSTEM_PLL2_DIV2 101 - AUDIO_PLL1_CLK 110 - VIDEO_PLL_CLK 111 - AUDIO_PLL2_CLK ... ... ...
Quoted 5 lines
while the
imx8mn_enet_phy_selslist didn't containedaudio_pll1_outfor source select bits 101b.Fixes 96d6392b54dbb ("clk: imx: Add support for i.MX8MN clock driver")Signed-off-by Dario Binacchi <[email protected]>
Quoted 26 lines
---
(no changes since v1)
drivers/clk/imx/clk-imx8mn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/clk/imx/clk-imx8mn.c +2
-2@@ -140,8 +140,8 @@ static const char * const imx8mn_enet_timer_sels[] = {"osc_24m", "sys_pll2_100m" "clk_ext4", "video_pll_out", };static const char *const imx8mn_enet_phy_sels[] = {"osc_24m" ,"sys_pll2_50m" ,"sys_pll2_125m" , -"sys_pll2_200m" ,"sys_pll2_500m" ,"video_pll_out" , -"audio_pll2_out" , }; +"sys_pll2_200m" ,"sys_pll2_500m" ,"audio_pll1_out" , +"video_pll_out" ,"audio_pll2_out" , };static const char *const imx8mn_nand_sels[] = {"osc_24m" ,"sys_pll2_500m" ,"audio_pll1_out" , "sys_pll1_400m", "audio_pll2_out", "sys_pll3_out",Signature · 1 line
2.32.0
Hi Dario,
Quoted 11 lines · Dario Binacchi
This series has been tested on the BSH SystemMaster (SMM) S2 board.
Changes in v2:
- Update the commit message.
- Add Fixes tag.
- Maintain IMX8MN_VPU_* constants to not break backward compatibility.
- Update the commit message.
- Add Fixes tag.
- Maintain IMX8MN_VIDEO_PLL1* constants to not break backward compatibility.
Quoted 6 lines
Dario Binacchi (5):
clk: imx8mn: renamevpu_plltom7_alt_pll
clk: imx: replaceosc_hdmiwith dummy
clk: imx: renamevideo_pll1tovideo_pll
clk: imx8mn: fiximx8mn_sai2_selsclocks list
clk: imx8mn: fiximx8mn_enet_phy_selsclocks list
Whole series lgtm, feel free to add my
Hi Marco,
Quoted 22 lines · Marco Felsch
Hi Dario,
Quoted 11 lines · Dario Binacchi
This series has been tested on the BSH SystemMaster (SMM) S2 board.
Changes in v2:
- Update the commit message.
- Add Fixes tag.
- Maintain IMX8MN_VPU_* constants to not break backward compatibility.
- Update the commit message.
- Add Fixes tag.
- Maintain IMX8MN_VIDEO_PLL1* constants to not break backward compatibility.Quoted 6 lines
Dario Binacchi (5):
clk: imx8mn: renamevpu_plltom7_alt_pll
clk: imx: replaceosc_hdmiwith dummy
clk: imx: renamevideo_pll1tovideo_pll
clk: imx8mn: fiximx8mn_sai2_selsclocks list
clk: imx8mn: fiximx8mn_enet_phy_selsclocks list
Quoted 3 lines
Whole series lgtm, feel free to add my
Acked-by Marco Felsch <[email protected]>
Thanks for the review
Regards,
Dario
Signature · 17 lines
Dario Binacchi Embedded Linux Developer [email protected] __________________________________ Amarula Solutions SRL Via Le Canevare 30, 31100 Treviso, Veneto, IT T. +39 042 243 5310 [email protected] www.amarulasolutions.com
Abel Vesa
AppliedQuoted 2 lines · Dario Binacchi
This series has been tested on the BSH SystemMaster (SMM) S2 board.
Applied to my tree. Thanks!
Quoted 23 lines
Changes in v2:
- Update the commit message.
- Add Fixes tag.
- Maintain IMX8MN_VPU_* constants to not break backward compatibility.
- Update the commit message.
- Add Fixes tag.
- Maintain IMX8MN_VIDEO_PLL1* constants to not break backward compatibility.Dario Binacchi (5):
clk: imx8mn: renamevpu_plltom7_alt_pll
clk: imx: replaceosc_hdmiwith dummy
clk: imx: renamevideo_pll1tovideo_pll
clk: imx8mn: fiximx8mn_sai2_selsclocks list
clk: imx8mn: fiximx8mn_enet_phy_selsclocks listdrivers/clk/imx/clk-imx8mn.c | 116 +++++++++++------------ include/dt-bindings/clock/imx8mn-clock.h | 24 +++-- 2 files changed, 74 insertions(+), 66 deletions(-)Signature · 1 line
2.32.0