mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-03 23:58:05 +00:00
Merge branch 'imx-fb-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx into devel
Conflicts: drivers/video/mx3fb.c
This commit is contained in:
commit
3879f5d6f0
4 changed files with 1068 additions and 1068 deletions
|
@ -488,7 +488,7 @@ static int sdc_init_panel(struct mx3fb_data *mx3fb, enum ipu_panel panel,
|
|||
|
||||
/*
|
||||
* Calculate divider: fractional part is 4 bits so simply multiple by
|
||||
* 24 to get fractional part, as long as we stay under ~250MHz and on
|
||||
* 2^4 to get fractional part, as long as we stay under ~250MHz and on
|
||||
* i.MX31 it (HSP_CLK) is <= 178MHz. Currently 128.267MHz
|
||||
*/
|
||||
dev_dbg(mx3fb->dev, "pixel clk = %d\n", pixel_clk);
|
||||
|
|
Loading…
Reference in a new issue