Skip to content

Commit 72b2429

Browse files
fancyflyShawn Guo
authored andcommitted
clk: imx7ulp: do not export out IMX7ULP_CLK_MIPI_PLL clock
The mipi pll clock comes from the MIPI PHY PLL output, so it should not be a fixed clock. MIPI PHY PLL is in the MIPI DSI space, and it is used as the bit clock for transferring the pixel data out and its output clock is configured according to the display mode. So it should be used only for MIPI DSI and not be exported out for other usages. Signed-off-by: Fancy Fang <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
1 parent 8f5d481 commit 72b2429

File tree

3 files changed

+2
-3
lines changed

3 files changed

+2
-3
lines changed

Documentation/devicetree/bindings/clock/imx7ulp-clock.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ pcc2: pcc2@403f0000 {
8282
<&scg1 IMX7ULP_CLK_APLL_PFD0>,
8383
<&scg1 IMX7ULP_CLK_UPLL>,
8484
<&scg1 IMX7ULP_CLK_SOSC_BUS_CLK>,
85-
<&scg1 IMX7ULP_CLK_MIPI_PLL>,
8685
<&scg1 IMX7ULP_CLK_FIRC_BUS_CLK>,
8786
<&scg1 IMX7ULP_CLK_ROSC>,
8887
<&scg1 IMX7ULP_CLK_SPLL_BUS_CLK>;

drivers/clk/imx/clk-imx7ulp.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ static const char * const scs_sels[] = { "dummy", "sosc", "sirc", "firc", "dumm
2828
static const char * const ddr_sels[] = { "apll_pfd_sel", "dummy", "dummy", "dummy", };
2929
static const char * const nic_sels[] = { "firc", "ddr_clk", };
3030
static const char * const periph_plat_sels[] = { "dummy", "nic1_bus_clk", "nic1_clk", "ddr_clk", "apll_pfd2", "apll_pfd1", "apll_pfd0", "upll", };
31-
static const char * const periph_bus_sels[] = { "dummy", "sosc_bus_clk", "mpll", "firc_bus_clk", "rosc", "nic1_bus_clk", "nic1_clk", "spll_bus_clk", };
31+
static const char * const periph_bus_sels[] = { "dummy", "sosc_bus_clk", "dummy", "firc_bus_clk", "rosc", "nic1_bus_clk", "nic1_clk", "spll_bus_clk", };
3232
static const char * const arm_sels[] = { "divcore", "dummy", "dummy", "hsrun_divcore", };
3333

3434
/* used by sosc/sirc/firc/ddr/spll/apll dividers */
@@ -75,7 +75,6 @@ static void __init imx7ulp_clk_scg1_init(struct device_node *np)
7575
clks[IMX7ULP_CLK_SOSC] = imx_obtain_fixed_clk_hw(np, "sosc");
7676
clks[IMX7ULP_CLK_SIRC] = imx_obtain_fixed_clk_hw(np, "sirc");
7777
clks[IMX7ULP_CLK_FIRC] = imx_obtain_fixed_clk_hw(np, "firc");
78-
clks[IMX7ULP_CLK_MIPI_PLL] = imx_obtain_fixed_clk_hw(np, "mpll");
7978
clks[IMX7ULP_CLK_UPLL] = imx_obtain_fixed_clk_hw(np, "upll");
8079

8180
/* SCG1 */

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
#define IMX7ULP_CLK_NIC1_DIV 36
5050
#define IMX7ULP_CLK_NIC1_BUS_DIV 37
5151
#define IMX7ULP_CLK_NIC1_EXT_DIV 38
52+
/* IMX7ULP_CLK_MIPI_PLL is unsupported and shouldn't be used in DT */
5253
#define IMX7ULP_CLK_MIPI_PLL 39
5354
#define IMX7ULP_CLK_SIRC 40
5455
#define IMX7ULP_CLK_SOSC_BUS_CLK 41

0 commit comments

Comments
 (0)