Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: imx8mp: Remove the none exist pcie clocks

In the i.MX8MP PCIe design, the PCIe PHY REF clock comes from external
OSC or internal system PLL. It is configured in the IOMUX_GPR14 register
directly, and can't be contolled by CCM at all.
Remove the PCIE PHY clock from clock driver to clean up codes.
There is only one PCIe in i.MX8MP, remove the none exist second PCIe
related clocks.
Remove the none exsits clocks IDs together.

Signed-off-by: Richard Zhu <hongxing.zhu@nxp.com>
Reviewed-by: Jason Liu <jason.hui.liu@nxp.com>
Signed-off-by: Abel Vesa <abel.vesa@nxp.com>

authored by

Richard Zhu and committed by
Abel Vesa
1840518a 379c9a24

-18
-15
drivers/clk/imx/clk-imx8mp.c
··· 152 152 "sys_pll1_160m", "sys_pll1_800m", "sys_pll3_out", 153 153 "sys_pll2_250m", "audio_pll2_out", }; 154 154 155 - static const char * const imx8mp_pcie_phy_sels[] = {"osc_24m", "sys_pll2_100m", "sys_pll2_500m", 156 - "clk_ext1", "clk_ext2", "clk_ext3", 157 - "clk_ext4", "sys_pll1_400m", }; 158 - 159 155 static const char * const imx8mp_pcie_aux_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pll2_50m", 160 156 "sys_pll3_out", "sys_pll2_100m", "sys_pll1_80m", 161 157 "sys_pll1_160m", "sys_pll1_200m", }; ··· 376 380 "sys_pll1_800m", "sys_pll2_1000m", "sys_pll3_out", 377 381 "clk_ext3", "audio_pll2_out", }; 378 382 379 - static const char * const imx8mp_pcie2_ctrl_sels[] = {"osc_24m", "sys_pll2_250m", "sys_pll2_200m", 380 - "sys_pll1_266m", "sys_pll1_800m", "sys_pll2_500m", 381 - "sys_pll2_333m", "sys_pll3_out", }; 382 - 383 - static const char * const imx8mp_pcie2_phy_sels[] = {"osc_24m", "sys_pll2_100m", "sys_pll2_500m", 384 - "clk_ext1", "clk_ext2", "clk_ext3", 385 - "clk_ext4", "sys_pll1_400m", }; 386 - 387 383 static const char * const imx8mp_media_mipi_test_byte_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pll2_50m", 388 384 "sys_pll3_out", "sys_pll2_100m", 389 385 "sys_pll1_80m", "sys_pll1_160m", ··· 564 576 hws[IMX8MP_CLK_VPU_G2] = imx8m_clk_hw_composite("vpu_g2", imx8mp_vpu_g2_sels, ccm_base + 0xa180); 565 577 hws[IMX8MP_CLK_CAN1] = imx8m_clk_hw_composite("can1", imx8mp_can1_sels, ccm_base + 0xa200); 566 578 hws[IMX8MP_CLK_CAN2] = imx8m_clk_hw_composite("can2", imx8mp_can2_sels, ccm_base + 0xa280); 567 - hws[IMX8MP_CLK_PCIE_PHY] = imx8m_clk_hw_composite("pcie_phy", imx8mp_pcie_phy_sels, ccm_base + 0xa380); 568 579 hws[IMX8MP_CLK_PCIE_AUX] = imx8m_clk_hw_composite("pcie_aux", imx8mp_pcie_aux_sels, ccm_base + 0xa400); 569 580 hws[IMX8MP_CLK_I2C5] = imx8m_clk_hw_composite("i2c5", imx8mp_i2c5_sels, ccm_base + 0xa480); 570 581 hws[IMX8MP_CLK_I2C6] = imx8m_clk_hw_composite("i2c6", imx8mp_i2c6_sels, ccm_base + 0xa500); ··· 621 634 hws[IMX8MP_CLK_MEDIA_CAM2_PIX] = imx8m_clk_hw_composite("media_cam2_pix", imx8mp_media_cam2_pix_sels, ccm_base + 0xbe80); 622 635 hws[IMX8MP_CLK_MEDIA_LDB] = imx8m_clk_hw_composite("media_ldb", imx8mp_media_ldb_sels, ccm_base + 0xbf00); 623 636 hws[IMX8MP_CLK_MEMREPAIR] = imx8m_clk_hw_composite_critical("mem_repair", imx8mp_memrepair_sels, ccm_base + 0xbf80); 624 - hws[IMX8MP_CLK_PCIE2_CTRL] = imx8m_clk_hw_composite("pcie2_ctrl", imx8mp_pcie2_ctrl_sels, ccm_base + 0xc000); 625 - hws[IMX8MP_CLK_PCIE2_PHY] = imx8m_clk_hw_composite("pcie2_phy", imx8mp_pcie2_phy_sels, ccm_base + 0xc080); 626 637 hws[IMX8MP_CLK_MEDIA_MIPI_TEST_BYTE] = imx8m_clk_hw_composite("media_mipi_test_byte", imx8mp_media_mipi_test_byte_sels, ccm_base + 0xc100); 627 638 hws[IMX8MP_CLK_ECSPI3] = imx8m_clk_hw_composite("ecspi3", imx8mp_ecspi3_sels, ccm_base + 0xc180); 628 639 hws[IMX8MP_CLK_PDM] = imx8m_clk_hw_composite("pdm", imx8mp_pdm_sels, ccm_base + 0xc200);
-3
include/dt-bindings/clock/imx8mp-clock.h
··· 125 125 #define IMX8MP_CLK_CAN1 116 126 126 #define IMX8MP_CLK_CAN2 117 127 127 #define IMX8MP_CLK_MEMREPAIR 118 128 - #define IMX8MP_CLK_PCIE_PHY 119 129 128 #define IMX8MP_CLK_PCIE_AUX 120 130 129 #define IMX8MP_CLK_I2C5 121 131 130 #define IMX8MP_CLK_I2C6 122 ··· 181 182 #define IMX8MP_CLK_MEDIA_CAM2_PIX 173 182 183 #define IMX8MP_CLK_MEDIA_LDB 174 183 184 #define IMX8MP_CLK_MEDIA_MIPI_CSI2_ESC 175 184 - #define IMX8MP_CLK_PCIE2_CTRL 176 185 - #define IMX8MP_CLK_PCIE2_PHY 177 186 185 #define IMX8MP_CLK_MEDIA_MIPI_TEST_BYTE 178 187 186 #define IMX8MP_CLK_ECSPI3 179 188 187 #define IMX8MP_CLK_PDM 180