Commit a4ade839 authored by David Miller's avatar David Miller Committed by Paul Mundt

svga: Make svga_set_default_seq_regs take an iomem regbase pointer.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent f51a14dd
...@@ -655,7 +655,7 @@ static int arkfb_set_par(struct fb_info *info) ...@@ -655,7 +655,7 @@ static int arkfb_set_par(struct fb_info *info)
/* Set default values */ /* Set default values */
svga_set_default_gfx_regs(par->state.vgabase); svga_set_default_gfx_regs(par->state.vgabase);
svga_set_default_atc_regs(par->state.vgabase); svga_set_default_atc_regs(par->state.vgabase);
svga_set_default_seq_regs(); svga_set_default_seq_regs(par->state.vgabase);
svga_set_default_crt_regs(); svga_set_default_crt_regs();
svga_wcrt_multi(par->state.vgabase, ark_line_compare_regs, 0xFFFFFFFF); svga_wcrt_multi(par->state.vgabase, ark_line_compare_regs, 0xFFFFFFFF);
svga_wcrt_multi(par->state.vgabase, ark_start_address_regs, 0); svga_wcrt_multi(par->state.vgabase, ark_start_address_regs, 0);
......
...@@ -516,7 +516,7 @@ static int s3fb_set_par(struct fb_info *info) ...@@ -516,7 +516,7 @@ static int s3fb_set_par(struct fb_info *info)
/* Set default values */ /* Set default values */
svga_set_default_gfx_regs(par->state.vgabase); svga_set_default_gfx_regs(par->state.vgabase);
svga_set_default_atc_regs(par->state.vgabase); svga_set_default_atc_regs(par->state.vgabase);
svga_set_default_seq_regs(); svga_set_default_seq_regs(par->state.vgabase);
svga_set_default_crt_regs(); svga_set_default_crt_regs();
svga_wcrt_multi(par->state.vgabase, s3_line_compare_regs, 0xFFFFFFFF); svga_wcrt_multi(par->state.vgabase, s3_line_compare_regs, 0xFFFFFFFF);
svga_wcrt_multi(par->state.vgabase, s3_start_address_regs, 0); svga_wcrt_multi(par->state.vgabase, s3_start_address_regs, 0);
......
...@@ -116,14 +116,14 @@ void svga_set_default_atc_regs(void __iomem *regbase) ...@@ -116,14 +116,14 @@ void svga_set_default_atc_regs(void __iomem *regbase)
} }
/* Set sequencer registers to sane values */ /* Set sequencer registers to sane values */
void svga_set_default_seq_regs(void) void svga_set_default_seq_regs(void __iomem *regbase)
{ {
/* Standard sequencer registers (SR01 - SR04), SR00 is not set */ /* Standard sequencer registers (SR01 - SR04), SR00 is not set */
vga_wseq(NULL, VGA_SEQ_CLOCK_MODE, VGA_SR01_CHAR_CLK_8DOTS); vga_wseq(regbase, VGA_SEQ_CLOCK_MODE, VGA_SR01_CHAR_CLK_8DOTS);
vga_wseq(NULL, VGA_SEQ_PLANE_WRITE, VGA_SR02_ALL_PLANES); vga_wseq(regbase, VGA_SEQ_PLANE_WRITE, VGA_SR02_ALL_PLANES);
vga_wseq(NULL, VGA_SEQ_CHARACTER_MAP, 0x00); vga_wseq(regbase, VGA_SEQ_CHARACTER_MAP, 0x00);
/* vga_wseq(NULL, VGA_SEQ_MEMORY_MODE, VGA_SR04_EXT_MEM | VGA_SR04_SEQ_MODE | VGA_SR04_CHN_4M); */ /* vga_wseq(regbase, VGA_SEQ_MEMORY_MODE, VGA_SR04_EXT_MEM | VGA_SR04_SEQ_MODE | VGA_SR04_CHN_4M); */
vga_wseq(NULL, VGA_SEQ_MEMORY_MODE, VGA_SR04_EXT_MEM | VGA_SR04_SEQ_MODE); vga_wseq(regbase, VGA_SEQ_MEMORY_MODE, VGA_SR04_EXT_MEM | VGA_SR04_SEQ_MODE);
} }
/* Set CRTC registers to sane values */ /* Set CRTC registers to sane values */
......
...@@ -427,7 +427,7 @@ static int vt8623fb_set_par(struct fb_info *info) ...@@ -427,7 +427,7 @@ static int vt8623fb_set_par(struct fb_info *info)
/* Set default values */ /* Set default values */
svga_set_default_gfx_regs(par->state.vgabase); svga_set_default_gfx_regs(par->state.vgabase);
svga_set_default_atc_regs(par->state.vgabase); svga_set_default_atc_regs(par->state.vgabase);
svga_set_default_seq_regs(); svga_set_default_seq_regs(par->state.vgabase);
svga_set_default_crt_regs(); svga_set_default_crt_regs();
svga_wcrt_multi(par->state.vgabase, vt8623_line_compare_regs, 0xFFFFFFFF); svga_wcrt_multi(par->state.vgabase, vt8623_line_compare_regs, 0xFFFFFFFF);
svga_wcrt_multi(par->state.vgabase, vt8623_start_address_regs, 0); svga_wcrt_multi(par->state.vgabase, vt8623_start_address_regs, 0);
......
...@@ -101,7 +101,7 @@ void svga_wseq_multi(void __iomem *regbase, const struct vga_regset *regset, u32 ...@@ -101,7 +101,7 @@ void svga_wseq_multi(void __iomem *regbase, const struct vga_regset *regset, u32
void svga_set_default_gfx_regs(void __iomem *regbase); void svga_set_default_gfx_regs(void __iomem *regbase);
void svga_set_default_atc_regs(void __iomem *regbase); void svga_set_default_atc_regs(void __iomem *regbase);
void svga_set_default_seq_regs(void); void svga_set_default_seq_regs(void __iomem *regbase);
void svga_set_default_crt_regs(void); void svga_set_default_crt_regs(void);
void svga_set_textmode_vga_regs(void); void svga_set_textmode_vga_regs(void);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment