]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
drm/msm/dsi: fix dsi clock names in DSI 10nm PLL driver
authorAbhinav Kumar <abhinavk@codeaurora.org>
Thu, 11 Oct 2018 17:18:57 +0000 (10:18 -0700)
committerRob Clark <robdclark@gmail.com>
Tue, 11 Dec 2018 18:07:07 +0000 (13:07 -0500)
Fix the dsi clock names in the DSI 10nm PLL driver to
match the names in the dispcc driver as those are
according to the clock plan of the chipset.

Changes in v2:
- Update the clock diagram with the new clock name

Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Abhinav Kumar <abhinavk@codeaurora.org>
Signed-off-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
drivers/gpu/drm/msm/dsi/pll/dsi_pll_10nm.c

index f8819ccdc25c88a922e89ce2c32e9cb8e46c77a9..e41f278e4e62864f418d9ba3e9bb23035ce4308d 100644 (file)
@@ -17,7 +17,7 @@
  *                              |                |
  *                              |                |
  *                 +---------+  |  +----------+  |  +----+
- *  dsi0vco_clk ---| out_div |--o--| divl_3_0 |--o--| /8 |-- dsi0pllbyte
+ *  dsi0vco_clk ---| out_div |--o--| divl_3_0 |--o--| /8 |-- dsi0_phy_pll_out_byteclk
  *                 +---------+  |  +----------+  |  +----+
  *                              |                |
  *                              |                |         dsi0_pll_by_2_bit_clk
@@ -25,7 +25,7 @@
  *                              |                |  +----+  |  |\  dsi0_pclk_mux
  *                              |                |--| /2 |--o--| \   |
  *                              |                |  +----+     |  \  |  +---------+
- *                              |                --------------|  |--o--| div_7_4 |-- dsi0pll
+ *                              |                --------------|  |--o--| div_7_4 |-- dsi0_phy_pll_out_dsiclk
  *                              |------------------------------|  /     +---------+
  *                              |          +-----+             | /
  *                              -----------| /4? |--o----------|/
@@ -688,7 +688,7 @@ static int pll_10nm_register(struct dsi_pll_10nm *pll_10nm)
 
        hws[num++] = hw;
 
-       snprintf(clk_name, 32, "dsi%dpllbyte", pll_10nm->id);
+       snprintf(clk_name, 32, "dsi%d_phy_pll_out_byteclk", pll_10nm->id);
        snprintf(parent, 32, "dsi%d_pll_bit_clk", pll_10nm->id);
 
        /* DSI Byte clock = VCO_CLK / OUT_DIV / BIT_DIV / 8 */
@@ -737,7 +737,7 @@ static int pll_10nm_register(struct dsi_pll_10nm *pll_10nm)
 
        hws[num++] = hw;
 
-       snprintf(clk_name, 32, "dsi%dpll", pll_10nm->id);
+       snprintf(clk_name, 32, "dsi%d_phy_pll_out_dsiclk", pll_10nm->id);
        snprintf(parent, 32, "dsi%d_pclk_mux", pll_10nm->id);
 
        /* PIX CLK DIV : DIV_CTRL_7_4*/