[PATCH v2 08/15] drm: sprd: fix DSI rate and PLL setup code

[Otto Pflüger]

Correct the initialization code to treat the hs_rate and lp_rate values
as hertz instead of kilohertz. While at it, fix a bit operation bug in
the PLL initialization code which caused a PLL register to be set to
zero instead of the desired value.

Signed-off-by: Otto Pflüger <otto.pflue...@abscue.de>
---
 drivers/gpu/drm/sprd/megacores_pll.c | 7 +++----
 drivers/gpu/drm/sprd/sprd_dsi.c      | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/gpu/drm/sprd/megacores_pll.c 
b/drivers/gpu/drm/sprd/megacores_pll.c
index 
e5a18599678ab6e3771cd732dcca409ab2d59f72..f214f906b58fb006c4305de9b8b86b4a934f2074
 100644
--- a/drivers/gpu/drm/sprd/megacores_pll.c
+++ b/drivers/gpu/drm/sprd/megacores_pll.c
@@ -23,13 +23,12 @@
 
 static int dphy_calc_pll_param(struct dphy_pll *pll)
 {
-       const u32 khz = 1000;
        const u32 mhz = 1000000;
        const unsigned long long factor = 100;
        unsigned long long tmp;
        int i;
 
-       pll->potential_fvco = pll->freq / khz;
+       pll->potential_fvco = pll->freq / mhz;
 
        for (i = 0; i < 4; ++i) {
                if (pll->potential_fvco >= pll->platform->band_low &&
@@ -89,7 +88,7 @@ static void dphy_set_pll_reg(struct dphy_pll *pll, struct 
regmap *regmap)
        reg_val[3] = pll->vco_band | (pll->sdm_en << 1) | (pll->refin << 2);
        reg_val[4] = pll->kint >> 12;
        reg_val[5] = pll->kint >> 4;
-       reg_val[6] = pll->out_sel | ((pll->kint << 4) & 0xf);
+       reg_val[6] = pll->out_sel | ((pll->kint & 0xf) << 4);
        reg_val[7] = 1 << 4;
        reg_val[8] = pll->det_delay;
 
@@ -218,7 +217,7 @@ void dphy_timing_config(struct dsi_context *ctx)
        u32 tmp = 0;
 
        /* t_ui: 1 ui, byteck: 8 ui, half byteck: 4 ui */
-       t_ui = 1000 * scale / (pll->freq / 1000);
+       t_ui = 1000 * scale / (pll->freq / 1000000);
        t_byteck = t_ui << 3;
        t_half_byteck = t_ui << 2;
        constant = t_ui << 1;
diff --git a/drivers/gpu/drm/sprd/sprd_dsi.c b/drivers/gpu/drm/sprd/sprd_dsi.c
index 
db5f9bcbb2500096402b9d44b9cc4428070e69ba..e01d1d28fe579644ec2e0c83ec9170269932adfe
 100644
--- a/drivers/gpu/drm/sprd/sprd_dsi.c
+++ b/drivers/gpu/drm/sprd/sprd_dsi.c
@@ -391,7 +391,7 @@ static u32 fmt_to_coding(u32 fmt)
 static void sprd_dsi_init(struct dsi_context *ctx)
 {
        struct sprd_dsi *dsi = container_of(ctx, struct sprd_dsi, ctx);
-       u32 byte_clk = dsi->slave->hs_rate / 8;
+       u32 byte_clk = dsi->slave->hs_rate / 8000;
        u16 data_hs2lp, data_lp2hs, clk_hs2lp, clk_lp2hs;
        u16 max_rd_time;
        int div;
@@ -408,7 +408,7 @@ static void sprd_dsi_init(struct dsi_context *ctx)
        dsi_reg_up(ctx, VIRTUAL_CHANNEL_ID, VIDEO_PKT_VCID, 0);
        dsi_reg_up(ctx, VIRTUAL_CHANNEL_ID, GEN_RX_VCID, 0);
 
-       div = DIV_ROUND_UP(byte_clk, dsi->slave->lp_rate);
+       div = DIV_ROUND_UP(byte_clk, dsi->slave->lp_rate / 1000);
        writel(div, ctx->base + TX_ESC_CLK_CONFIG);
 
        max_rd_time = ns_to_cycle(ctx->max_rd_time, byte_clk);
@@ -450,7 +450,6 @@ static int sprd_dsi_dpi_video(struct dsi_context *ctx)
 {
        struct sprd_dsi *dsi = container_of(ctx, struct sprd_dsi, ctx);
        struct videomode *vm = &ctx->vm;
-       u32 byte_clk = dsi->slave->hs_rate / 8;
        u16 bpp_x100;
        u16 video_size;
        u32 ratio_x1000;
@@ -472,7 +471,7 @@ static int sprd_dsi_dpi_video(struct dsi_context *ctx)
        video_size = round_video_size(coding, vm->hactive);
        bpp_x100 = calc_bytes_per_pixel_x100(coding);
        video_size_step = calc_video_size_step(coding);
-       ratio_x1000 = byte_clk * 1000 / (vm->pixelclock / 1000);
+       ratio_x1000 = dsi->slave->hs_rate / 8 / (vm->pixelclock / 1000);
        hline = vm->hactive + vm->hsync_len + vm->hfront_porch +
                vm->hback_porch;
 

-- 
2.50.0