forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'viafb-olpc' into viafb-next

Browse source
This commit is contained in:
Florian Tobias Schandinat 2011-04-24 13:16:41 +00:00
commit 567b99f84e
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/video/via/hw.c
View file

@ -20,6 +20,7 @@
*/
#include <linux/via-core.h>
#include <asm/olpc.h>
#include "global.h"
static struct pll_config cle266_pll_config[] = {
@ -875,6 +876,10 @@ void viafb_set_iga_path(void)
viaparinfo->chip_info->
lvds_chip_info2.output_interface);
}
/* looks like the OLPC has its display wired to DVP1 and LVDS2 */
if (machine_is_olpc())
viaparinfo->shared->iga2_devices = VIA_DVP1 | VIA_LVDS2;
}
static void set_color_register(u8 index, u8 red, u8 green, u8 blue)
@ -2600,7 +2605,7 @@ int viafb_get_refresh(int hres, int vres, u32 long_refresh)
if (abs(best->refresh_rate - long_refresh) > 3) {
if (hres == 1200 && vres == 900)
return 50; /* OLPC DCON only supports 50 Hz */
return 49; /* OLPC DCON only supports 50 Hz */
else
return 60;
}

1
drivers/video/via/share.h
View file

@ -290,6 +290,7 @@
#define HW_LAYOUT_LCD_EXTERNAL_LCD2 0x10
/* Definition Refresh Rate */
#define REFRESH_49 49
#define REFRESH_50 50
#define REFRESH_60 60
#define REFRESH_75 75

2
drivers/video/via/viamode.c
View file

@ -606,7 +606,7 @@ static struct crt_mode_table CRTM1200x720[] = {
/* 1200x900 (DCON) */
static struct crt_mode_table DCON1200x900[] = {
/* r_rate, hsp, vsp */
{REFRESH_50, M1200X900_R60_HSP, M1200X900_R60_VSP,
{REFRESH_49, M1200X900_R60_HSP, M1200X900_R60_VSP,
/* The correct htotal is 1240, but this doesn't raster on VX855. */
/* Via suggested changing to a multiple of 16, hence 1264. */
/* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */