Skip to content

Commit 1840518

Browse files
Richard Zhuabelvesa
authored andcommitted
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 <[email protected]> Reviewed-by: Jason Liu <[email protected]> Signed-off-by: Abel Vesa <[email protected]>
1 parent 379c9a2 commit 1840518

File tree

2 files changed

+0
-18
lines changed

2 files changed

+0
-18
lines changed

drivers/clk/imx/clk-imx8mp.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -152,10 +152,6 @@ static const char * const imx8mp_can2_sels[] = {"osc_24m", "sys_pll2_200m", "sys
152152
"sys_pll1_160m", "sys_pll1_800m", "sys_pll3_out",
153153
"sys_pll2_250m", "audio_pll2_out", };
154154

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-
159155
static const char * const imx8mp_pcie_aux_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pll2_50m",
160156
"sys_pll3_out", "sys_pll2_100m", "sys_pll1_80m",
161157
"sys_pll1_160m", "sys_pll1_200m", };
@@ -380,14 +376,6 @@ static const char * const imx8mp_memrepair_sels[] = {"osc_24m", "sys_pll2_100m",
380376
"sys_pll1_800m", "sys_pll2_1000m", "sys_pll3_out",
381377
"clk_ext3", "audio_pll2_out", };
382378

383-
static const char * const imx8mp_pcie2_ctrl_sels[] = {"osc_24m", "sys_pll2_250m", "sys_pll2_200m",
384-
"sys_pll1_266m", "sys_pll1_800m", "sys_pll2_500m",
385-
"sys_pll2_333m", "sys_pll3_out", };
386-
387-
static const char * const imx8mp_pcie2_phy_sels[] = {"osc_24m", "sys_pll2_100m", "sys_pll2_500m",
388-
"clk_ext1", "clk_ext2", "clk_ext3",
389-
"clk_ext4", "sys_pll1_400m", };
390-
391379
static const char * const imx8mp_media_mipi_test_byte_sels[] = {"osc_24m", "sys_pll2_200m", "sys_pll2_50m",
392380
"sys_pll3_out", "sys_pll2_100m",
393381
"sys_pll1_80m", "sys_pll1_160m",
@@ -576,7 +564,6 @@ static int imx8mp_clocks_probe(struct platform_device *pdev)
576564
hws[IMX8MP_CLK_VPU_G2] = imx8m_clk_hw_composite("vpu_g2", imx8mp_vpu_g2_sels, ccm_base + 0xa180);
577565
hws[IMX8MP_CLK_CAN1] = imx8m_clk_hw_composite("can1", imx8mp_can1_sels, ccm_base + 0xa200);
578566
hws[IMX8MP_CLK_CAN2] = imx8m_clk_hw_composite("can2", imx8mp_can2_sels, ccm_base + 0xa280);
579-
hws[IMX8MP_CLK_PCIE_PHY] = imx8m_clk_hw_composite("pcie_phy", imx8mp_pcie_phy_sels, ccm_base + 0xa380);
580567
hws[IMX8MP_CLK_PCIE_AUX] = imx8m_clk_hw_composite("pcie_aux", imx8mp_pcie_aux_sels, ccm_base + 0xa400);
581568
hws[IMX8MP_CLK_I2C5] = imx8m_clk_hw_composite("i2c5", imx8mp_i2c5_sels, ccm_base + 0xa480);
582569
hws[IMX8MP_CLK_I2C6] = imx8m_clk_hw_composite("i2c6", imx8mp_i2c6_sels, ccm_base + 0xa500);
@@ -634,8 +621,6 @@ static int imx8mp_clocks_probe(struct platform_device *pdev)
634621
hws[IMX8MP_CLK_MEDIA_CAM2_PIX] = imx8m_clk_hw_composite("media_cam2_pix", imx8mp_media_cam2_pix_sels, ccm_base + 0xbe80);
635622
hws[IMX8MP_CLK_MEDIA_LDB] = imx8m_clk_hw_composite("media_ldb", imx8mp_media_ldb_sels, ccm_base + 0xbf00);
636623
hws[IMX8MP_CLK_MEMREPAIR] = imx8m_clk_hw_composite_critical("mem_repair", imx8mp_memrepair_sels, ccm_base + 0xbf80);
637-
hws[IMX8MP_CLK_PCIE2_CTRL] = imx8m_clk_hw_composite("pcie2_ctrl", imx8mp_pcie2_ctrl_sels, ccm_base + 0xc000);
638-
hws[IMX8MP_CLK_PCIE2_PHY] = imx8m_clk_hw_composite("pcie2_phy", imx8mp_pcie2_phy_sels, ccm_base + 0xc080);
639624
hws[IMX8MP_CLK_MEDIA_MIPI_TEST_BYTE] = imx8m_clk_hw_composite("media_mipi_test_byte", imx8mp_media_mipi_test_byte_sels, ccm_base + 0xc100);
640625
hws[IMX8MP_CLK_ECSPI3] = imx8m_clk_hw_composite("ecspi3", imx8mp_ecspi3_sels, ccm_base + 0xc180);
641626
hws[IMX8MP_CLK_PDM] = imx8m_clk_hw_composite("pdm", imx8mp_pdm_sels, ccm_base + 0xc200);

include/dt-bindings/clock/imx8mp-clock.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@
125125
#define IMX8MP_CLK_CAN1 116
126126
#define IMX8MP_CLK_CAN2 117
127127
#define IMX8MP_CLK_MEMREPAIR 118
128-
#define IMX8MP_CLK_PCIE_PHY 119
129128
#define IMX8MP_CLK_PCIE_AUX 120
130129
#define IMX8MP_CLK_I2C5 121
131130
#define IMX8MP_CLK_I2C6 122
@@ -182,8 +181,6 @@
182181
#define IMX8MP_CLK_MEDIA_CAM2_PIX 173
183182
#define IMX8MP_CLK_MEDIA_LDB 174
184183
#define IMX8MP_CLK_MEDIA_MIPI_CSI2_ESC 175
185-
#define IMX8MP_CLK_PCIE2_CTRL 176
186-
#define IMX8MP_CLK_PCIE2_PHY 177
187184
#define IMX8MP_CLK_MEDIA_MIPI_TEST_BYTE 178
188185
#define IMX8MP_CLK_ECSPI3 179
189186
#define IMX8MP_CLK_PDM 180

0 commit comments

Comments
 (0)