summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorDavid Miller <davem@davemloft.net>2011-01-12 02:50:36 +0300
committerPaul Mundt <lethal@linux-sh.org>2011-03-22 09:46:56 +0300
commitf51a14dded14457e45b1f026a6af5ca6a51e4502 (patch)
treeb381cd69fcd34cd0ef7d71baf2e2bc96ff00bbc7 /drivers
parente2fade2c146ec718796049104b45267ddbfdf7a1 (diff)
downloadlinux-f51a14dded14457e45b1f026a6af5ca6a51e4502.tar.xz
svga: Make svga_set_default_atc_regs take an iomem regbase pointer.
Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/arkfb.c2
-rw-r--r--drivers/video/s3fb.c2
-rw-r--r--drivers/video/svgalib.c24
-rw-r--r--drivers/video/vt8623fb.c2
4 files changed, 15 insertions, 15 deletions
diff --git a/drivers/video/arkfb.c b/drivers/video/arkfb.c
index e09694f58c2c..1028e329c46b 100644
--- a/drivers/video/arkfb.c
+++ b/drivers/video/arkfb.c
@@ -654,7 +654,7 @@ static int arkfb_set_par(struct fb_info *info)
/* Set default values */
svga_set_default_gfx_regs(par->state.vgabase);
- svga_set_default_atc_regs();
+ svga_set_default_atc_regs(par->state.vgabase);
svga_set_default_seq_regs();
svga_set_default_crt_regs();
svga_wcrt_multi(par->state.vgabase, ark_line_compare_regs, 0xFFFFFFFF);
diff --git a/drivers/video/s3fb.c b/drivers/video/s3fb.c
index 7e34e5a163c4..7073cf904ccd 100644
--- a/drivers/video/s3fb.c
+++ b/drivers/video/s3fb.c
@@ -515,7 +515,7 @@ static int s3fb_set_par(struct fb_info *info)
/* Set default values */
svga_set_default_gfx_regs(par->state.vgabase);
- svga_set_default_atc_regs();
+ svga_set_default_atc_regs(par->state.vgabase);
svga_set_default_seq_regs();
svga_set_default_crt_regs();
svga_wcrt_multi(par->state.vgabase, s3_line_compare_regs, 0xFFFFFFFF);
diff --git a/drivers/video/svgalib.c b/drivers/video/svgalib.c
index 25f9f87f73dd..8b97359db502 100644
--- a/drivers/video/svgalib.c
+++ b/drivers/video/svgalib.c
@@ -93,26 +93,26 @@ void svga_set_default_gfx_regs(void __iomem *regbase)
}
/* Set attribute controller registers to sane values */
-void svga_set_default_atc_regs(void)
+void svga_set_default_atc_regs(void __iomem *regbase)
{
u8 count;
- vga_r(NULL, 0x3DA);
- vga_w(NULL, VGA_ATT_W, 0x00);
+ vga_r(regbase, 0x3DA);
+ vga_w(regbase, VGA_ATT_W, 0x00);
/* All standard ATC registers (AR00 - AR14) */
for (count = 0; count <= 0xF; count ++)
- svga_wattr(NULL, count, count);
+ svga_wattr(regbase, count, count);
- svga_wattr(NULL, VGA_ATC_MODE, 0x01);
-/* svga_wattr(NULL, VGA_ATC_MODE, 0x41); */
- svga_wattr(NULL, VGA_ATC_OVERSCAN, 0x00);
- svga_wattr(NULL, VGA_ATC_PLANE_ENABLE, 0x0F);
- svga_wattr(NULL, VGA_ATC_PEL, 0x00);
- svga_wattr(NULL, VGA_ATC_COLOR_PAGE, 0x00);
+ svga_wattr(regbase, VGA_ATC_MODE, 0x01);
+/* svga_wattr(regbase, VGA_ATC_MODE, 0x41); */
+ svga_wattr(regbase, VGA_ATC_OVERSCAN, 0x00);
+ svga_wattr(regbase, VGA_ATC_PLANE_ENABLE, 0x0F);
+ svga_wattr(regbase, VGA_ATC_PEL, 0x00);
+ svga_wattr(regbase, VGA_ATC_COLOR_PAGE, 0x00);
- vga_r(NULL, 0x3DA);
- vga_w(NULL, VGA_ATT_W, 0x20);
+ vga_r(regbase, 0x3DA);
+ vga_w(regbase, VGA_ATT_W, 0x20);
}
/* Set sequencer registers to sane values */
diff --git a/drivers/video/vt8623fb.c b/drivers/video/vt8623fb.c
index ccb4a3e78fda..310af2dc43cd 100644
--- a/drivers/video/vt8623fb.c
+++ b/drivers/video/vt8623fb.c
@@ -426,7 +426,7 @@ static int vt8623fb_set_par(struct fb_info *info)
/* Set default values */
svga_set_default_gfx_regs(par->state.vgabase);
- svga_set_default_atc_regs();
+ svga_set_default_atc_regs(par->state.vgabase);
svga_set_default_seq_regs();
svga_set_default_crt_regs();
svga_wcrt_multi(par->state.vgabase, vt8623_line_compare_regs, 0xFFFFFFFF);