This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / drivers / video / cg3.c

diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c
index bd97a84..0783941 100644 (file)
--- a/drivers/video/cg3.c
+++ b/drivers/video/cg3.c
@@ -111,7 +111,7 @@ struct cg3_regs {
 
 struct cg3_par {
        spinlock_t              lock;
-       struct cg3_regs         __iomem *regs;
+       struct cg3_regs         *regs;
        u32                     sw_cmap[((256 * 3) + 3) / 4];
 
        u32                     flags;
@@ -144,7 +144,7 @@ static int cg3_setcolreg(unsigned regno,
                         unsigned transp, struct fb_info *info)
 {
        struct cg3_par *par = (struct cg3_par *) info->par;
-       struct bt_regs __iomem *bt = &par->regs->cmap;
+       struct bt_regs *bt = &par->regs->cmap;
        unsigned long flags;
        u32 *p32;
        u8 *p8;
@@ -190,27 +190,27 @@ static int
 cg3_blank(int blank, struct fb_info *info)
 {
        struct cg3_par *par = (struct cg3_par *) info->par;
-       struct cg3_regs __iomem *regs = par->regs;
+       struct cg3_regs *regs = par->regs;
        unsigned long flags;
        u8 val;
 
        spin_lock_irqsave(&par->lock, flags);
 
        switch (blank) {
-       case FB_BLANK_UNBLANK: /* Unblanking */
-               val = sbus_readb(&regs->control);
+       case 0: /* Unblanking */
+               val = sbus_readl(&regs->control);
                val |= CG3_CR_ENABLE_VIDEO;
-               sbus_writeb(val, &regs->control);
+               sbus_writel(val, &regs->control);
                par->flags &= ~CG3_FLAG_BLANKED;
                break;
 
-       case FB_BLANK_NORMAL: /* Normal blanking */
-       case FB_BLANK_VSYNC_SUSPEND: /* VESA blank (vsync off) */
-       case FB_BLANK_HSYNC_SUSPEND: /* VESA blank (hsync off) */
-       case FB_BLANK_POWERDOWN: /* Poweroff */
-               val = sbus_readb(&regs->control);
+       case 1: /* Normal blanking */
+       case 2: /* VESA blank (vsync off) */
+       case 3: /* VESA blank (hsync off) */
+       case 4: /* Poweroff */
+               val = sbus_readl(&regs->control);
                val |= CG3_CR_ENABLE_VIDEO;
-               sbus_writeb(val, &regs->control);
+               sbus_writel(val, &regs->control);
                par->flags |= CG3_FLAG_BLANKED;
                break;
        }
@@ -345,15 +345,15 @@ static void cg3_do_default_mode(struct cg3_par *par)
        }
 
        for (p = cg3_regvals[type]; *p; p += 2) {
-               u8 __iomem *regp = &((u8 __iomem *)par->regs)[p[0]];
+               u8 *regp = &((u8 *)par->regs)[p[0]];
                sbus_writeb(p[1], regp);
        }
        for (p = cg3_dacvals; *p; p += 2) {
-               volatile u8 __iomem *regp;
+               volatile u8 *regp;
 
-               regp = (volatile u8 __iomem *)&par->regs->cmap.addr;
+               regp = (volatile u8 *)&par->regs->cmap.addr;
                sbus_writeb(p[0], regp);
-               regp = (volatile u8 __iomem *)&par->regs->cmap.control;
+               regp = (volatile u8 *)&par->regs->cmap.control;
                sbus_writeb(p[1], regp);
        }
 }
@@ -394,19 +394,21 @@ static void cg3_init_one(struct sbus_dev *sdev)
                                       all->info.var.xres);
        all->par.fbsize = PAGE_ALIGN(linebytes * all->info.var.yres);
 
-       all->par.regs = sbus_ioremap(&sdev->resource[0], CG3_REGS_OFFSET,
+       all->par.regs = (struct cg3_regs *)
+               sbus_ioremap(&sdev->resource[0], CG3_REGS_OFFSET,
                             sizeof(struct cg3_regs), "cg3 regs");
 
        all->info.flags = FBINFO_DEFAULT;
        all->info.fbops = &cg3_ops;
 #ifdef CONFIG_SPARC32
-       all->info.screen_base = (char __iomem *)
+       all->info.screen_base = (char *)
                prom_getintdefault(sdev->prom_node, "address", 0);
 #endif
        if (!all->info.screen_base)
-               all->info.screen_base =
+               all->info.screen_base = (char *)
                        sbus_ioremap(&sdev->resource[0], CG3_RAM_OFFSET,
                                     all->par.fbsize, "cg3 ram");
+       all->info.currcon = -1;
        all->info.par = &all->par;
 
        cg3_blank(0, &all->info);