clk: imx8m: Fix incorrect parents
cover clk: imx8m: Fix incorrect parents
No checks are made to ensure the parents in the _sels arrays actually exist and it turns out that several are incorrect.
I found the errors using a hack to clk core, is there a better way?
Also add imx8mn GIC clock while we're at it because otherwise parent could get disabled and lock the system.
Leonard Crestez (4):
clk: imx8mq: Fix sys3 pll references
clk: imx8mm: Fix incorrect parents
clk: imx8mn: Fix incorrect parents
clk: imx8mn: Add GIC clock
drivers/clk/imx/clk-imx8mm.c | 8 +- drivers/clk/imx/clk-imx8mn.c | 19 ++-- drivers/clk/imx/clk-imx8mq.c | 112 +++++++++++------------ include/dt-bindings/clock/imx8mn-clock.h | 3 +- 4 files changed, 74 insertions(+), 68 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/4 clk: imx8mq: Fix sys3 pll references
The "sys3_pll2_out" CLK was removed in refactoring so all references need to be updated to "sys3_pll_out"
--- drivers/clk/imx/clk-imx8mq.c | 112 +++++++++++++++++------------------ 1 file changed, 56 insertions(+), 56 deletions(-)
drivers/clk/imx/clk-imx8mq.c +56 -56
@@ -39,93 +39,93 @@ static const char * const sys2_pll_out_sels[] = {"sys1_pll1_ref_sel", "sys2_pll1static const char *const sys3_pll_out_sels[] = {"sys3_pll1_ref_sel" ,"sys2_pll1_ref_sel" , };static const char *const dram_pll_out_sels[] = {"dram_pll1_ref_sel" , };/* CCM ROOT */ static const char *const imx8mq_a53_sels[] = {"osc_25m" ,"arm_pll_out" ,"sys2_pll_500m" ,"sys2_pll_1000m" , -"sys1_pll_800m" ,"sys1_pll_400m" ,"audio_pll1_out" ,"sys3_pll2_out" , }; +"sys1_pll_800m" ,"sys1_pll_400m" ,"audio_pll1_out" ,"sys3_pll_out" , };static const char *const imx8mq_arm_m4_sels[] = {"osc_25m" ,"sys2_pll_200m" ,"sys2_pll_250m" ,"sys1_pll_266m" , -"sys1_pll_800m" ,"audio_pll1_out" ,"video_pll1_out" ,"sys3_pll2_out" , }; +"sys1_pll_800m" ,"audio_pll1_out" ,"video_pll1_out" ,"sys3_pll_out" , };static const char *const imx8mq_vpu_sels[] = {"osc_25m" ,"arm_pll_out" ,"sys2_pll_500m" ,"sys2_pll_1000m" ,"sys1_pll_800m" ,"sys1_pll_400m" ,"audio_pll1_out" ,"vpu_pll_out" , }; -static const char *const imx8mq_gpu_core_sels[] = {"osc_25m" ,"gpu_pll_out" ,"sys1_pll_800m" ,"sys3_pll2_out" , +static const char *const imx8mq_gpu_core_sels[] = {"osc_25m" ,"gpu_pll_out" ,"sys1_pll_800m" ,"sys3_pll_out" ,"sys2_pll_1000m" ,"audio_pll1_out" ,"video_pll1_out" ,"audio_pll2_out" , }; -static const char *const imx8mq_gpu_shader_sels[] = {"osc_25m" ,"gpu_pll_out" ,"sys1_pll_800m" ,"sys3_pll2_out" , +static const char *const imx8mq_gpu_shader_sels[] = {"osc_25m" ,"gpu_pll_out" ,"sys1_pll_800m" ,"sys3_pll_out" ,"sys2_pll_1000m" ,"audio_pll1_out" ,"video_pll1_out" ,"audio_pll2_out" , };static const char *const imx8mq_main_axi_sels[] = {"osc_25m" ,"sys2_pll_333m" ,"sys1_pll_800m" ,"sys2_pll_250m" ,"sys2_pll_1000m" ,"audio_pll1_out" ,"video_pll1_out" ,"sys1_pll_100m" ,};static const char *const imx8mq_enet_axi_sels[] = {"osc_25m" ,"sys1_pll_266m" ,"sys1_pll_800m" ,"sys2_pll_250m" , -"sys2_pll_200m" ,"audio_pll1_out" ,"video_pll1_out" ,"sys3_pll2_out" , }; +"sys2_pll_200m" ,"audio_pll1_out" ,"video_pll1_out" ,"sys3_pll_out" , };static const char *const imx8mq_nand_usdhc_sels[] = {"osc_25m" ,"sys1_pll_266m" ,"sys1_pll_800m" ,"sys2_pll_200m" , -"sys1_pll_133m" ,"sys3_pll2_out" ,"sys2_pll_250m" ,"audio_pll1_out" , }; +"sys1_pll_133m" ,"sys3_pll_out" ,"sys2_pll_250m" ,"audio_pll1_out" , }; -static const char *const imx8mq_vpu_bus_sels[] = {"osc_25m" ,"sys1_pll_800m" ,"vpu_pll_out" ,"audio_pll2_out" ,"sys3_pll2_out" ,"sys2_pll_1000m" ,"sys2_pll_200m" ,"sys1_pll_100m" , }; +static const char *const imx8mq_vpu_bus_sels[] = {"osc_25m" ,"sys1_pll_800m" ,"vpu_pll_out" ,"audio_pll2_out" ,"sys3_pll_out" ,"sys2_pll_1000m" ,"sys2_pll_200m" ,"sys1_pll_100m" , }; -static const char *const imx8mq_disp_axi_sels[] = {"osc_25m" ,"sys2_pll_125m" ,"sys1_pll_800m" ,"sys3_pll2_out" ,"sys1_pll_400m" ,"audio_pll2_out" ,"clk_ext1" ,"clk_ext4" , }; +static const char *const imx8mq_disp_axi_sels[] = {"osc_25m" ,"sys2_pll_125m" ,"sys1_pll_800m" ,"sys3_pll_out" ,"sys1_pll_400m" ,"audio_pll2_out" ,"clk_ext1" ,"clk_ext4" , }; -static const char *const imx8mq_disp_apb_sels[] = {"osc_25m" ,"sys2_pll_125m" ,"sys1_pll_800m" ,"sys3_pll2_out" , +static const char *const imx8mq_disp_apb_sels[] = {"osc_25m" ,"sys2_pll_125m" ,"sys1_pll_800m" ,"sys3_pll_out" ,"sys1_pll_40m" ,"audio_pll2_out" ,"clk_ext1" ,"clk_ext3" , };static const char *const imx8mq_disp_rtrm_sels[] = {"osc_25m" ,"sys1_pll_800m" ,"sys2_pll_200m" ,"sys1_pll_400m" ,"audio_pll1_out" ,"video_pll1_out" ,"clk_ext2" ,"clk_ext3" , };static const char *const imx8mq_usb_bus_sels[] = {"osc_25m" ,"sys2_pll_500m" ,"sys1_pll_800m" ,"sys2_pll_100m" ,"sys2_pll_200m" ,"clk_ext2" ,"clk_ext4" ,"audio_pll2_out" , }; -static const char *const imx8mq_gpu_axi_sels[] = {"osc_25m" ,"sys1_pll_800m" ,"gpu_pll_out" ,"sys3_pll2_out" ,"sys2_pll_1000m" , +static const char *const imx8mq_gpu_axi_sels[] = {"osc_25m" ,"sys1_pll_800m" ,"gpu_pll_out" ,"sys3_pll_out" ,"sys2_pll_1000m" ,"audio_pll1_out" ,"video_pll1_out" ,"audio_pll2_out" , }; -static const char *const imx8mq_gpu_ahb_sels[] = {"osc_25m" ,"sys1_pll_800m" ,"gpu_pll_out" ,"sys3_pll2_out" ,"sys2_pll_1000m" , +static const char *const imx8mq_gpu_ahb_sels[] = {"osc_25m" ,"sys1_pll_800m" ,"gpu_pll_out" ,"sys3_pll_out" ,"sys2_pll_1000m" ,"audio_pll1_out" ,"video_pll1_out" ,"audio_pll2_out" , }; -static const char *const imx8mq_noc_sels[] = {"osc_25m" ,"sys1_pll_800m" ,"sys3_pll2_out" ,"sys2_pll_1000m" ,"sys2_pll_500m" , +static const char *const imx8mq_noc_sels[] = {"osc_25m" ,"sys1_pll_800m" ,"sys3_pll_out" ,"sys2_pll_1000m" ,"sys2_pll_500m" ,"audio_pll1_out" ,"video_pll1_out" ,"audio_pll2_out" , }; -static const char *const imx8mq_noc_apb_sels[] = {"osc_25m" ,"sys1_pll_400m" ,"sys3_pll2_out" ,"sys2_pll_333m" ,"sys2_pll_200m" , +static const char *const imx8mq_noc_apb_sels[] = {"osc_25m" ,"sys1_pll_400m" ,"sys3_pll_out" ,"sys2_pll_333m" ,"sys2_pll_200m" ,"sys1_pll_800m" ,"audio_pll1_out" ,"video_pll1_out" , };static const char *const imx8mq_ahb_sels[] = {"osc_25m" ,"sys1_pll_133m" ,"sys1_pll_800m" ,"sys1_pll_400m" , -"sys2_pll_125m" ,"sys3_pll2_out" ,"audio_pll1_out" ,"video_pll1_out" , }; +"sys2_pll_125m" ,"sys3_pll_out" ,"audio_pll1_out" ,"video_pll1_out" , };static const char *const imx8mq_audio_ahb_sels[] = {"osc_25m" ,"sys2_pll_500m" ,"sys1_pll_800m" ,"sys2_pll_1000m" , -"sys2_pll_166m" ,"sys3_pll2_out" ,"audio_pll1_out" ,"video_pll1_out" , }; +"sys2_pll_166m" ,"sys3_pll_out" ,"audio_pll1_out" ,"video_pll1_out" , };static const char *const imx8mq_dsi_ahb_sels[] = {"osc_25m" ,"sys2_pll_100m" ,"sys1_pll_80m" ,"sys1_pll_800m" , -"sys2_pll_1000m" ,"sys3_pll2_out" ,"clk_ext3" ,"audio_pll2_out" }; +"sys2_pll_1000m" ,"sys3_pll_out" ,"clk_ext3" ,"audio_pll2_out" };static const char *const imx8mq_dram_alt_sels[] = {"osc_25m" ,"sys1_pll_800m" ,"sys1_pll_100m" ,"sys2_pll_500m" ,"sys2_pll_250m" ,"sys1_pll_400m" ,"audio_pll1_out" ,"sys1_pll_266m" , };static const char *const imx8mq_dram_apb_sels[] = {"osc_25m" ,"sys2_pll_200m" ,"sys1_pll_40m" ,"sys1_pll_160m" , -"sys1_pll_800m" ,"sys3_pll2_out" ,"sys2_pll_250m" ,"audio_pll2_out" , }; +"sys1_pll_800m" ,"sys3_pll_out" ,"sys2_pll_250m" ,"audio_pll2_out" , }; -static const char *const imx8mq_vpu_g1_sels[] = {"osc_25m" ,"vpu_pll_out" ,"sys1_pll_800m" ,"sys2_pll_1000m" ,"sys1_pll_100m" ,"sys2_pll_125m" ,"sys3_pll2_out" ,"audio_pll1_out" , }; +static const char *const imx8mq_vpu_g1_sels[] = {"osc_25m" ,"vpu_pll_out" ,"sys1_pll_800m" ,"sys2_pll_1000m" ,"sys1_pll_100m" ,"sys2_pll_125m" ,"sys3_pll_out" ,"audio_pll1_out" , }; -static const char *const imx8mq_vpu_g2_sels[] = {"osc_25m" ,"vpu_pll_out" ,"sys1_pll_800m" ,"sys2_pll_1000m" ,"sys1_pll_100m" ,"sys2_pll_125m" ,"sys3_pll2_out" ,"audio_pll1_out" , }; +static const char *const imx8mq_vpu_g2_sels[] = {"osc_25m" ,"vpu_pll_out" ,"sys1_pll_800m" ,"sys2_pll_1000m" ,"sys1_pll_100m" ,"sys2_pll_125m" ,"sys3_pll_out" ,"audio_pll1_out" , }; -static const char *const imx8mq_disp_dtrc_sels[] = {"osc_25m" ,"vpu_pll_out" ,"sys1_pll_800m" ,"sys2_pll_1000m" ,"sys1_pll_160m" ,"sys2_pll_100m" ,"sys3_pll2_out" ,"audio_pll2_out" , }; +static const char *const imx8mq_disp_dtrc_sels[] = {"osc_25m" ,"vpu_pll_out" ,"sys1_pll_800m" ,"sys2_pll_1000m" ,"sys1_pll_160m" ,"sys2_pll_100m" ,"sys3_pll_out" ,"audio_pll2_out" , }; -static const char *const imx8mq_disp_dc8000_sels[] = {"osc_25m" ,"vpu_pll_out" ,"sys1_pll_800m" ,"sys2_pll_1000m" ,"sys1_pll_160m" ,"sys2_pll_100m" ,"sys3_pll2_out" ,"audio_pll2_out" , }; +static const char *const imx8mq_disp_dc8000_sels[] = {"osc_25m" ,"vpu_pll_out" ,"sys1_pll_800m" ,"sys2_pll_1000m" ,"sys1_pll_160m" ,"sys2_pll_100m" ,"sys3_pll_out" ,"audio_pll2_out" , };static const char *const imx8mq_pcie1_ctrl_sels[] = {"osc_25m" ,"sys2_pll_250m" ,"sys2_pll_200m" ,"sys1_pll_266m" , -"sys1_pll_800m" ,"sys2_pll_500m" ,"sys2_pll_250m" ,"sys3_pll2_out" , }; +"sys1_pll_800m" ,"sys2_pll_500m" ,"sys2_pll_250m" ,"sys3_pll_out" , };static const char *const imx8mq_pcie1_phy_sels[] = {"osc_25m" ,"sys2_pll_100m" ,"sys2_pll_500m" ,"clk_ext1" ,"clk_ext2" ,"clk_ext3" ,"clk_ext4" , }; -static const char *const imx8mq_pcie1_aux_sels[] = {"osc_25m" ,"sys2_pll_200m" ,"sys2_pll_500m" ,"sys3_pll2_out" , +static const char *const imx8mq_pcie1_aux_sels[] = {"osc_25m" ,"sys2_pll_200m" ,"sys2_pll_500m" ,"sys3_pll_out" ,"sys2_pll_100m" ,"sys1_pll_80m" ,"sys1_pll_160m" ,"sys1_pll_200m" , }; -static const char *const imx8mq_dc_pixel_sels[] = {"osc_25m" ,"video_pll1_out" ,"audio_pll2_out" ,"audio_pll1_out" ,"sys1_pll_800m" ,"sys2_pll_1000m" ,"sys3_pll2_out" ,"clk_ext4" , }; +static const char *const imx8mq_dc_pixel_sels[] = {"osc_25m" ,"video_pll1_out" ,"audio_pll2_out" ,"audio_pll1_out" ,"sys1_pll_800m" ,"sys2_pll_1000m" ,"sys3_pll_out" ,"clk_ext4" , }; -static const char *const imx8mq_lcdif_pixel_sels[] = {"osc_25m" ,"video_pll1_out" ,"audio_pll2_out" ,"audio_pll1_out" ,"sys1_pll_800m" ,"sys2_pll_1000m" ,"sys3_pll2_out" ,"clk_ext4" , }; +static const char *const imx8mq_lcdif_pixel_sels[] = {"osc_25m" ,"video_pll1_out" ,"audio_pll2_out" ,"audio_pll1_out" ,"sys1_pll_800m" ,"sys2_pll_1000m" ,"sys3_pll_out" ,"clk_ext4" , };static const char *const imx8mq_sai1_sels[] = {"osc_25m" ,"audio_pll1_out" ,"audio_pll2_out" ,"video_pll1_out" ,"sys1_pll_133m" ,"osc_27m" ,"clk_ext1" ,"clk_ext2" , };static const char *const imx8mq_sai2_sels[] = {"osc_25m" ,"audio_pll1_out" ,"audio_pll2_out" ,"video_pll1_out" ,"sys1_pll_133m" ,"osc_27m" ,"clk_ext2" ,"clk_ext3" , };
@@ -149,44 +149,44 @@ static const char * const imx8mq_enet_timer_sels[] = {"osc_25m", "sys2_pll_100m"static const char *const imx8mq_enet_phy_sels[] = {"osc_25m" ,"sys2_pll_50m" ,"sys2_pll_125m" ,"sys2_pll_500m" ,"audio_pll1_out" ,"video_pll1_out" ,"audio_pll2_out" , };static const char *const imx8mq_nand_sels[] = {"osc_25m" ,"sys2_pll_500m" ,"audio_pll1_out" ,"sys1_pll_400m" , -"audio_pll2_out" ,"sys3_pll2_out" ,"sys2_pll_250m" ,"video_pll1_out" , }; +"audio_pll2_out" ,"sys3_pll_out" ,"sys2_pll_250m" ,"video_pll1_out" , };static const char *const imx8mq_qspi_sels[] = {"osc_25m" ,"sys1_pll_400m" ,"sys1_pll_800m" ,"sys2_pll_500m" , -"audio_pll2_out" ,"sys1_pll_266m" ,"sys3_pll2_out" ,"sys1_pll_100m" , }; +"audio_pll2_out" ,"sys1_pll_266m" ,"sys3_pll_out" ,"sys1_pll_100m" , };static const char *const imx8mq_usdhc1_sels[] = {"osc_25m" ,"sys1_pll_400m" ,"sys1_pll_800m" ,"sys2_pll_500m" , -"audio_pll2_out" ,"sys1_pll_266m" ,"sys3_pll2_out" ,"sys1_pll_100m" , }; +"audio_pll2_out" ,"sys1_pll_266m" ,"sys3_pll_out" ,"sys1_pll_100m" , };static const char *const imx8mq_usdhc2_sels[] = {"osc_25m" ,"sys1_pll_400m" ,"sys1_pll_800m" ,"sys2_pll_500m" , -"audio_pll2_out" ,"sys1_pll_266m" ,"sys3_pll2_out" ,"sys1_pll_100m" , }; +"audio_pll2_out" ,"sys1_pll_266m" ,"sys3_pll_out" ,"sys1_pll_100m" , }; -static const char *const imx8mq_i2c1_sels[] = {"osc_25m" ,"sys1_pll_160m" ,"sys2_pll_50m" ,"sys3_pll2_out" ,"audio_pll1_out" , +static const char *const imx8mq_i2c1_sels[] = {"osc_25m" ,"sys1_pll_160m" ,"sys2_pll_50m" ,"sys3_pll_out" ,"audio_pll1_out" ,"video_pll1_out" ,"audio_pll2_out" ,"sys1_pll_133m" , }; -static const char *const imx8mq_i2c2_sels[] = {"osc_25m" ,"sys1_pll_160m" ,"sys2_pll_50m" ,"sys3_pll2_out" ,"audio_pll1_out" , +static const char *const imx8mq_i2c2_sels[] = {"osc_25m" ,"sys1_pll_160m" ,"sys2_pll_50m" ,"sys3_pll_out" ,"audio_pll1_out" ,"video_pll1_out" ,"audio_pll2_out" ,"sys1_pll_133m" , }; -static const char *const imx8mq_i2c3_sels[] = {"osc_25m" ,"sys1_pll_160m" ,"sys2_pll_50m" ,"sys3_pll2_out" ,"audio_pll1_out" , +static const char *const imx8mq_i2c3_sels[] = {"osc_25m" ,"sys1_pll_160m" ,"sys2_pll_50m" ,"sys3_pll_out" ,"audio_pll1_out" ,"video_pll1_out" ,"audio_pll2_out" ,"sys1_pll_133m" , }; -static const char *const imx8mq_i2c4_sels[] = {"osc_25m" ,"sys1_pll_160m" ,"sys2_pll_50m" ,"sys3_pll2_out" ,"audio_pll1_out" , +static const char *const imx8mq_i2c4_sels[] = {"osc_25m" ,"sys1_pll_160m" ,"sys2_pll_50m" ,"sys3_pll_out" ,"audio_pll1_out" ,"video_pll1_out" ,"audio_pll2_out" ,"sys1_pll_133m" , };static const char *const imx8mq_uart1_sels[] = {"osc_25m" ,"sys1_pll_80m" ,"sys2_pll_200m" ,"sys2_pll_100m" , -"sys3_pll2_out" ,"clk_ext2" ,"clk_ext4" ,"audio_pll2_out" , }; +"sys3_pll_out" ,"clk_ext2" ,"clk_ext4" ,"audio_pll2_out" , };static const char *const imx8mq_uart2_sels[] = {"osc_25m" ,"sys1_pll_80m" ,"sys2_pll_200m" ,"sys2_pll_100m" , -"sys3_pll2_out" ,"clk_ext2" ,"clk_ext3" ,"audio_pll2_out" , }; +"sys3_pll_out" ,"clk_ext2" ,"clk_ext3" ,"audio_pll2_out" , };static const char *const imx8mq_uart3_sels[] = {"osc_25m" ,"sys1_pll_80m" ,"sys2_pll_200m" ,"sys2_pll_100m" , -"sys3_pll2_out" ,"clk_ext2" ,"clk_ext4" ,"audio_pll2_out" , }; +"sys3_pll_out" ,"clk_ext2" ,"clk_ext4" ,"audio_pll2_out" , };static const char *const imx8mq_uart4_sels[] = {"osc_25m" ,"sys1_pll_80m" ,"sys2_pll_200m" ,"sys2_pll_100m" , -"sys3_pll2_out" ,"clk_ext2" ,"clk_ext3" ,"audio_pll2_out" , }; +"sys3_pll_out" ,"clk_ext2" ,"clk_ext3" ,"audio_pll2_out" , };static const char *const imx8mq_usb_core_sels[] = {"osc_25m" ,"sys1_pll_100m" ,"sys1_pll_40m" ,"sys2_pll_100m" ,"sys2_pll_200m" ,"clk_ext2" ,"clk_ext3" ,"audio_pll2_out" , };static const char *const imx8mq_usb_phy_sels[] = {"osc_25m" ,"sys1_pll_100m" ,"sys1_pll_40m" ,"sys2_pll_100m" ,
@@ -194,83 +194,83 @@ static const char * const imx8mq_usb_phy_sels[] = {"osc_25m", "sys1_pll_100m", "static const char *const imx8mq_gic_sels[] = {"osc_25m" ,"sys2_pll_200m" ,"sys1_pll_40m" ,"sys2_pll_100m" ,"sys2_pll_200m" ,"clk_ext2" ,"clk_ext3" ,"audio_pll2_out" };static const char *const imx8mq_ecspi1_sels[] = {"osc_25m" ,"sys2_pll_200m" ,"sys1_pll_40m" ,"sys1_pll_160m" , -"sys1_pll_800m" ,"sys3_pll2_out" ,"sys2_pll_250m" ,"audio_pll2_out" , }; +"sys1_pll_800m" ,"sys3_pll_out" ,"sys2_pll_250m" ,"audio_pll2_out" , };static const char *const imx8mq_ecspi2_sels[] = {"osc_25m" ,"sys2_pll_200m" ,"sys1_pll_40m" ,"sys1_pll_160m" , -"sys1_pll_800m" ,"sys3_pll2_out" ,"sys2_pll_250m" ,"audio_pll2_out" , }; +"sys1_pll_800m" ,"sys3_pll_out" ,"sys2_pll_250m" ,"audio_pll2_out" , };static const char *const imx8mq_pwm1_sels[] = {"osc_25m" ,"sys2_pll_100m" ,"sys1_pll_160m" ,"sys1_pll_40m" , -"sys3_pll2_out" ,"clk_ext1" ,"sys1_pll_80m" ,"video_pll1_out" , }; +"sys3_pll_out" ,"clk_ext1" ,"sys1_pll_80m" ,"video_pll1_out" , };static const char *const imx8mq_pwm2_sels[] = {"osc_25m" ,"sys2_pll_100m" ,"sys1_pll_160m" ,"sys1_pll_40m" , -"sys3_pll2_out" ,"clk_ext1" ,"sys1_pll_80m" ,"video_pll1_out" , }; +"sys3_pll_out" ,"clk_ext1" ,"sys1_pll_80m" ,"video_pll1_out" , };static const char *const imx8mq_pwm3_sels[] = {"osc_25m" ,"sys2_pll_100m" ,"sys1_pll_160m" ,"sys1_pll_40m" , -"sys3_pll2_out" ,"clk_ext2" ,"sys1_pll_80m" ,"video_pll1_out" , }; +"sys3_pll_out" ,"clk_ext2" ,"sys1_pll_80m" ,"video_pll1_out" , };static const char *const imx8mq_pwm4_sels[] = {"osc_25m" ,"sys2_pll_100m" ,"sys1_pll_160m" ,"sys1_pll_40m" , -"sys3_pll2_out" ,"clk_ext2" ,"sys1_pll_80m" ,"video_pll1_out" , }; +"sys3_pll_out" ,"clk_ext2" ,"sys1_pll_80m" ,"video_pll1_out" , };static const char *const imx8mq_gpt1_sels[] = {"osc_25m" ,"sys2_pll_100m" ,"sys1_pll_400m" ,"sys1_pll_40m" ,"sys1_pll_80m" ,"audio_pll1_out" ,"clk_ext1" , };static const char *const imx8mq_wdog_sels[] = {"osc_25m" ,"sys1_pll_133m" ,"sys1_pll_160m" ,"vpu_pll_out" , -"sys2_pll_125m" ,"sys3_pll2_out" ,"sys1_pll_80m" ,"sys2_pll_166m" , }; +"sys2_pll_125m" ,"sys3_pll_out" ,"sys1_pll_80m" ,"sys2_pll_166m" , }; -static const char *const imx8mq_wrclk_sels[] = {"osc_25m" ,"sys1_pll_40m" ,"vpu_pll_out" ,"sys3_pll2_out" ,"sys2_pll_200m" , +static const char *const imx8mq_wrclk_sels[] = {"osc_25m" ,"sys1_pll_40m" ,"vpu_pll_out" ,"sys3_pll_out" ,"sys2_pll_200m" ,"sys1_pll_266m" ,"sys2_pll_500m" ,"sys1_pll_100m" , };static const char *const imx8mq_dsi_core_sels[] = {"osc_25m" ,"sys1_pll_266m" ,"sys2_pll_250m" ,"sys1_pll_800m" , -"sys2_pll_1000m" ,"sys3_pll2_out" ,"audio_pll2_out" ,"video_pll1_out" , }; +"sys2_pll_1000m" ,"sys3_pll_out" ,"audio_pll2_out" ,"video_pll1_out" , };static const char *const imx8mq_dsi_phy_sels[] = {"osc_25m" ,"sys2_pll_125m" ,"sys2_pll_100m" ,"sys1_pll_800m" ,"sys2_pll_1000m" ,"clk_ext2" ,"audio_pll2_out" ,"video_pll1_out" , };static const char *const imx8mq_dsi_dbi_sels[] = {"osc_25m" ,"sys1_pll_266m" ,"sys2_pll_100m" ,"sys1_pll_800m" , -"sys2_pll_1000m" ,"sys3_pll2_out" ,"audio_pll2_out" ,"video_pll1_out" , }; +"sys2_pll_1000m" ,"sys3_pll_out" ,"audio_pll2_out" ,"video_pll1_out" , };static const char *const imx8mq_dsi_esc_sels[] = {"osc_25m" ,"sys2_pll_100m" ,"sys1_pll_80m" ,"sys1_pll_800m" , -"sys2_pll_1000m" ,"sys3_pll2_out" ,"clk_ext3" ,"audio_pll2_out" , }; +"sys2_pll_1000m" ,"sys3_pll_out" ,"clk_ext3" ,"audio_pll2_out" , };static const char *const imx8mq_csi1_core_sels[] = {"osc_25m" ,"sys1_pll_266m" ,"sys2_pll_250m" ,"sys1_pll_800m" , -"sys2_pll_1000m" ,"sys3_pll2_out" ,"audio_pll2_out" ,"video_pll1_out" , }; +"sys2_pll_1000m" ,"sys3_pll_out" ,"audio_pll2_out" ,"video_pll1_out" , };static const char *const imx8mq_csi1_phy_sels[] = {"osc_25m" ,"sys2_pll_125m" ,"sys2_pll_100m" ,"sys1_pll_800m" ,"sys2_pll_1000m" ,"clk_ext2" ,"audio_pll2_out" ,"video_pll1_out" , };static const char *const imx8mq_csi1_esc_sels[] = {"osc_25m" ,"sys2_pll_100m" ,"sys1_pll_80m" ,"sys1_pll_800m" , -"sys2_pll_1000m" ,"sys3_pll2_out" ,"clk_ext3" ,"audio_pll2_out" , }; +"sys2_pll_1000m" ,"sys3_pll_out" ,"clk_ext3" ,"audio_pll2_out" , };static const char *const imx8mq_csi2_core_sels[] = {"osc_25m" ,"sys1_pll_266m" ,"sys2_pll_250m" ,"sys1_pll_800m" , -"sys2_pll_1000m" ,"sys3_pll2_out" ,"audio_pll2_out" ,"video_pll1_out" , }; +"sys2_pll_1000m" ,"sys3_pll_out" ,"audio_pll2_out" ,"video_pll1_out" , };static const char *const imx8mq_csi2_phy_sels[] = {"osc_25m" ,"sys2_pll_125m" ,"sys2_pll_100m" ,"sys1_pll_800m" ,"sys2_pll_1000m" ,"clk_ext2" ,"audio_pll2_out" ,"video_pll1_out" , };static const char *const imx8mq_csi2_esc_sels[] = {"osc_25m" ,"sys2_pll_100m" ,"sys1_pll_80m" ,"sys1_pll_800m" , -"sys2_pll_1000m" ,"sys3_pll2_out" ,"clk_ext3" ,"audio_pll2_out" , }; +"sys2_pll_1000m" ,"sys3_pll_out" ,"clk_ext3" ,"audio_pll2_out" , };static const char *const imx8mq_pcie2_ctrl_sels[] = {"osc_25m" ,"sys2_pll_250m" ,"sys2_pll_200m" ,"sys1_pll_266m" , -"sys1_pll_800m" ,"sys2_pll_500m" ,"sys2_pll_333m" ,"sys3_pll2_out" , }; +"sys1_pll_800m" ,"sys2_pll_500m" ,"sys2_pll_333m" ,"sys3_pll_out" , };static const char *const imx8mq_pcie2_phy_sels[] = {"osc_25m" ,"sys2_pll_100m" ,"sys2_pll_500m" ,"clk_ext1" ,"clk_ext2" ,"clk_ext3" ,"clk_ext4" ,"sys1_pll_400m" , }; -static const char *const imx8mq_pcie2_aux_sels[] = {"osc_25m" ,"sys2_pll_200m" ,"sys2_pll_50m" ,"sys3_pll2_out" , +static const char *const imx8mq_pcie2_aux_sels[] = {"osc_25m" ,"sys2_pll_200m" ,"sys2_pll_50m" ,"sys3_pll_out" ,"sys2_pll_100m" ,"sys1_pll_80m" ,"sys1_pll_160m" ,"sys1_pll_200m" , };static const char *const imx8mq_ecspi3_sels[] = {"osc_25m" ,"sys2_pll_200m" ,"sys1_pll_40m" ,"sys1_pll_160m" , -"sys1_pll_800m" ,"sys3_pll2_out" ,"sys2_pll_250m" ,"audio_pll2_out" , }; +"sys1_pll_800m" ,"sys3_pll_out" ,"sys2_pll_250m" ,"audio_pll2_out" , };static const char *const imx8mq_dram_core_sels[] = {"dram_pll_out" ,"dram_alt_root" , };static const char *const imx8mq_clko1_sels[] = {"osc_25m" ,"sys1_pll_800m" ,"osc_27m" ,"sys1_pll_200m" ,"audio_pll2_out" ,"sys2_pll_500m" ,"vpu_pll_out" ,"sys1_pll_80m" , };static const char *const imx8mq_clko2_sels[] = {"osc_25m" ,"sys2_pll_200m" ,"sys1_pll_400m" ,"sys2_pll_166m" , -"sys3_pll2_out" ,"audio_pll1_out" ,"video_pll1_out" ,"ckil" , }; +"sys3_pll_out" ,"audio_pll1_out" ,"video_pll1_out" ,"ckil" , };static struct clk_onecell_data clk_data;static struct clk **const uart_clks[] = { &clks[IMX8MQ_CLK_UART1_ROOT ],
Signature · 1 line
2.17.1
PATCH 2/4 clk: imx8mm: Fix incorrect parents
In reply to Leonard Crestez* There is no video_pll2 on imx8mm, replace with dummy
* Replace reference to sys_pll3_clk with sys_pll3_out
* qspi parent[2] is sys_pll2_333m not sys_pll1_800m
--- drivers/clk/imx/clk-imx8mm.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/clk/imx/clk-imx8mm.c +4 -4
@@ -173,14 +173,14 @@ static const char *imx8mm_vpu_g1_sels[] = {"osc_24m", "vpu_pll_out", "sys_pll1_8 "sys_pll1_100m", "sys_pll2_125m", "sys_pll3_out", "audio_pll1_out", };static const char *imx8mm_vpu_g2_sels[] = {"osc_24m" ,"vpu_pll_out" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll1_100m" ,"sys_pll2_125m" ,"sys_pll3_out" ,"audio_pll1_out" , }; -static const char *imx8mm_disp_dtrc_sels[] = {"osc_24m" ,"video_pll2_out" ,"sys_pll1_800m" ,"sys_pll2_1000m" , +static const char *imx8mm_disp_dtrc_sels[] = {"osc_24m" ,"dummy" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll1_160m" ,"video_pll1_out" ,"sys_pll3_out" ,"audio_pll2_out" , }; -static const char *imx8mm_disp_dc8000_sels[] = {"osc_24m" ,"video_pll2_out" ,"sys_pll1_800m" ,"sys_pll2_1000m" , +static const char *imx8mm_disp_dc8000_sels[] = {"osc_24m" ,"dummy" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll1_160m" ,"video_pll1_out" ,"sys_pll3_out" ,"audio_pll2_out" , };static const char *imx8mm_pcie1_ctrl_sels[] = {"osc_24m" ,"sys_pll2_250m" ,"sys_pll2_200m" ,"sys_pll1_266m" ,"sys_pll1_800m" ,"sys_pll2_500m" ,"sys_pll2_333m" ,"sys_pll3_out" , };
@@ -230,11 +230,11 @@ static const char *imx8mm_enet_phy_sels[] = {"osc_24m", "sys_pll2_50m", "sys_pll "sys_pll2_500m", "video_pll1_out", "audio_pll2_out", };static const char *imx8mm_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" , }; -static const char *imx8mm_qspi_sels[] = {"osc_24m" ,"sys_pll1_400m" ,"sys_pll1_800m" ,"sys_pll2_500m" , +static const char *imx8mm_qspi_sels[] = {"osc_24m" ,"sys_pll1_400m" ,"sys_pll2_333m" ,"sys_pll2_500m" ,"audio_pll2_out" ,"sys_pll1_266m" ,"sys_pll3_out" ,"sys_pll1_100m" , };static const char *imx8mm_usdhc1_sels[] = {"osc_24m" ,"sys_pll1_400m" ,"sys_pll1_800m" ,"sys_pll2_500m" ,"sys_pll3_out" ,"sys_pll1_266m" ,"audio_pll2_out" ,"sys_pll1_100m" , };
@@ -345,11 +345,11 @@ static const char *imx8mm_ecspi3_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pll1static const char *imx8mm_pdm_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"audio_pll1_out" ,"sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" ,"clk_ext3" ,"audio_pll2_out" , };static const char *imx8mm_vpu_h1_sels[] = {"osc_24m" ,"vpu_pll_out" ,"sys_pll1_800m" ,"sys_pll2_1000m" , -"audio_pll2_out" ,"sys_pll2_125m" ,"sys_pll3_clk" ,"audio_pll1_out" , }; +"audio_pll2_out" ,"sys_pll2_125m" ,"sys_pll3_out" ,"audio_pll1_out" , };static const char *imx8mm_dram_core_sels[] = {"dram_pll_out" ,"dram_alt_root" , };static const char *imx8mm_clko1_sels[] = {"osc_24m" ,"sys_pll1_800m" ,"osc_27m" ,"sys_pll1_200m" ,"audio_pll2_out" ,"vpu_pll" ,"sys_pll1_80m" , };
Signature · 1 line
2.17.1
PATCH 3/4 clk: imx8mn: Fix incorrect parents
In reply to Leonard Crestez* Replace to audio_pll2_clk with audio_pll2_out
* Replace sys3_pll2_out with sys_pll3_out
* Replace sys1_pll_40m with sys_pll1_40m
* qspi parent[2] is sys_pll2_333m not sys_pll1_800m
--- drivers/clk/imx/clk-imx8mn.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/clk/imx/clk-imx8mn.c +7 -7
@@ -138,11 +138,11 @@ static const char * const imx8mn_nand_usdhc_sels[] = {"osc_24m", "sys_pll1_266m"static const char *const imx8mn_disp_axi_sels[] = {"osc_24m" ,"sys_pll2_1000m" ,"sys_pll1_800m" ,"sys_pll3_out" ,"sys_pll1_40m" ,"audio_pll2_out" ,"clk_ext1" ,"clk_ext4" , };static const char *const imx8mn_disp_apb_sels[] = {"osc_24m" ,"sys_pll2_125m" ,"sys_pll1_800m" , -"sys_pll3_out" ,"sys1_pll_40m" ,"audio_pll2_out" , +"sys_pll3_out" ,"sys_pll1_40m" ,"audio_pll2_out" ,"clk_ext1" ,"clk_ext3" , };static const char *const imx8mn_usb_bus_sels[] = {"osc_24m" ,"sys_pll2_500m" ,"sys_pll1_800m" ,"sys_pll2_100m" ,"sys_pll2_200m" ,"clk_ext2" ,"clk_ext4" ,"audio_pll2_out" , };
@@ -217,13 +217,13 @@ static const char * const imx8mn_enet_phy_sels[] = {"osc_24m", "sys_pll2_50m", "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" , }; -static const char *const imx8mn_qspi_sels[] = {"osc_24m" ,"sys1_pll_400m" ,"sys_pll1_800m" , -"sys2_pll_500m" ,"audio_pll2_out" ,"sys1_pll_266m" , -"sys3_pll2_out" ,"sys1_pll_100m" , }; +static const char *const imx8mn_qspi_sels[] = {"osc_24m" ,"sys_pll1_400m" ,"sys_pll2_333m" , +"sys_pll2_500m" ,"audio_pll2_out" ,"sys_pll1_266m" , +"sys_pll3_out" ,"sys_pll1_100m" , };static const char *const imx8mn_usdhc1_sels[] = {"osc_24m" ,"sys_pll1_400m" ,"sys_pll1_800m" ,"sys_pll2_500m" ,"sys_pll3_out" ,"sys_pll1_266m" ,"audio_pll2_out" ,"sys_pll1_100m" , };
@@ -286,11 +286,11 @@ static const char * const imx8mn_pwm1_sels[] = {"osc_24m", "sys_pll2_100m", "sysstatic 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" , };static const char *const imx8mn_pwm3_sels[] = {"osc_24m" ,"sys_pll2_100m" ,"sys_pll1_160m" , -"sys_pll1_40m" ,"sys3_pll2_out" ,"clk_ext2" , +"sys_pll1_40m" ,"sys_pll3_out" ,"clk_ext2" ,"sys_pll1_80m" ,"video_pll1_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" , };
@@ -315,11 +315,11 @@ static const char * const imx8mn_dsi_dbi_sels[] = {"osc_24m", "sys_pll1_266m", ""sys_pll1_800m" ,"sys_pll2_1000m" ,"sys_pll3_out" , "audio_pll2_out", "video_pll1_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" , -"audio_pll2_clk" ,"sys_pll1_100m" , }; +"audio_pll2_out" ,"sys_pll1_100m" , };static 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" , };
@@ -344,11 +344,11 @@ static const char * const imx8mn_pdm_sels[] = {"osc_24m", "sys_pll2_100m", "audi "clk_ext3", "audio_pll2_out", };static const char *const imx8mn_dram_core_sels[] = {"dram_pll_out" ,"dram_alt_root" , };static const char *const imx8mn_clko1_sels[] = {"osc_24m" ,"sys_pll1_800m" ,"osc_27m" , -"sys_pll1_200m" ,"audio_pll2_clk" ,"vpu_pll" , +"sys_pll1_200m" ,"audio_pll2_out" ,"vpu_pll" ,"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" , };
Signature · 1 line
2.17.1
PATCH 4/4 clk: imx8mn: Add GIC clock
In reply to Leonard CrestezThis is enabled by default but if it's not explicitly defined and marked as critical then its parent might get turned off.
--- drivers/clk/imx/clk-imx8mn.c | 5 +++++ include/dt-bindings/clock/imx8mn-clock.h | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)
drivers/clk/imx/clk-imx8mn.c +5 -0
@@ -269,10 +269,14 @@ static const char * const imx8mn_usb_core_sels[] = {"osc_24m", "sys_pll1_100m",static const char *const imx8mn_usb_phy_sels[] = {"osc_24m" ,"sys_pll1_100m" ,"sys_pll1_40m" ,"sys_pll2_100m" ,"sys_pll2_200m" ,"clk_ext2" ,"clk_ext3" ,"audio_pll2_out" , }; +static const char *const imx8mn_gic_sels[] = {"osc_24m" ,"sys_pll2_200m" ,"sys_pll1_40m" , +"sys_pll2_100m" ,"sys_pll1_800m" ,"clk_ext2" , +"clk_ext4" ,"audio_pll2_out" }; +static const char *const imx8mn_ecspi1_sels[] = {"osc_24m" ,"sys_pll2_200m" ,"sys_pll1_40m" ,"sys_pll1_160m" ,"sys_pll1_800m" ,"sys_pll3_out" ,"sys_pll2_250m" ,"audio_pll2_out" , };static const char *const imx8mn_ecspi2_sels[] = {"osc_24m" ,"sys_pll2_200m" ,"sys_pll1_40m" ,
@@ -522,10 +526,11 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) clks[IMX8MN_CLK_UART2 ] =imx8m_clk_composite ("uart2" , imx8mn_uart2_sels, base +0xaf80 ); clks[IMX8MN_CLK_UART3 ] =imx8m_clk_composite ("uart3" , imx8mn_uart3_sels, base +0xb000 ); clks[IMX8MN_CLK_UART4 ] =imx8m_clk_composite ("uart4" , imx8mn_uart4_sels, base +0xb080 ); clks[IMX8MN_CLK_USB_CORE_REF ] =imx8m_clk_composite ("usb_core_ref" , imx8mn_usb_core_sels, base +0xb100 ); clks[IMX8MN_CLK_USB_PHY_REF ] =imx8m_clk_composite ("usb_phy_ref" , imx8mn_usb_phy_sels, base +0xb180 ); + clks[IMX8MN_CLK_GIC ] =imx8m_clk_composite_critical ("gic" , imx8mn_gic_sels, base +0xb200 ); clks[IMX8MN_CLK_ECSPI1 ] =imx8m_clk_composite ("ecspi1" , imx8mn_ecspi1_sels, base +0xb280 ); clks[IMX8MN_CLK_ECSPI2 ] =imx8m_clk_composite ("ecspi2" , imx8mn_ecspi2_sels, base +0xb300 ); clks[IMX8MN_CLK_PWM1 ] =imx8m_clk_composite ("pwm1" , imx8mn_pwm1_sels, base +0xb380 ); clks[IMX8MN_CLK_PWM2 ] =imx8m_clk_composite ("pwm2" , imx8mn_pwm2_sels, base +0xb400 ); clks[IMX8MN_CLK_PWM3 ] =imx8m_clk_composite ("pwm3" , imx8mn_pwm3_sels, base +0xb480 );
include/dt-bindings/clock/imx8mn-clock.h +2 -1
@@ -207,9 +207,10 @@#define IMX8MN_CLK_SDMA3_ROOT 189#define IMX8MN_CLK_TMU_ROOT 190#define IMX8MN_CLK_ARM 191#define IMX8MN_CLK_NAND_USDHC_BUS_RAWNAND_CLK 192#define IMX8MN_CLK_GPU_CORE_ROOT 193 +#define IMX8MN_CLK_GIC 194 -#define IMX8MN_CLK_END 194 +#define IMX8MN_CLK_END 195#endif
Signature · 1 line
2.17.1
Stephen Boyd
maintainerQuoting Leonard Crestez (2019-08-13 10:05:27)
Quoted 5 lines
No checks are made to ensure the parents in the
_selsarrays actually exist and it turns out that several are incorrect.I found the errors using a hack to clk core, is there a better way?
Maybe you can make it into some sort of Kconfig option that's behind a debug flag. Or you can use the possible parent debugfs files and check for parents from userspace with some script.
Shawn Guo
AppliedQuoted 6 lines · Leonard Crestez
No checks are made to ensure the parents in the
_selsarrays actually exist and it turns out that several are incorrect.I found the errors using a hack to clk core, is there a better way?
Quoted 8 lines
Also add imx8mn GIC clock while we're at it because otherwise parent could get disabled and lock the system.
Leonard Crestez (4):
clk: imx8mq: Fix sys3 pll references
clk: imx8mm: Fix incorrect parents
clk: imx8mn: Fix incorrect parents
clk: imx8mn: Add GIC clock
Applied all, thanks.