aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2011-03-03 13:00:08 -0500
committerFlorian Tobias Schandinat <FlorianSchandinat@gmx.de>2011-03-09 12:06:29 -0500
commit23e5abd5555b86fd56af6383e7a832b0cf2a2d95 (patch)
tree3466b403df83a0d150132169e5fdab5c396742ed /drivers/video
parentb65d6040e3a7cd75d9287f7ddfd115e85fde4b44 (diff)
video via: make local variables static
Many local variables should be declared static. Found by sparse, compile tested only. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Signed-off-by: Florian Tobias Schandinat <FlorianSchandinat@gmx.de>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/via/hw.c2
-rw-r--r--drivers/video/via/lcd.c10
-rw-r--r--drivers/video/via/via_i2c.c2
-rw-r--r--drivers/video/via/viafbdev.c6
-rw-r--r--drivers/video/via/viamode.c100
5 files changed, 61 insertions, 59 deletions
diff --git a/drivers/video/via/hw.c b/drivers/video/via/hw.c
index 36d73f940d8b..9ecf48620d02 100644
--- a/drivers/video/via/hw.c
+++ b/drivers/video/via/hw.c
@@ -751,7 +751,7 @@ void viafb_unlock_crt(void)
751 viafb_write_reg_mask(CR47, VIACR, 0, BIT0); 751 viafb_write_reg_mask(CR47, VIACR, 0, BIT0);
752} 752}
753 753
754void write_dac_reg(u8 index, u8 r, u8 g, u8 b) 754static void write_dac_reg(u8 index, u8 r, u8 g, u8 b)
755{ 755{
756 outb(index, LUT_INDEX_WRITE); 756 outb(index, LUT_INDEX_WRITE);
757 outb(r, LUT_DATA); 757 outb(r, LUT_DATA);
diff --git a/drivers/video/via/lcd.c b/drivers/video/via/lcd.c
index 723fa04b303f..2ca3bb8abbfe 100644
--- a/drivers/video/via/lcd.c
+++ b/drivers/video/via/lcd.c
@@ -26,10 +26,12 @@
26 26
27/* CLE266 Software Power Sequence */ 27/* CLE266 Software Power Sequence */
28/* {Mask}, {Data}, {Delay} */ 28/* {Mask}, {Data}, {Delay} */
29int PowerSequenceOn[3][3] = { {0x10, 0x08, 0x06}, {0x10, 0x08, 0x06}, 29static const int PowerSequenceOn[3][3] = {
30 {0x19, 0x1FE, 0x01} }; 30 {0x10, 0x08, 0x06}, {0x10, 0x08, 0x06}, {0x19, 0x1FE, 0x01}
31int PowerSequenceOff[3][3] = { {0x06, 0x08, 0x10}, {0x00, 0x00, 0x00}, 31};
32 {0xD2, 0x19, 0x01} }; 32static const int PowerSequenceOff[3][3] = {
33 {0x06, 0x08, 0x10}, {0x00, 0x00, 0x00}, {0xD2, 0x19, 0x01}
34};
33 35
34static struct _lcd_scaling_factor lcd_scaling_factor = { 36static struct _lcd_scaling_factor lcd_scaling_factor = {
35 /* LCD Horizontal Scaling Factor Register */ 37 /* LCD Horizontal Scaling Factor Register */
diff --git a/drivers/video/via/via_i2c.c b/drivers/video/via/via_i2c.c
index a172a31f168f..78f1405dbab7 100644
--- a/drivers/video/via/via_i2c.c
+++ b/drivers/video/via/via_i2c.c
@@ -32,7 +32,7 @@
32 */ 32 */
33#define VIAFB_NUM_I2C 5 33#define VIAFB_NUM_I2C 5
34static struct via_i2c_stuff via_i2c_par[VIAFB_NUM_I2C]; 34static struct via_i2c_stuff via_i2c_par[VIAFB_NUM_I2C];
35struct viafb_dev *i2c_vdev; /* Passed in from core */ 35static struct viafb_dev *i2c_vdev; /* Passed in from core */
36 36
37static void via_i2c_setscl(void *data, int state) 37static void via_i2c_setscl(void *data, int state)
38{ 38{
diff --git a/drivers/video/via/viafbdev.c b/drivers/video/via/viafbdev.c
index 4e66349e4366..f555b891cc72 100644
--- a/drivers/video/via/viafbdev.c
+++ b/drivers/video/via/viafbdev.c
@@ -43,11 +43,11 @@ static int viafb_second_size;
43static int viafb_accel = 1; 43static int viafb_accel = 1;
44 44
45/* Added for specifying active devices.*/ 45/* Added for specifying active devices.*/
46char *viafb_active_dev; 46static char *viafb_active_dev;
47 47
48/*Added for specify lcd output port*/ 48/*Added for specify lcd output port*/
49char *viafb_lcd_port = ""; 49static char *viafb_lcd_port = "";
50char *viafb_dvi_port = ""; 50static char *viafb_dvi_port = "";
51 51
52static void retrieve_device_setting(struct viafb_ioctl_setting 52static void retrieve_device_setting(struct viafb_ioctl_setting
53 *setting_info); 53 *setting_info);
diff --git a/drivers/video/via/viamode.c b/drivers/video/via/viamode.c
index 2dbad3c0f679..4b06dd73ccaa 100644
--- a/drivers/video/via/viamode.c
+++ b/drivers/video/via/viamode.c
@@ -443,7 +443,7 @@ struct VPITTable VPIT = {
443/********************/ 443/********************/
444 444
445/* 480x640 */ 445/* 480x640 */
446struct crt_mode_table CRTM480x640[] = { 446static struct crt_mode_table CRTM480x640[] = {
447 /* r_rate, vclk, hsp, vsp */ 447 /* r_rate, vclk, hsp, vsp */
448 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 448 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
449 {REFRESH_60, CLK_25_175M, M480X640_R60_HSP, M480X640_R60_VSP, 449 {REFRESH_60, CLK_25_175M, M480X640_R60_HSP, M480X640_R60_VSP,
@@ -451,7 +451,7 @@ struct crt_mode_table CRTM480x640[] = {
451}; 451};
452 452
453/* 640x480*/ 453/* 640x480*/
454struct crt_mode_table CRTM640x480[] = { 454static struct crt_mode_table CRTM640x480[] = {
455 /*r_rate,vclk,hsp,vsp */ 455 /*r_rate,vclk,hsp,vsp */
456 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 456 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
457 {REFRESH_60, CLK_25_175M, M640X480_R60_HSP, M640X480_R60_VSP, 457 {REFRESH_60, CLK_25_175M, M640X480_R60_HSP, M640X480_R60_VSP,
@@ -469,7 +469,7 @@ struct crt_mode_table CRTM640x480[] = {
469}; 469};
470 470
471/*720x480 (GTF)*/ 471/*720x480 (GTF)*/
472struct crt_mode_table CRTM720x480[] = { 472static struct crt_mode_table CRTM720x480[] = {
473 /*r_rate,vclk,hsp,vsp */ 473 /*r_rate,vclk,hsp,vsp */
474 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 474 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
475 {REFRESH_60, CLK_26_880M, M720X480_R60_HSP, M720X480_R60_VSP, 475 {REFRESH_60, CLK_26_880M, M720X480_R60_HSP, M720X480_R60_VSP,
@@ -478,7 +478,7 @@ struct crt_mode_table CRTM720x480[] = {
478}; 478};
479 479
480/*720x576 (GTF)*/ 480/*720x576 (GTF)*/
481struct crt_mode_table CRTM720x576[] = { 481static struct crt_mode_table CRTM720x576[] = {
482 /*r_rate,vclk,hsp,vsp */ 482 /*r_rate,vclk,hsp,vsp */
483 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 483 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
484 {REFRESH_60, CLK_32_668M, M720X576_R60_HSP, M720X576_R60_VSP, 484 {REFRESH_60, CLK_32_668M, M720X576_R60_HSP, M720X576_R60_VSP,
@@ -486,7 +486,7 @@ struct crt_mode_table CRTM720x576[] = {
486}; 486};
487 487
488/* 800x480 (CVT) */ 488/* 800x480 (CVT) */
489struct crt_mode_table CRTM800x480[] = { 489static struct crt_mode_table CRTM800x480[] = {
490 /* r_rate, vclk, hsp, vsp */ 490 /* r_rate, vclk, hsp, vsp */
491 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 491 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
492 {REFRESH_60, CLK_29_581M, M800X480_R60_HSP, M800X480_R60_VSP, 492 {REFRESH_60, CLK_29_581M, M800X480_R60_HSP, M800X480_R60_VSP,
@@ -494,7 +494,7 @@ struct crt_mode_table CRTM800x480[] = {
494}; 494};
495 495
496/* 800x600*/ 496/* 800x600*/
497struct crt_mode_table CRTM800x600[] = { 497static struct crt_mode_table CRTM800x600[] = {
498 /*r_rate,vclk,hsp,vsp */ 498 /*r_rate,vclk,hsp,vsp */
499 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 499 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
500 {REFRESH_60, CLK_40_000M, M800X600_R60_HSP, M800X600_R60_VSP, 500 {REFRESH_60, CLK_40_000M, M800X600_R60_HSP, M800X600_R60_VSP,
@@ -512,7 +512,7 @@ struct crt_mode_table CRTM800x600[] = {
512}; 512};
513 513
514/* 848x480 (CVT) */ 514/* 848x480 (CVT) */
515struct crt_mode_table CRTM848x480[] = { 515static struct crt_mode_table CRTM848x480[] = {
516 /* r_rate, vclk, hsp, vsp */ 516 /* r_rate, vclk, hsp, vsp */
517 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 517 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
518 {REFRESH_60, CLK_31_500M, M848X480_R60_HSP, M848X480_R60_VSP, 518 {REFRESH_60, CLK_31_500M, M848X480_R60_HSP, M848X480_R60_VSP,
@@ -520,7 +520,7 @@ struct crt_mode_table CRTM848x480[] = {
520}; 520};
521 521
522/*856x480 (GTF) convert to 852x480*/ 522/*856x480 (GTF) convert to 852x480*/
523struct crt_mode_table CRTM852x480[] = { 523static struct crt_mode_table CRTM852x480[] = {
524 /*r_rate,vclk,hsp,vsp */ 524 /*r_rate,vclk,hsp,vsp */
525 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 525 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
526 {REFRESH_60, CLK_31_728M, M852X480_R60_HSP, M852X480_R60_VSP, 526 {REFRESH_60, CLK_31_728M, M852X480_R60_HSP, M852X480_R60_VSP,
@@ -528,7 +528,7 @@ struct crt_mode_table CRTM852x480[] = {
528}; 528};
529 529
530/*1024x512 (GTF)*/ 530/*1024x512 (GTF)*/
531struct crt_mode_table CRTM1024x512[] = { 531static struct crt_mode_table CRTM1024x512[] = {
532 /*r_rate,vclk,hsp,vsp */ 532 /*r_rate,vclk,hsp,vsp */
533 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 533 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
534 {REFRESH_60, CLK_41_291M, M1024X512_R60_HSP, M1024X512_R60_VSP, 534 {REFRESH_60, CLK_41_291M, M1024X512_R60_HSP, M1024X512_R60_VSP,
@@ -537,7 +537,7 @@ struct crt_mode_table CRTM1024x512[] = {
537}; 537};
538 538
539/* 1024x600*/ 539/* 1024x600*/
540struct crt_mode_table CRTM1024x600[] = { 540static struct crt_mode_table CRTM1024x600[] = {
541 /*r_rate,vclk,hsp,vsp */ 541 /*r_rate,vclk,hsp,vsp */
542 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 542 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
543 {REFRESH_60, CLK_48_875M, M1024X600_R60_HSP, M1024X600_R60_VSP, 543 {REFRESH_60, CLK_48_875M, M1024X600_R60_HSP, M1024X600_R60_VSP,
@@ -545,7 +545,7 @@ struct crt_mode_table CRTM1024x600[] = {
545}; 545};
546 546
547/* 1024x768*/ 547/* 1024x768*/
548struct crt_mode_table CRTM1024x768[] = { 548static struct crt_mode_table CRTM1024x768[] = {
549 /*r_rate,vclk,hsp,vsp */ 549 /*r_rate,vclk,hsp,vsp */
550 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 550 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
551 {REFRESH_60, CLK_65_000M, M1024X768_R60_HSP, M1024X768_R60_VSP, 551 {REFRESH_60, CLK_65_000M, M1024X768_R60_HSP, M1024X768_R60_VSP,
@@ -559,7 +559,7 @@ struct crt_mode_table CRTM1024x768[] = {
559}; 559};
560 560
561/* 1152x864*/ 561/* 1152x864*/
562struct crt_mode_table CRTM1152x864[] = { 562static struct crt_mode_table CRTM1152x864[] = {
563 /*r_rate,vclk,hsp,vsp */ 563 /*r_rate,vclk,hsp,vsp */
564 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 564 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
565 {REFRESH_75, CLK_108_000M, M1152X864_R75_HSP, M1152X864_R75_VSP, 565 {REFRESH_75, CLK_108_000M, M1152X864_R75_HSP, M1152X864_R75_VSP,
@@ -568,7 +568,7 @@ struct crt_mode_table CRTM1152x864[] = {
568}; 568};
569 569
570/* 1280x720 (HDMI 720P)*/ 570/* 1280x720 (HDMI 720P)*/
571struct crt_mode_table CRTM1280x720[] = { 571static struct crt_mode_table CRTM1280x720[] = {
572 /*r_rate,vclk,hsp,vsp */ 572 /*r_rate,vclk,hsp,vsp */
573 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 573 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
574 {REFRESH_60, CLK_74_481M, M1280X720_R60_HSP, M1280X720_R60_VSP, 574 {REFRESH_60, CLK_74_481M, M1280X720_R60_HSP, M1280X720_R60_VSP,
@@ -578,7 +578,7 @@ struct crt_mode_table CRTM1280x720[] = {
578}; 578};
579 579
580/*1280x768 (GTF)*/ 580/*1280x768 (GTF)*/
581struct crt_mode_table CRTM1280x768[] = { 581static struct crt_mode_table CRTM1280x768[] = {
582 /*r_rate,vclk,hsp,vsp */ 582 /*r_rate,vclk,hsp,vsp */
583 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 583 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
584 {REFRESH_60, CLK_80_136M, M1280X768_R60_HSP, M1280X768_R60_VSP, 584 {REFRESH_60, CLK_80_136M, M1280X768_R60_HSP, M1280X768_R60_VSP,
@@ -588,7 +588,7 @@ struct crt_mode_table CRTM1280x768[] = {
588}; 588};
589 589
590/* 1280x800 (CVT) */ 590/* 1280x800 (CVT) */
591struct crt_mode_table CRTM1280x800[] = { 591static struct crt_mode_table CRTM1280x800[] = {
592 /* r_rate, vclk, hsp, vsp */ 592 /* r_rate, vclk, hsp, vsp */
593 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 593 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
594 {REFRESH_60, CLK_83_375M, M1280X800_R60_HSP, M1280X800_R60_VSP, 594 {REFRESH_60, CLK_83_375M, M1280X800_R60_HSP, M1280X800_R60_VSP,
@@ -596,7 +596,7 @@ struct crt_mode_table CRTM1280x800[] = {
596}; 596};
597 597
598/*1280x960*/ 598/*1280x960*/
599struct crt_mode_table CRTM1280x960[] = { 599static struct crt_mode_table CRTM1280x960[] = {
600 /*r_rate,vclk,hsp,vsp */ 600 /*r_rate,vclk,hsp,vsp */
601 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 601 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
602 {REFRESH_60, CLK_108_000M, M1280X960_R60_HSP, M1280X960_R60_VSP, 602 {REFRESH_60, CLK_108_000M, M1280X960_R60_HSP, M1280X960_R60_VSP,
@@ -604,7 +604,7 @@ struct crt_mode_table CRTM1280x960[] = {
604}; 604};
605 605
606/* 1280x1024*/ 606/* 1280x1024*/
607struct crt_mode_table CRTM1280x1024[] = { 607static struct crt_mode_table CRTM1280x1024[] = {
608 /*r_rate,vclk,,hsp,vsp */ 608 /*r_rate,vclk,,hsp,vsp */
609 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 609 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
610 {REFRESH_60, CLK_108_000M, M1280X1024_R60_HSP, M1280X1024_R60_VSP, 610 {REFRESH_60, CLK_108_000M, M1280X1024_R60_HSP, M1280X1024_R60_VSP,
@@ -618,7 +618,7 @@ struct crt_mode_table CRTM1280x1024[] = {
618}; 618};
619 619
620/* 1368x768 (GTF) */ 620/* 1368x768 (GTF) */
621struct crt_mode_table CRTM1368x768[] = { 621static struct crt_mode_table CRTM1368x768[] = {
622 /* r_rate, vclk, hsp, vsp */ 622 /* r_rate, vclk, hsp, vsp */
623 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 623 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
624 {REFRESH_60, CLK_85_860M, M1368X768_R60_HSP, M1368X768_R60_VSP, 624 {REFRESH_60, CLK_85_860M, M1368X768_R60_HSP, M1368X768_R60_VSP,
@@ -626,7 +626,7 @@ struct crt_mode_table CRTM1368x768[] = {
626}; 626};
627 627
628/*1440x1050 (GTF)*/ 628/*1440x1050 (GTF)*/
629struct crt_mode_table CRTM1440x1050[] = { 629static struct crt_mode_table CRTM1440x1050[] = {
630 /*r_rate,vclk,hsp,vsp */ 630 /*r_rate,vclk,hsp,vsp */
631 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 631 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
632 {REFRESH_60, CLK_125_104M, M1440X1050_R60_HSP, M1440X1050_R60_VSP, 632 {REFRESH_60, CLK_125_104M, M1440X1050_R60_HSP, M1440X1050_R60_VSP,
@@ -634,7 +634,7 @@ struct crt_mode_table CRTM1440x1050[] = {
634}; 634};
635 635
636/* 1600x1200*/ 636/* 1600x1200*/
637struct crt_mode_table CRTM1600x1200[] = { 637static struct crt_mode_table CRTM1600x1200[] = {
638 /*r_rate,vclk,hsp,vsp */ 638 /*r_rate,vclk,hsp,vsp */
639 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 639 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
640 {REFRESH_60, CLK_162_000M, M1600X1200_R60_HSP, M1600X1200_R60_VSP, 640 {REFRESH_60, CLK_162_000M, M1600X1200_R60_HSP, M1600X1200_R60_VSP,
@@ -646,7 +646,7 @@ struct crt_mode_table CRTM1600x1200[] = {
646}; 646};
647 647
648/* 1680x1050 (CVT) */ 648/* 1680x1050 (CVT) */
649struct crt_mode_table CRTM1680x1050[] = { 649static struct crt_mode_table CRTM1680x1050[] = {
650 /* r_rate, vclk, hsp, vsp */ 650 /* r_rate, vclk, hsp, vsp */
651 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 651 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
652 {REFRESH_60, CLK_146_760M, M1680x1050_R60_HSP, M1680x1050_R60_VSP, 652 {REFRESH_60, CLK_146_760M, M1680x1050_R60_HSP, M1680x1050_R60_VSP,
@@ -657,7 +657,7 @@ struct crt_mode_table CRTM1680x1050[] = {
657}; 657};
658 658
659/* 1680x1050 (CVT Reduce Blanking) */ 659/* 1680x1050 (CVT Reduce Blanking) */
660struct crt_mode_table CRTM1680x1050_RB[] = { 660static struct crt_mode_table CRTM1680x1050_RB[] = {
661 /* r_rate, vclk, hsp, vsp */ 661 /* r_rate, vclk, hsp, vsp */
662 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 662 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
663 {REFRESH_60, CLK_119_000M, M1680x1050_RB_R60_HSP, 663 {REFRESH_60, CLK_119_000M, M1680x1050_RB_R60_HSP,
@@ -666,7 +666,7 @@ struct crt_mode_table CRTM1680x1050_RB[] = {
666}; 666};
667 667
668/* 1920x1080 (CVT)*/ 668/* 1920x1080 (CVT)*/
669struct crt_mode_table CRTM1920x1080[] = { 669static struct crt_mode_table CRTM1920x1080[] = {
670 /*r_rate,vclk,hsp,vsp */ 670 /*r_rate,vclk,hsp,vsp */
671 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 671 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
672 {REFRESH_60, CLK_172_798M, M1920X1080_R60_HSP, M1920X1080_R60_VSP, 672 {REFRESH_60, CLK_172_798M, M1920X1080_R60_HSP, M1920X1080_R60_VSP,
@@ -674,7 +674,7 @@ struct crt_mode_table CRTM1920x1080[] = {
674}; 674};
675 675
676/* 1920x1080 (CVT with Reduce Blanking) */ 676/* 1920x1080 (CVT with Reduce Blanking) */
677struct crt_mode_table CRTM1920x1080_RB[] = { 677static struct crt_mode_table CRTM1920x1080_RB[] = {
678 /* r_rate, vclk, hsp, vsp */ 678 /* r_rate, vclk, hsp, vsp */
679 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 679 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
680 {REFRESH_60, CLK_138_400M, M1920X1080_RB_R60_HSP, 680 {REFRESH_60, CLK_138_400M, M1920X1080_RB_R60_HSP,
@@ -683,7 +683,7 @@ struct crt_mode_table CRTM1920x1080_RB[] = {
683}; 683};
684 684
685/* 1920x1440*/ 685/* 1920x1440*/
686struct crt_mode_table CRTM1920x1440[] = { 686static struct crt_mode_table CRTM1920x1440[] = {
687 /*r_rate,vclk,hsp,vsp */ 687 /*r_rate,vclk,hsp,vsp */
688 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 688 /*HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
689 {REFRESH_60, CLK_234_000M, M1920X1440_R60_HSP, M1920X1440_R60_VSP, 689 {REFRESH_60, CLK_234_000M, M1920X1440_R60_HSP, M1920X1440_R60_VSP,
@@ -694,7 +694,7 @@ struct crt_mode_table CRTM1920x1440[] = {
694}; 694};
695 695
696/* 1400x1050 (CVT) */ 696/* 1400x1050 (CVT) */
697struct crt_mode_table CRTM1400x1050[] = { 697static struct crt_mode_table CRTM1400x1050[] = {
698 /* r_rate, vclk, hsp, vsp */ 698 /* r_rate, vclk, hsp, vsp */
699 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 699 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
700 {REFRESH_60, CLK_121_750M, M1400X1050_R60_HSP, M1400X1050_R60_VSP, 700 {REFRESH_60, CLK_121_750M, M1400X1050_R60_HSP, M1400X1050_R60_VSP,
@@ -705,7 +705,7 @@ struct crt_mode_table CRTM1400x1050[] = {
705}; 705};
706 706
707/* 1400x1050 (CVT Reduce Blanking) */ 707/* 1400x1050 (CVT Reduce Blanking) */
708struct crt_mode_table CRTM1400x1050_RB[] = { 708static struct crt_mode_table CRTM1400x1050_RB[] = {
709 /* r_rate, vclk, hsp, vsp */ 709 /* r_rate, vclk, hsp, vsp */
710 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 710 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
711 {REFRESH_60, CLK_101_000M, M1400X1050_RB_R60_HSP, 711 {REFRESH_60, CLK_101_000M, M1400X1050_RB_R60_HSP,
@@ -714,7 +714,7 @@ struct crt_mode_table CRTM1400x1050_RB[] = {
714}; 714};
715 715
716/* 960x600 (CVT) */ 716/* 960x600 (CVT) */
717struct crt_mode_table CRTM960x600[] = { 717static struct crt_mode_table CRTM960x600[] = {
718 /* r_rate, vclk, hsp, vsp */ 718 /* r_rate, vclk, hsp, vsp */
719 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 719 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
720 {REFRESH_60, CLK_45_250M, M960X600_R60_HSP, M960X600_R60_VSP, 720 {REFRESH_60, CLK_45_250M, M960X600_R60_HSP, M960X600_R60_VSP,
@@ -722,7 +722,7 @@ struct crt_mode_table CRTM960x600[] = {
722}; 722};
723 723
724/* 1000x600 (GTF) */ 724/* 1000x600 (GTF) */
725struct crt_mode_table CRTM1000x600[] = { 725static struct crt_mode_table CRTM1000x600[] = {
726 /* r_rate, vclk, hsp, vsp */ 726 /* r_rate, vclk, hsp, vsp */
727 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 727 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
728 {REFRESH_60, CLK_48_000M, M1000X600_R60_HSP, M1000X600_R60_VSP, 728 {REFRESH_60, CLK_48_000M, M1000X600_R60_HSP, M1000X600_R60_VSP,
@@ -730,7 +730,7 @@ struct crt_mode_table CRTM1000x600[] = {
730}; 730};
731 731
732/* 1024x576 (GTF) */ 732/* 1024x576 (GTF) */
733struct crt_mode_table CRTM1024x576[] = { 733static struct crt_mode_table CRTM1024x576[] = {
734 /* r_rate, vclk, hsp, vsp */ 734 /* r_rate, vclk, hsp, vsp */
735 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 735 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
736 {REFRESH_60, CLK_46_996M, M1024X576_R60_HSP, M1024X576_R60_VSP, 736 {REFRESH_60, CLK_46_996M, M1024X576_R60_HSP, M1024X576_R60_VSP,
@@ -738,7 +738,7 @@ struct crt_mode_table CRTM1024x576[] = {
738}; 738};
739 739
740/* 1088x612 (CVT) */ 740/* 1088x612 (CVT) */
741struct crt_mode_table CRTM1088x612[] = { 741static struct crt_mode_table CRTM1088x612[] = {
742 /* r_rate, vclk, hsp, vsp */ 742 /* r_rate, vclk, hsp, vsp */
743 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 743 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
744 {REFRESH_60, CLK_52_977M, M1088X612_R60_HSP, M1088X612_R60_VSP, 744 {REFRESH_60, CLK_52_977M, M1088X612_R60_HSP, M1088X612_R60_VSP,
@@ -746,7 +746,7 @@ struct crt_mode_table CRTM1088x612[] = {
746}; 746};
747 747
748/* 1152x720 (CVT) */ 748/* 1152x720 (CVT) */
749struct crt_mode_table CRTM1152x720[] = { 749static struct crt_mode_table CRTM1152x720[] = {
750 /* r_rate, vclk, hsp, vsp */ 750 /* r_rate, vclk, hsp, vsp */
751 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 751 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
752 {REFRESH_60, CLK_66_750M, M1152X720_R60_HSP, M1152X720_R60_VSP, 752 {REFRESH_60, CLK_66_750M, M1152X720_R60_HSP, M1152X720_R60_VSP,
@@ -754,7 +754,7 @@ struct crt_mode_table CRTM1152x720[] = {
754}; 754};
755 755
756/* 1200x720 (GTF) */ 756/* 1200x720 (GTF) */
757struct crt_mode_table CRTM1200x720[] = { 757static struct crt_mode_table CRTM1200x720[] = {
758 /* r_rate, vclk, hsp, vsp */ 758 /* r_rate, vclk, hsp, vsp */
759 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 759 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
760 {REFRESH_60, CLK_70_159M, M1200X720_R60_HSP, M1200X720_R60_VSP, 760 {REFRESH_60, CLK_70_159M, M1200X720_R60_HSP, M1200X720_R60_VSP,
@@ -762,7 +762,7 @@ struct crt_mode_table CRTM1200x720[] = {
762}; 762};
763 763
764/* 1200x900 (DCON) */ 764/* 1200x900 (DCON) */
765struct crt_mode_table DCON1200x900[] = { 765static struct crt_mode_table DCON1200x900[] = {
766 /* r_rate, vclk, hsp, vsp */ 766 /* r_rate, vclk, hsp, vsp */
767 {REFRESH_60, CLK_57_275M, M1200X900_R60_HSP, M1200X900_R60_VSP, 767 {REFRESH_60, CLK_57_275M, M1200X900_R60_HSP, M1200X900_R60_VSP,
768 /* The correct htotal is 1240, but this doesn't raster on VX855. */ 768 /* The correct htotal is 1240, but this doesn't raster on VX855. */
@@ -772,7 +772,7 @@ struct crt_mode_table DCON1200x900[] = {
772}; 772};
773 773
774/* 1280x600 (GTF) */ 774/* 1280x600 (GTF) */
775struct crt_mode_table CRTM1280x600[] = { 775static struct crt_mode_table CRTM1280x600[] = {
776 /* r_rate, vclk, hsp, vsp */ 776 /* r_rate, vclk, hsp, vsp */
777 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 777 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
778 {REFRESH_60, CLK_61_500M, M1280x600_R60_HSP, M1280x600_R60_VSP, 778 {REFRESH_60, CLK_61_500M, M1280x600_R60_HSP, M1280x600_R60_VSP,
@@ -780,7 +780,7 @@ struct crt_mode_table CRTM1280x600[] = {
780}; 780};
781 781
782/* 1360x768 (CVT) */ 782/* 1360x768 (CVT) */
783struct crt_mode_table CRTM1360x768[] = { 783static struct crt_mode_table CRTM1360x768[] = {
784 /* r_rate, vclk, hsp, vsp */ 784 /* r_rate, vclk, hsp, vsp */
785 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 785 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
786 {REFRESH_60, CLK_84_750M, M1360X768_R60_HSP, M1360X768_R60_VSP, 786 {REFRESH_60, CLK_84_750M, M1360X768_R60_HSP, M1360X768_R60_VSP,
@@ -788,7 +788,7 @@ struct crt_mode_table CRTM1360x768[] = {
788}; 788};
789 789
790/* 1360x768 (CVT Reduce Blanking) */ 790/* 1360x768 (CVT Reduce Blanking) */
791struct crt_mode_table CRTM1360x768_RB[] = { 791static struct crt_mode_table CRTM1360x768_RB[] = {
792 /* r_rate, vclk, hsp, vsp */ 792 /* r_rate, vclk, hsp, vsp */
793 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 793 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
794 {REFRESH_60, CLK_72_000M, M1360X768_RB_R60_HSP, 794 {REFRESH_60, CLK_72_000M, M1360X768_RB_R60_HSP,
@@ -797,7 +797,7 @@ struct crt_mode_table CRTM1360x768_RB[] = {
797}; 797};
798 798
799/* 1366x768 (GTF) */ 799/* 1366x768 (GTF) */
800struct crt_mode_table CRTM1366x768[] = { 800static struct crt_mode_table CRTM1366x768[] = {
801 /* r_rate, vclk, hsp, vsp */ 801 /* r_rate, vclk, hsp, vsp */
802 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 802 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
803 {REFRESH_60, CLK_85_860M, M1368X768_R60_HSP, M1368X768_R60_VSP, 803 {REFRESH_60, CLK_85_860M, M1368X768_R60_HSP, M1368X768_R60_VSP,
@@ -807,7 +807,7 @@ struct crt_mode_table CRTM1366x768[] = {
807}; 807};
808 808
809/* 1440x900 (CVT) */ 809/* 1440x900 (CVT) */
810struct crt_mode_table CRTM1440x900[] = { 810static struct crt_mode_table CRTM1440x900[] = {
811 /* r_rate, vclk, hsp, vsp */ 811 /* r_rate, vclk, hsp, vsp */
812 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 812 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
813 {REFRESH_60, CLK_106_500M, M1440X900_R60_HSP, M1440X900_R60_VSP, 813 {REFRESH_60, CLK_106_500M, M1440X900_R60_HSP, M1440X900_R60_VSP,
@@ -817,7 +817,7 @@ struct crt_mode_table CRTM1440x900[] = {
817}; 817};
818 818
819/* 1440x900 (CVT Reduce Blanking) */ 819/* 1440x900 (CVT Reduce Blanking) */
820struct crt_mode_table CRTM1440x900_RB[] = { 820static struct crt_mode_table CRTM1440x900_RB[] = {
821 /* r_rate, vclk, hsp, vsp */ 821 /* r_rate, vclk, hsp, vsp */
822 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 822 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
823 {REFRESH_60, CLK_88_750M, M1440X900_RB_R60_HSP, 823 {REFRESH_60, CLK_88_750M, M1440X900_RB_R60_HSP,
@@ -826,7 +826,7 @@ struct crt_mode_table CRTM1440x900_RB[] = {
826}; 826};
827 827
828/* 1600x900 (CVT) */ 828/* 1600x900 (CVT) */
829struct crt_mode_table CRTM1600x900[] = { 829static struct crt_mode_table CRTM1600x900[] = {
830 /* r_rate, vclk, hsp, vsp */ 830 /* r_rate, vclk, hsp, vsp */
831 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 831 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
832 {REFRESH_60, CLK_118_840M, M1600X900_R60_HSP, M1600X900_R60_VSP, 832 {REFRESH_60, CLK_118_840M, M1600X900_R60_HSP, M1600X900_R60_VSP,
@@ -834,7 +834,7 @@ struct crt_mode_table CRTM1600x900[] = {
834}; 834};
835 835
836/* 1600x900 (CVT Reduce Blanking) */ 836/* 1600x900 (CVT Reduce Blanking) */
837struct crt_mode_table CRTM1600x900_RB[] = { 837static struct crt_mode_table CRTM1600x900_RB[] = {
838 /* r_rate, vclk, hsp, vsp */ 838 /* r_rate, vclk, hsp, vsp */
839 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 839 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
840 {REFRESH_60, CLK_97_750M, M1600X900_RB_R60_HSP, 840 {REFRESH_60, CLK_97_750M, M1600X900_RB_R60_HSP,
@@ -843,7 +843,7 @@ struct crt_mode_table CRTM1600x900_RB[] = {
843}; 843};
844 844
845/* 1600x1024 (GTF) */ 845/* 1600x1024 (GTF) */
846struct crt_mode_table CRTM1600x1024[] = { 846static struct crt_mode_table CRTM1600x1024[] = {
847 /* r_rate, vclk, hsp, vsp */ 847 /* r_rate, vclk, hsp, vsp */
848 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 848 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
849 {REFRESH_60, CLK_136_700M, M1600X1024_R60_HSP, M1600X1024_R60_VSP, 849 {REFRESH_60, CLK_136_700M, M1600X1024_R60_HSP, M1600X1024_R60_VSP,
@@ -851,7 +851,7 @@ struct crt_mode_table CRTM1600x1024[] = {
851}; 851};
852 852
853/* 1792x1344 (DMT) */ 853/* 1792x1344 (DMT) */
854struct crt_mode_table CRTM1792x1344[] = { 854static struct crt_mode_table CRTM1792x1344[] = {
855 /* r_rate, vclk, hsp, vsp */ 855 /* r_rate, vclk, hsp, vsp */
856 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 856 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
857 {REFRESH_60, CLK_204_000M, M1792x1344_R60_HSP, M1792x1344_R60_VSP, 857 {REFRESH_60, CLK_204_000M, M1792x1344_R60_HSP, M1792x1344_R60_VSP,
@@ -859,7 +859,7 @@ struct crt_mode_table CRTM1792x1344[] = {
859}; 859};
860 860
861/* 1856x1392 (DMT) */ 861/* 1856x1392 (DMT) */
862struct crt_mode_table CRTM1856x1392[] = { 862static struct crt_mode_table CRTM1856x1392[] = {
863 /* r_rate, vclk, hsp, vsp */ 863 /* r_rate, vclk, hsp, vsp */
864 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 864 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
865 {REFRESH_60, CLK_218_500M, M1856x1392_R60_HSP, M1856x1392_R60_VSP, 865 {REFRESH_60, CLK_218_500M, M1856x1392_R60_HSP, M1856x1392_R60_VSP,
@@ -867,7 +867,7 @@ struct crt_mode_table CRTM1856x1392[] = {
867}; 867};
868 868
869/* 1920x1200 (CVT) */ 869/* 1920x1200 (CVT) */
870struct crt_mode_table CRTM1920x1200[] = { 870static struct crt_mode_table CRTM1920x1200[] = {
871 /* r_rate, vclk, hsp, vsp */ 871 /* r_rate, vclk, hsp, vsp */
872 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 872 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
873 {REFRESH_60, CLK_193_295M, M1920X1200_R60_HSP, M1920X1200_R60_VSP, 873 {REFRESH_60, CLK_193_295M, M1920X1200_R60_HSP, M1920X1200_R60_VSP,
@@ -875,7 +875,7 @@ struct crt_mode_table CRTM1920x1200[] = {
875}; 875};
876 876
877/* 1920x1200 (CVT with Reduce Blanking) */ 877/* 1920x1200 (CVT with Reduce Blanking) */
878struct crt_mode_table CRTM1920x1200_RB[] = { 878static struct crt_mode_table CRTM1920x1200_RB[] = {
879 /* r_rate, vclk, hsp, vsp */ 879 /* r_rate, vclk, hsp, vsp */
880 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 880 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
881 {REFRESH_60, CLK_153_920M, M1920X1200_RB_R60_HSP, 881 {REFRESH_60, CLK_153_920M, M1920X1200_RB_R60_HSP,
@@ -884,14 +884,14 @@ struct crt_mode_table CRTM1920x1200_RB[] = {
884}; 884};
885 885
886/* 2048x1536 (CVT) */ 886/* 2048x1536 (CVT) */
887struct crt_mode_table CRTM2048x1536[] = { 887static struct crt_mode_table CRTM2048x1536[] = {
888 /* r_rate, vclk, hsp, vsp */ 888 /* r_rate, vclk, hsp, vsp */
889 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */ 889 /* HT, HA, HBS, HBE, HSS, HSE, VT, VA, VBS, VBE, VSS, VSE */
890 {REFRESH_60, CLK_267_250M, M2048x1536_R60_HSP, M2048x1536_R60_VSP, 890 {REFRESH_60, CLK_267_250M, M2048x1536_R60_HSP, M2048x1536_R60_VSP,
891 {2800, 2048, 2048, 752, 2200, 224, 1592, 1536, 1536, 56, 1539, 4} } 891 {2800, 2048, 2048, 752, 2200, 224, 1592, 1536, 1536, 56, 1539, 4} }
892}; 892};
893 893
894struct VideoModeTable viafb_modes[] = { 894static struct VideoModeTable viafb_modes[] = {
895 /* Display : 480x640 (GTF) */ 895 /* Display : 480x640 (GTF) */
896 {CRTM480x640, ARRAY_SIZE(CRTM480x640)}, 896 {CRTM480x640, ARRAY_SIZE(CRTM480x640)},
897 897
@@ -1016,7 +1016,7 @@ struct VideoModeTable viafb_modes[] = {
1016 {CRTM1400x1050, ARRAY_SIZE(CRTM1400x1050)} 1016 {CRTM1400x1050, ARRAY_SIZE(CRTM1400x1050)}
1017}; 1017};
1018 1018
1019struct VideoModeTable viafb_rb_modes[] = { 1019static struct VideoModeTable viafb_rb_modes[] = {
1020 /* Display : 1360x768 (CVT Reduce Blanking) */ 1020 /* Display : 1360x768 (CVT Reduce Blanking) */
1021 {CRTM1360x768_RB, ARRAY_SIZE(CRTM1360x768_RB)}, 1021 {CRTM1360x768_RB, ARRAY_SIZE(CRTM1360x768_RB)},
1022 1022