Skip to content

L
linux-davinci
Commit 3879f5d6 authored by Russell King's avatar Russell King Committed by Russell King
Browse files
Options

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
parents 607b067e 6e1588cb
Show whitespace changes
Inline Side-by-side
Showing with 1174 additions and 1174 deletions
drivers/video/mx3fb.c
View file @ 3879f5d6
...@@ -488,7 +488,7 @@ static int sdc_init_panel(struct mx3fb_data *mx3fb, enum ipu_panel panel, ...@@ -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 * 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 * i.MX31 it (HSP_CLK) is <= 178MHz. Currently 128.267MHz
*/ */
dev_dbg(mx3fb->dev, "pixel clk = %d\n", pixel_clk); dev_dbg(mx3fb->dev, "pixel clk = %d\n", pixel_clk);
......
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