mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
atmel_lcdfb: fix pixclock divider calculation
Fix divider calculation and allow CLKVAL = 0 (divisor 2) It was not possible to get the clock value 0 (divisor 2) because the test "<=0" force the BYPASS bit to be activated instead. [[email protected]: coding-style fixes] Signed-off-by: Nicolas Ferre <[email protected]> Cc: Per Hedblom <[email protected]> Cc: Roel Kluin <[email protected]> Cc: Jan Weber <[email protected]> Cc: Andrew Victor <[email protected]> Cc: Haavard Skinnemoen <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
945185a69d
commit
baf6332a23
1 changed files with 6 additions and 5 deletions
|
|
@ -441,14 +441,15 @@ static int atmel_lcdfb_set_par(struct fb_info *info)
|
|||
|
||||
value = DIV_ROUND_UP(clk_value_khz, PICOS2KHZ(info->var.pixclock));
|
||||
|
||||
value = (value / 2) - 1;
|
||||
dev_dbg(info->device, " * programming CLKVAL = 0x%08lx\n", value);
|
||||
|
||||
if (value <= 0) {
|
||||
if (value < 2) {
|
||||
dev_notice(info->device, "Bypassing pixel clock divider\n");
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_LCDCON1, ATMEL_LCDC_BYPASS);
|
||||
} else {
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_LCDCON1, value << ATMEL_LCDC_CLKVAL_OFFSET);
|
||||
value = (value / 2) - 1;
|
||||
dev_dbg(info->device, " * programming CLKVAL = 0x%08lx\n",
|
||||
value);
|
||||
lcdc_writel(sinfo, ATMEL_LCDC_LCDCON1,
|
||||
value << ATMEL_LCDC_CLKVAL_OFFSET);
|
||||
info->var.pixclock = KHZ2PICOS(clk_value_khz / (2 * (value + 1)));
|
||||
dev_dbg(info->device, " updated pixclk: %lu KHz\n",
|
||||
PICOS2KHZ(info->var.pixclock));
|
||||
|
|
|
|||
Loading…
Reference in a new issue