diff options
| -rw-r--r-- | drivers/video/fsl-diu-fb.c | 16 | ||||
| -rw-r--r-- | include/linux/fsl-diu-fb.h | 6 |
2 files changed, 0 insertions, 22 deletions
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c index bedf5be27f05..0acc7d65aeaa 100644 --- a/drivers/video/fsl-diu-fb.c +++ b/drivers/video/fsl-diu-fb.c | |||
| @@ -555,8 +555,6 @@ static void adjust_aoi_size_position(struct fb_var_screeninfo *var, | |||
| 555 | static int fsl_diu_check_var(struct fb_var_screeninfo *var, | 555 | static int fsl_diu_check_var(struct fb_var_screeninfo *var, |
| 556 | struct fb_info *info) | 556 | struct fb_info *info) |
| 557 | { | 557 | { |
| 558 | unsigned long htotal, vtotal; | ||
| 559 | |||
| 560 | pr_debug("check_var xres: %d\n", var->xres); | 558 | pr_debug("check_var xres: %d\n", var->xres); |
| 561 | pr_debug("check_var yres: %d\n", var->yres); | 559 | pr_debug("check_var yres: %d\n", var->yres); |
| 562 | 560 | ||
| @@ -635,20 +633,6 @@ static int fsl_diu_check_var(struct fb_var_screeninfo *var, | |||
| 635 | 633 | ||
| 636 | break; | 634 | break; |
| 637 | } | 635 | } |
| 638 | /* If the pixclock is below the minimum spec'd value then set to | ||
| 639 | * refresh rate for 60Hz since this is supported by most monitors. | ||
| 640 | * Refer to Documentation/fb/ for calculations. | ||
| 641 | */ | ||
| 642 | if ((var->pixclock < MIN_PIX_CLK) || (var->pixclock > MAX_PIX_CLK)) { | ||
| 643 | htotal = var->xres + var->right_margin + var->hsync_len + | ||
| 644 | var->left_margin; | ||
| 645 | vtotal = var->yres + var->lower_margin + var->vsync_len + | ||
| 646 | var->upper_margin; | ||
| 647 | var->pixclock = (vtotal * htotal * 6UL) / 100UL; | ||
| 648 | var->pixclock = KHZ2PICOS(var->pixclock); | ||
| 649 | pr_debug("pixclock set for 60Hz refresh = %u ps\n", | ||
| 650 | var->pixclock); | ||
| 651 | } | ||
| 652 | 636 | ||
| 653 | var->height = -1; | 637 | var->height = -1; |
| 654 | var->width = -1; | 638 | var->width = -1; |
diff --git a/include/linux/fsl-diu-fb.h b/include/linux/fsl-diu-fb.h index 781d4671415f..daa9952d2174 100644 --- a/include/linux/fsl-diu-fb.h +++ b/include/linux/fsl-diu-fb.h | |||
| @@ -24,12 +24,6 @@ | |||
| 24 | * See mpc8610fb_set_par(), map_video_memory(), and unmap_video_memory() | 24 | * See mpc8610fb_set_par(), map_video_memory(), and unmap_video_memory() |
| 25 | */ | 25 | */ |
| 26 | #define MEM_ALLOC_THRESHOLD (1024*768*4+32) | 26 | #define MEM_ALLOC_THRESHOLD (1024*768*4+32) |
| 27 | /* Minimum value that the pixel clock can be set to in pico seconds | ||
| 28 | * This is determined by platform clock/3 where the minimum platform | ||
| 29 | * clock is 533MHz. This gives 5629 pico seconds. | ||
| 30 | */ | ||
| 31 | #define MIN_PIX_CLK 5629 | ||
| 32 | #define MAX_PIX_CLK 96096 | ||
| 33 | 27 | ||
| 34 | #include <linux/types.h> | 28 | #include <linux/types.h> |
| 35 | 29 | ||
