struct cg6_par {
spinlock_t lock;
- struct bt_regs __iomem *bt;
- struct cg6_fbc __iomem *fbc;
- struct cg6_thc __iomem *thc;
- struct cg6_tec __iomem *tec;
- volatile u32 __iomem *fhc;
+ struct bt_regs *bt;
+ struct cg6_fbc *fbc;
+ struct cg6_thc *thc;
+ struct cg6_tec *tec;
+ volatile u32 *fhc;
u32 flags;
#define CG6_FLAG_BLANKED 0x00000001
static int cg6_sync(struct fb_info *info)
{
struct cg6_par *par = (struct cg6_par *) info->par;
- struct cg6_fbc __iomem *fbc = par->fbc;
+ struct cg6_fbc *fbc = par->fbc;
int limit = 10000;
do {
static void cg6_fillrect(struct fb_info *info, const struct fb_fillrect *rect)
{
struct cg6_par *par = (struct cg6_par *) info->par;
- struct cg6_fbc __iomem *fbc = par->fbc;
+ struct cg6_fbc *fbc = par->fbc;
unsigned long flags;
s32 val;
static void cg6_imageblit(struct fb_info *info, const struct fb_image *image)
{
struct cg6_par *par = (struct cg6_par *) info->par;
- struct cg6_fbc __iomem *fbc = par->fbc;
+ struct cg6_fbc *fbc = par->fbc;
const u8 *data = image->data;
unsigned long flags;
u32 x, y;
unsigned transp, struct fb_info *info)
{
struct cg6_par *par = (struct cg6_par *) info->par;
- struct bt_regs __iomem *bt = par->bt;
+ struct bt_regs *bt = par->bt;
unsigned long flags;
if (regno >= 256)
cg6_blank(int blank, struct fb_info *info)
{
struct cg6_par *par = (struct cg6_par *) info->par;
- struct cg6_thc __iomem *thc = par->thc;
+ struct cg6_thc *thc = par->thc;
unsigned long flags;
u32 val;
spin_lock_irqsave(&par->lock, flags);
switch (blank) {
- case FB_BLANK_UNBLANK: /* Unblanking */
+ case 0: /* Unblanking */
val = sbus_readl(&thc->thc_misc);
val |= CG6_THC_MISC_VIDEO;
sbus_writel(val, &thc->thc_misc);
par->flags &= ~CG6_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 */
+ case 1: /* Normal blanking */
+ case 2: /* VESA blank (vsync off) */
+ case 3: /* VESA blank (hsync off) */
+ case 4: /* Poweroff */
val = sbus_readl(&thc->thc_misc);
val &= ~CG6_THC_MISC_VIDEO;
sbus_writel(val, &thc->thc_misc);
/* Initialize Brooktree DAC */
static void cg6_bt_init(struct cg6_par *par)
{
- struct bt_regs __iomem *bt = par->bt;
+ struct bt_regs *bt = par->bt;
sbus_writel(0x04 << 24, &bt->addr); /* color planes */
sbus_writel(0xff << 24, &bt->control);
static void cg6_chip_init(struct fb_info *info)
{
struct cg6_par *par = (struct cg6_par *) info->par;
- struct cg6_tec __iomem *tec = par->tec;
- struct cg6_fbc __iomem *fbc = par->fbc;
+ struct cg6_tec *tec = par->tec;
+ struct cg6_fbc *fbc = par->fbc;
u32 rev, conf, mode, tmp;
int i;
if (prom_getbool(sdev->prom_node, "dblbuf"))
all->par.fbsize *= 4;
- all->par.fbc = sbus_ioremap(&sdev->resource[0], CG6_FBC_OFFSET,
+ all->par.fbc = (struct cg6_fbc *)
+ sbus_ioremap(&sdev->resource[0], CG6_FBC_OFFSET,
4096, "cgsix fbc");
- all->par.tec = sbus_ioremap(&sdev->resource[0], CG6_TEC_OFFSET,
+ all->par.tec = (struct cg6_tec *)
+ sbus_ioremap(&sdev->resource[0], CG6_TEC_OFFSET,
sizeof(struct cg6_tec), "cgsix tec");
- all->par.thc = sbus_ioremap(&sdev->resource[0], CG6_THC_OFFSET,
+ all->par.thc = (struct cg6_thc *)
+ sbus_ioremap(&sdev->resource[0], CG6_THC_OFFSET,
sizeof(struct cg6_thc), "cgsix thc");
- all->par.bt = sbus_ioremap(&sdev->resource[0], CG6_BROOKTREE_OFFSET,
+ all->par.bt = (struct bt_regs *)
+ sbus_ioremap(&sdev->resource[0], CG6_BROOKTREE_OFFSET,
sizeof(struct bt_regs), "cgsix dac");
- all->par.fhc = sbus_ioremap(&sdev->resource[0], CG6_FHC_OFFSET,
+ all->par.fhc = (u32 *)
+ sbus_ioremap(&sdev->resource[0], CG6_FHC_OFFSET,
sizeof(u32), "cgsix fhc");
all->info.flags = FBINFO_DEFAULT | FBINFO_HWACCEL_IMAGEBLIT |
FBINFO_HWACCEL_COPYAREA | FBINFO_HWACCEL_FILLRECT;
all->info.fbops = &cg6_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], CG6_RAM_OFFSET,
all->par.fbsize, "cgsix ram");
+ all->info.currcon = -1;
all->info.par = &all->par;
all->info.var.accel_flags = FB_ACCELF_TEXT;