leo: use standard fields for framebuffer physical address and length
Use standard fields fbinfo.fix.smem_start and fbinfo.fix.smem_len for physical address and length of framebuffer. This also fixes output of the 'fbset -i' command - address and length of the framebuffer are displayed correctly. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
963b916c1c
commit
8803f7afe6
|
@ -191,9 +191,7 @@ struct leo_par {
|
|||
u32 flags;
|
||||
#define LEO_FLAG_BLANKED 0x00000001
|
||||
|
||||
unsigned long physbase;
|
||||
unsigned long which_io;
|
||||
unsigned long fbsize;
|
||||
};
|
||||
|
||||
static void leo_wait(struct leo_lx_krn __iomem *lx_krn)
|
||||
|
@ -420,16 +418,14 @@ static int leo_mmap(struct fb_info *info, struct vm_area_struct *vma)
|
|||
struct leo_par *par = (struct leo_par *)info->par;
|
||||
|
||||
return sbusfb_mmap_helper(leo_mmap_map,
|
||||
par->physbase, par->fbsize,
|
||||
info->fix.smem_start, info->fix.smem_len,
|
||||
par->which_io, vma);
|
||||
}
|
||||
|
||||
static int leo_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
|
||||
{
|
||||
struct leo_par *par = (struct leo_par *) info->par;
|
||||
|
||||
return sbusfb_ioctl_helper(cmd, arg, info,
|
||||
FBTYPE_SUNLEO, 32, par->fbsize);
|
||||
FBTYPE_SUNLEO, 32, info->fix.smem_len);
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -569,7 +565,7 @@ static int __devinit leo_probe(struct of_device *op,
|
|||
|
||||
spin_lock_init(&par->lock);
|
||||
|
||||
par->physbase = op->resource[0].start;
|
||||
info->fix.smem_start = op->resource[0].start;
|
||||
par->which_io = op->resource[0].flags & IORESOURCE_BITS;
|
||||
|
||||
sbusfb_fill_var(&info->var, dp, 32);
|
||||
|
@ -577,7 +573,7 @@ static int __devinit leo_probe(struct of_device *op,
|
|||
|
||||
linebytes = of_getintprop_default(dp, "linebytes",
|
||||
info->var.xres);
|
||||
par->fbsize = PAGE_ALIGN(linebytes * info->var.yres);
|
||||
info->fix.smem_len = PAGE_ALIGN(linebytes * info->var.yres);
|
||||
|
||||
par->lc_ss0_usr =
|
||||
of_ioremap(&op->resource[0], LEO_OFF_LC_SS0_USR,
|
||||
|
@ -627,7 +623,7 @@ static int __devinit leo_probe(struct of_device *op,
|
|||
|
||||
printk(KERN_INFO "%s: leo at %lx:%lx\n",
|
||||
dp->full_name,
|
||||
par->which_io, par->physbase);
|
||||
par->which_io, info->fix.smem_start);
|
||||
|
||||
return 0;
|
||||
|
||||
|
|
Loading…
Reference in New Issue