Commit 370b1815 authored by Russell King's avatar Russell King

imx-drm: ipu-v3: don't use clk_round_rate() before clk_set_rate()

This is nonsense; clk_round_rate() is just clk_set_rate() without the
side effect of changing the hardware.
Acked-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Acked-by: default avatarShawn Guo <shawn.guo@linaro.org>
Reviewed-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 24013ea8
...@@ -560,9 +560,10 @@ int ipu_di_init_sync_panel(struct ipu_di *di, struct ipu_di_signal_cfg *sig) ...@@ -560,9 +560,10 @@ int ipu_di_init_sync_panel(struct ipu_di *di, struct ipu_di_signal_cfg *sig)
* rate within 1% of the requested frequency, otherwise we use * rate within 1% of the requested frequency, otherwise we use
* the DI clock. * the DI clock.
*/ */
if (sig->clkflags & IPU_DI_CLKMODE_EXT) round = sig->pixelclock;
if (sig->clkflags & IPU_DI_CLKMODE_EXT) {
parent = di->clk_di; parent = di->clk_di;
else { } else {
unsigned long rate, clkrate; unsigned long rate, clkrate;
unsigned div, error; unsigned div, error;
...@@ -584,6 +585,9 @@ int ipu_di_init_sync_panel(struct ipu_di *di, struct ipu_di_signal_cfg *sig) ...@@ -584,6 +585,9 @@ int ipu_di_init_sync_panel(struct ipu_di *di, struct ipu_di_signal_cfg *sig)
ret = clk_set_rate(parent, sig->pixelclock); ret = clk_set_rate(parent, sig->pixelclock);
if (ret) if (ret)
dev_err(di->ipu->dev, "Setting of DI clock failed: %d\n", ret); dev_err(di->ipu->dev, "Setting of DI clock failed: %d\n", ret);
/* Use the integer divisor rate - avoid fractional dividers */
round = rate;
} }
} }
...@@ -599,11 +603,12 @@ int ipu_di_init_sync_panel(struct ipu_di *di, struct ipu_di_signal_cfg *sig) ...@@ -599,11 +603,12 @@ int ipu_di_init_sync_panel(struct ipu_di *di, struct ipu_di_signal_cfg *sig)
* CLKMODE_SYNC means that we want the DI to be clocked at the * CLKMODE_SYNC means that we want the DI to be clocked at the
* same rate as the parent clock. This is needed (eg) for LDB * same rate as the parent clock. This is needed (eg) for LDB
* which needs to be fed with the same pixel clock. * which needs to be fed with the same pixel clock.
*
* Note: clk_set_rate(clk, clk_round_rate(clk, rate)) is the
* same as clk_set_rate(clk, rate);
*/ */
if (sig->clkflags & IPU_DI_CLKMODE_SYNC) if (sig->clkflags & IPU_DI_CLKMODE_SYNC)
round = clk_get_rate(parent); round = clk_get_rate(parent);
else
round = clk_round_rate(di->clk_di_pixel, sig->pixelclock);
ret = clk_set_rate(di->clk_di_pixel, round); ret = clk_set_rate(di->clk_di_pixel, round);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment