diff options
| author | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-04-24 13:18:48 +0000 |
|---|---|---|
| committer | Florian Tobias Schandinat <FlorianSchandinat@gmx.de> | 2011-04-24 13:18:48 +0000 |
| commit | f33f6f0ccc5ff7415da3feb18b1ff966ed2d80d1 (patch) | |
| tree | 5074abce8a7cffd69519194c8b5b627de1099dca /drivers/video/via/lcd.c | |
| parent | 75ec72f8c53b9f981e68704432a2e425a01f79b7 (diff) | |
| parent | 2946294f9aa734efc5873ea2f34131d0a8c0f89a (diff) | |
| download | linux-3.10-f33f6f0ccc5ff7415da3feb18b1ff966ed2d80d1.tar.gz linux-3.10-f33f6f0ccc5ff7415da3feb18b1ff966ed2d80d1.tar.bz2 linux-3.10-f33f6f0ccc5ff7415da3feb18b1ff966ed2d80d1.zip | |
Merge branch 'viafb-pll' into viafb-next
Conflicts:
drivers/video/via/viamode.c
Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Diffstat (limited to 'drivers/video/via/lcd.c')
| -rw-r--r-- | drivers/video/via/lcd.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/video/via/lcd.c b/drivers/video/via/lcd.c index 6984046c6ee..6e06981d638 100644 --- a/drivers/video/via/lcd.c +++ b/drivers/video/via/lcd.c @@ -558,7 +558,7 @@ void viafb_lcd_set_mode(struct crt_mode_table *mode_crt_table, int set_vres = plvds_setting_info->v_active; int panel_hres = plvds_setting_info->lcd_panel_hres; int panel_vres = plvds_setting_info->lcd_panel_vres; - u32 pll_D_N, clock; + u32 clock; struct display_timing mode_crt_reg, panel_crt_reg; struct crt_mode_table *panel_crt_table = NULL; struct VideoModeTable *vmode_tbl = viafb_get_mode(panel_hres, @@ -609,10 +609,7 @@ void viafb_lcd_set_mode(struct crt_mode_table *mode_crt_table, viafb_load_FIFO_reg(set_iga, set_hres, set_vres); fill_lcd_format(); - - pll_D_N = viafb_get_clk_value(clock); - DEBUG_MSG(KERN_INFO "PLL=0x%x", pll_D_N); - viafb_set_vclock(pll_D_N, set_iga); + viafb_set_vclock(clock, set_iga); lcd_patch_skew(plvds_setting_info, plvds_chip_info); /* If K8M800, enable LCD Prefetch Mode. */ |