aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2011-01-11 18:53:11 -0500
committerPaul Mundt <lethal@linux-sh.org>2011-03-22 02:47:35 -0400
commited3eb4c803dec3cf2976701f0b5722f98e642855 (patch)
tree4fb953f7d29413662405d137daa44340ff1b843e
parentf8645933513c65ac55f23c63b2649097289795c6 (diff)
vt8623fb: Pass par->state.vgabase to vga_*() calls.
Instead of just plain NULL. Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--drivers/video/vt8623fb.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
index 4764fb2fffc0..54ddaeb60f0a 100644
--- a/drivers/video/vt8623fb.c
+++ b/drivers/video/vt8623fb.c
@@ -271,12 +271,12 @@ static void vt8623_set_pixclock(struct fb_info *info, u32 pixclock)
271 } 271 }
272 272
273 /* Set VGA misc register */ 273 /* Set VGA misc register */
274 regval = vga_r(NULL, VGA_MIS_R); 274 regval = vga_r(par->state.vgabase, VGA_MIS_R);
275 vga_w(NULL, VGA_MIS_W, regval | VGA_MIS_ENB_PLL_LOAD); 275 vga_w(par->state.vgabase, VGA_MIS_W, regval | VGA_MIS_ENB_PLL_LOAD);
276 276
277 /* Set clock registers */ 277 /* Set clock registers */
278 vga_wseq(NULL, 0x46, (n | (r << 6))); 278 vga_wseq(par->state.vgabase, 0x46, (n | (r << 6)));
279 vga_wseq(NULL, 0x47, m); 279 vga_wseq(par->state.vgabase, 0x47, m);
280 280
281 udelay(1000); 281 udelay(1000);
282 282
@@ -454,18 +454,18 @@ static int vt8623fb_set_par(struct fb_info *info)
454 svga_wseq_mask(par->state.vgabase, 0x1E, 0xF0, 0xF0); // DI/DVP bus 454 svga_wseq_mask(par->state.vgabase, 0x1E, 0xF0, 0xF0); // DI/DVP bus
455 svga_wseq_mask(par->state.vgabase, 0x2A, 0x0F, 0x0F); // DI/DVP bus 455 svga_wseq_mask(par->state.vgabase, 0x2A, 0x0F, 0x0F); // DI/DVP bus
456 svga_wseq_mask(par->state.vgabase, 0x16, 0x08, 0xBF); // FIFO read threshold 456 svga_wseq_mask(par->state.vgabase, 0x16, 0x08, 0xBF); // FIFO read threshold
457 vga_wseq(NULL, 0x17, 0x1F); // FIFO depth 457 vga_wseq(par->state.vgabase, 0x17, 0x1F); // FIFO depth
458 vga_wseq(NULL, 0x18, 0x4E); 458 vga_wseq(par->state.vgabase, 0x18, 0x4E);
459 svga_wseq_mask(par->state.vgabase, 0x1A, 0x08, 0x08); // enable MMIO ? 459 svga_wseq_mask(par->state.vgabase, 0x1A, 0x08, 0x08); // enable MMIO ?
460 460
461 vga_wcrt(NULL, 0x32, 0x00); 461 vga_wcrt(par->state.vgabase, 0x32, 0x00);
462 vga_wcrt(NULL, 0x34, 0x00); 462 vga_wcrt(par->state.vgabase, 0x34, 0x00);
463 vga_wcrt(NULL, 0x6A, 0x80); 463 vga_wcrt(par->state.vgabase, 0x6A, 0x80);
464 vga_wcrt(NULL, 0x6A, 0xC0); 464 vga_wcrt(par->state.vgabase, 0x6A, 0xC0);
465 465
466 vga_wgfx(NULL, 0x20, 0x00); 466 vga_wgfx(par->state.vgabase, 0x20, 0x00);
467 vga_wgfx(NULL, 0x21, 0x00); 467 vga_wgfx(par->state.vgabase, 0x21, 0x00);
468 vga_wgfx(NULL, 0x22, 0x00); 468 vga_wgfx(par->state.vgabase, 0x22, 0x00);
469 469
470 /* Set SR15 according to number of bits per pixel */ 470 /* Set SR15 according to number of bits per pixel */
471 mode = svga_match_format(vt8623fb_formats, &(info->var), &(info->fix)); 471 mode = svga_match_format(vt8623fb_formats, &(info->var), &(info->fix));
@@ -478,7 +478,7 @@ static int vt8623fb_set_par(struct fb_info *info)
478 break; 478 break;
479 case 1: 479 case 1:
480 pr_debug("fb%d: 4 bit pseudocolor\n", info->node); 480 pr_debug("fb%d: 4 bit pseudocolor\n", info->node);
481 vga_wgfx(NULL, VGA_GFX_MODE, 0x40); 481 vga_wgfx(par->state.vgabase, VGA_GFX_MODE, 0x40);
482 svga_wseq_mask(par->state.vgabase, 0x15, 0x20, 0xFE); 482 svga_wseq_mask(par->state.vgabase, 0x15, 0x20, 0xFE);
483 svga_wcrt_mask(par->state.vgabase, 0x11, 0x00, 0x70); 483 svga_wcrt_mask(par->state.vgabase, 0x11, 0x00, 0x70);
484 break; 484 break;
@@ -717,8 +717,8 @@ static int __devinit vt8623_pci_probe(struct pci_dev *dev, const struct pci_devi
717 } 717 }
718 718
719 /* Find how many physical memory there is on card */ 719 /* Find how many physical memory there is on card */
720 memsize1 = (vga_rseq(NULL, 0x34) + 1) >> 1; 720 memsize1 = (vga_rseq(par->state.vgabase, 0x34) + 1) >> 1;
721 memsize2 = vga_rseq(NULL, 0x39) << 2; 721 memsize2 = vga_rseq(par->state.vgabase, 0x39) << 2;
722 722
723 if ((16 <= memsize1) && (memsize1 <= 64) && (memsize1 == memsize2)) 723 if ((16 <= memsize1) && (memsize1 <= 64) && (memsize1 == memsize2))
724 info->screen_size = memsize1 << 20; 724 info->screen_size = memsize1 << 20;