summaryrefslogtreecommitdiff
path: root/drivers/clk
diff options
context:
space:
mode:
authorOliver Brown <oliver.brown@nxp.com>2018-08-02 10:09:39 -0500
committerLeonard Crestez <leonard.crestez@nxp.com>2018-08-24 12:41:33 +0300
commit2ac46ca47abddfe584ed48b3820fc57f04e8af97 (patch)
tree08cf0cfe5da590e8a11f203474d004d500780330 /drivers/clk
parent7a0c27819a54442e6430963ac671035eccaa0dc7 (diff)
MLK-19120-2 clk: imx8qm: Add AVPLL support for DisplayPort on iMX8QM
Removed the IMX8QM_HDMI_AV_PLL_BYPASS_CLK because it is not supported by SCFW. Changed the selector array to use the IMX8QM_HDMI_AV_PLL_CLK as the bypass parent. Signed-off-by: Oliver Brown <oliver.brown@nxp.com>
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/imx/clk-imx8qm.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/clk/imx/clk-imx8qm.c b/drivers/clk/imx/clk-imx8qm.c
index 443f7d19d601..d411b76c9e07 100644
--- a/drivers/clk/imx/clk-imx8qm.c
+++ b/drivers/clk/imx/clk-imx8qm.c
@@ -126,9 +126,9 @@ static const char *dc1_sels[] = {
static const char *hdmi_sels[] = {
"dummy",
"hdmi_dig_pll_clk",
- "hdmi_av_pll_clk",
"dummy",
- "hdmi_av_pll_bypass_clk",
+ "dummy",
+ "hdmi_av_pll_clk",
};
static const char *hdmi_rx_sels[] = {
@@ -332,7 +332,6 @@ static int imx8qm_clk_probe(struct platform_device *pdev)
clks[IMX8QM_HDMI_IPG_DIV] = imx_clk_divider_scu("hdmi_ipg_div", SC_R_HDMI, SC_PM_CLK_MISC);
clks[IMX8QM_HDMI_I2S_BYPASS_CLK] = imx_clk_divider_scu("hdmi_i2s_bypass_clk", SC_R_HDMI_I2S, SC_PM_CLK_BYPASS);
clks[IMX8QM_HDMI_I2C0_DIV] = imx_clk_divider_scu("hdmi_i2c0_div", SC_R_HDMI_I2C_0, SC_PM_CLK_MISC2);
- clks[IMX8QM_HDMI_AV_PLL_BYPASS_CLK] = imx_clk_divider_scu("hdmi_av_pll_bypass_clk", SC_R_HDMI, SC_PM_CLK_BYPASS);
clks[IMX8QM_HDMI_PXL_SEL] = imx_clk_mux2_scu("hdmi_pxl_sel", hdmi_sels, ARRAY_SIZE(hdmi_sels), SC_R_HDMI, SC_PM_CLK_MISC3);
clks[IMX8QM_HDMI_PXL_DIV] = imx_clk_divider2_scu("hdmi_pxl_div", "hdmi_pxl_sel", SC_R_HDMI, SC_PM_CLK_MISC3);
clks[IMX8QM_HDMI_PXL_LINK_SEL] = imx_clk_mux2_scu("hdmi_pxl_link_sel", hdmi_sels, ARRAY_SIZE(hdmi_sels), SC_R_HDMI, SC_PM_CLK_MISC1);