diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2023-03-27 15:03:42 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2023-03-29 08:38:23 +0000 |
| commit | 29650b9ac34f2bfd26bd70e41c285b043bf6832e (patch) | |
| tree | 6672b494d9f0f8a7b0c1fb654131a2780ccc5744 | |
| parent | 946371b8332ba5897e5af36eb3cee2d3e7e3524e (diff) | |
Revert "clk: imx: pll14xx: Drop wrong shifting"
This reverts commit 6733dd9e5c95fef0a74cd35154fa385cf32745d2.
This series broke our 10" capacitive LVDS panel. Revert until fixed.
Upstream-Status: Inappropriate [revert of backport]
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
| -rw-r--r-- | drivers/clk/imx/clk-pll14xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/clk/imx/clk-pll14xx.c b/drivers/clk/imx/clk-pll14xx.c index e952b9034afc..46e349499e8a 100644 --- a/drivers/clk/imx/clk-pll14xx.c +++ b/drivers/clk/imx/clk-pll14xx.c @@ -210,7 +210,7 @@ static int clk_pll1416x_set_rate(struct clk_hw *hw, unsigned long drate, tmp = readl_relaxed(pll->base + DIV_CTL0); if (!clk_pll14xx_mp_change(rate, tmp)) { - tmp &= ~SDIV_MASK; + tmp &= ~(SDIV_MASK) << SDIV_SHIFT; tmp |= rate->sdiv << SDIV_SHIFT; writel_relaxed(tmp, pll->base + DIV_CTL0); @@ -276,7 +276,7 @@ static int clk_pll1443x_set_rate(struct clk_hw *hw, unsigned long drate, tmp = readl_relaxed(pll->base + DIV_CTL0); if (!clk_pll14xx_mp_change(rate, tmp)) { - tmp &= ~SDIV_MASK; + tmp &= ~(SDIV_MASK) << SDIV_SHIFT; tmp |= rate->sdiv << SDIV_SHIFT; writel_relaxed(tmp, pll->base + DIV_CTL0); |