aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2011-01-11 18:51:56 -0500
committerPaul Mundt <lethal@linux-sh.org>2011-03-22 02:47:15 -0400
commit9c96394bb90f855d265116f37897294fa1bdb072 (patch)
tree32be68190d978f04b075a8036836edd9294b82b1
parent1d28fcadb0e277844ebffb528cdfd25d44591035 (diff)
svga: Make svga_set_textmode_vga_regs() take an iomem regbase pointer.
Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--drivers/video/arkfb.c2
-rw-r--r--drivers/video/s3fb.c2
-rw-r--r--drivers/video/svgalib.c40
-rw-r--r--drivers/video/vt8623fb.c2
-rw-r--r--include/linux/svga.h2
5 files changed, 24 insertions, 24 deletions
diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c
index 51fd8affe0c7..658fff45332c 100644
--- a/drivers/video/arkfb.c
+++ b/drivers/video/arkfb.c
@@ -699,7 +699,7 @@ static int arkfb_set_par(struct fb_info *info)
699 switch (mode) { 699 switch (mode) {
700 case 0: 700 case 0:
701 pr_debug("fb%d: text mode\n", info->node); 701 pr_debug("fb%d: text mode\n", info->node);
702 svga_set_textmode_vga_regs(); 702 svga_set_textmode_vga_regs(par->state.vgabase);
703 703
704 vga_wseq(NULL, 0x11, 0x10); /* basic VGA mode */ 704 vga_wseq(NULL, 0x11, 0x10); /* basic VGA mode */
705 svga_wcrt_mask(par->state.vgabase, 0x46, 0x00, 0x04); /* 8bit pixel path */ 705 svga_wcrt_mask(par->state.vgabase, 0x46, 0x00, 0x04); /* 8bit pixel path */
diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index a7a2463663c4..017219565800 100644
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -604,7 +604,7 @@ static int s3fb_set_par(struct fb_info *info)
604 switch (mode) { 604 switch (mode) {
605 case 0: 605 case 0:
606 pr_debug("fb%d: text mode\n", info->node); 606 pr_debug("fb%d: text mode\n", info->node);
607 svga_set_textmode_vga_regs(); 607 svga_set_textmode_vga_regs(par->state.vgabase);
608 608
609 /* Set additional registers like in 8-bit mode */ 609 /* Set additional registers like in 8-bit mode */
610 svga_wcrt_mask(par->state.vgabase, 0x50, 0x00, 0x30); 610 svga_wcrt_mask(par->state.vgabase, 0x50, 0x00, 0x30);
diff --git a/drivers/video/svgalib.c b/drivers/video/svgalib.c
index b0464977ed9b..ecda90ec4056 100644
--- a/drivers/video/svgalib.c
+++ b/drivers/video/svgalib.c
@@ -137,33 +137,33 @@ void svga_set_default_crt_regs(void __iomem *regbase)
137 vga_wcrt(regbase, VGA_CRTC_MODE, 0xE3); 137 vga_wcrt(regbase, VGA_CRTC_MODE, 0xE3);
138} 138}
139 139
140void svga_set_textmode_vga_regs(void) 140void svga_set_textmode_vga_regs(void __iomem *regbase)
141{ 141{
142 /* svga_wseq_mask(NULL, 0x1, 0x00, 0x01); */ /* Switch 8/9 pixel per char */ 142 /* svga_wseq_mask(regbase, 0x1, 0x00, 0x01); */ /* Switch 8/9 pixel per char */
143 vga_wseq(NULL, VGA_SEQ_MEMORY_MODE, VGA_SR04_EXT_MEM); 143 vga_wseq(regbase, VGA_SEQ_MEMORY_MODE, VGA_SR04_EXT_MEM);
144 vga_wseq(NULL, VGA_SEQ_PLANE_WRITE, 0x03); 144 vga_wseq(regbase, VGA_SEQ_PLANE_WRITE, 0x03);
145 145
146 vga_wcrt(NULL, VGA_CRTC_MAX_SCAN, 0x0f); /* 0x4f */ 146 vga_wcrt(regbase, VGA_CRTC_MAX_SCAN, 0x0f); /* 0x4f */
147 vga_wcrt(NULL, VGA_CRTC_UNDERLINE, 0x1f); 147 vga_wcrt(regbase, VGA_CRTC_UNDERLINE, 0x1f);
148 svga_wcrt_mask(NULL, VGA_CRTC_MODE, 0x23, 0x7f); 148 svga_wcrt_mask(regbase, VGA_CRTC_MODE, 0x23, 0x7f);
149 149
150 vga_wcrt(NULL, VGA_CRTC_CURSOR_START, 0x0d); 150 vga_wcrt(regbase, VGA_CRTC_CURSOR_START, 0x0d);
151 vga_wcrt(NULL, VGA_CRTC_CURSOR_END, 0x0e); 151 vga_wcrt(regbase, VGA_CRTC_CURSOR_END, 0x0e);
152 vga_wcrt(NULL, VGA_CRTC_CURSOR_HI, 0x00); 152 vga_wcrt(regbase, VGA_CRTC_CURSOR_HI, 0x00);
153 vga_wcrt(NULL, VGA_CRTC_CURSOR_LO, 0x00); 153 vga_wcrt(regbase, VGA_CRTC_CURSOR_LO, 0x00);
154 154
155 vga_wgfx(NULL, VGA_GFX_MODE, 0x10); /* Odd/even memory mode */ 155 vga_wgfx(regbase, VGA_GFX_MODE, 0x10); /* Odd/even memory mode */
156 vga_wgfx(NULL, VGA_GFX_MISC, 0x0E); /* Misc graphics register - text mode enable */ 156 vga_wgfx(regbase, VGA_GFX_MISC, 0x0E); /* Misc graphics register - text mode enable */
157 vga_wgfx(NULL, VGA_GFX_COMPARE_MASK, 0x00); 157 vga_wgfx(regbase, VGA_GFX_COMPARE_MASK, 0x00);
158 158
159 vga_r(NULL, 0x3DA); 159 vga_r(regbase, 0x3DA);
160 vga_w(NULL, VGA_ATT_W, 0x00); 160 vga_w(regbase, VGA_ATT_W, 0x00);
161 161
162 svga_wattr(NULL, 0x10, 0x0C); /* Attribute Mode Control Register - text mode, blinking and line graphics */ 162 svga_wattr(regbase, 0x10, 0x0C); /* Attribute Mode Control Register - text mode, blinking and line graphics */
163 svga_wattr(NULL, 0x13, 0x08); /* Horizontal Pixel Panning Register */ 163 svga_wattr(regbase, 0x13, 0x08); /* Horizontal Pixel Panning Register */
164 164
165 vga_r(NULL, 0x3DA); 165 vga_r(regbase, 0x3DA);
166 vga_w(NULL, VGA_ATT_W, 0x20); 166 vga_w(regbase, VGA_ATT_W, 0x20);
167} 167}
168 168
169#if 0 169#if 0
diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
index a2624a841ecc..e3bb7c5b1bd5 100644
--- a/drivers/video/vt8623fb.c
+++ b/drivers/video/vt8623fb.c
@@ -466,7 +466,7 @@ static int vt8623fb_set_par(struct fb_info *info)
466 switch (mode) { 466 switch (mode) {
467 case 0: 467 case 0:
468 pr_debug("fb%d: text mode\n", info->node); 468 pr_debug("fb%d: text mode\n", info->node);
469 svga_set_textmode_vga_regs(); 469 svga_set_textmode_vga_regs(par->state.vgabase);
470 svga_wseq_mask(par->state.vgabase, 0x15, 0x00, 0xFE); 470 svga_wseq_mask(par->state.vgabase, 0x15, 0x00, 0xFE);
471 svga_wcrt_mask(par->state.vgabase, 0x11, 0x60, 0x70); 471 svga_wcrt_mask(par->state.vgabase, 0x11, 0x60, 0x70);
472 break; 472 break;
diff --git a/include/linux/svga.h b/include/linux/svga.h
index 2a32dd55d1a0..767937d362d1 100644
--- a/include/linux/svga.h
+++ b/include/linux/svga.h
@@ -103,7 +103,7 @@ void svga_set_default_gfx_regs(void __iomem *regbase);
103void svga_set_default_atc_regs(void __iomem *regbase); 103void svga_set_default_atc_regs(void __iomem *regbase);
104void svga_set_default_seq_regs(void __iomem *regbase); 104void svga_set_default_seq_regs(void __iomem *regbase);
105void svga_set_default_crt_regs(void __iomem *regbase); 105void svga_set_default_crt_regs(void __iomem *regbase);
106void svga_set_textmode_vga_regs(void); 106void svga_set_textmode_vga_regs(void __iomem *regbase);
107 107
108void svga_settile(struct fb_info *info, struct fb_tilemap *map); 108void svga_settile(struct fb_info *info, struct fb_tilemap *map);
109void svga_tilecopy(struct fb_info *info, struct fb_tilearea *area); 109void svga_tilecopy(struct fb_info *info, struct fb_tilearea *area);