UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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: Philipp Zabel <p.zabel@pengutronix.de>
Acked-by: Shawn Guo <shawn.guo@linaro.org>
Reviewed-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2013-10-19 17:38:44 +01:00
parent 24013ea8ff
commit 370b181516
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/staging/imx-drm/ipu-v3/ipu-di.c
View File

@ -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
* the DI clock.
*/
if (sig->clkflags & IPU_DI_CLKMODE_EXT)
round = sig->pixelclock;
if (sig->clkflags & IPU_DI_CLKMODE_EXT) {
parent = di->clk_di;
else {
} else {
unsigned long rate, clkrate;
unsigned div, error;
@ -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);
if (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)
* 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
* 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)
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);