git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master' into next
[pandora-kernel.git]
/
drivers
/
video
/
bw2.c
diff --git
a/drivers/video/bw2.c
b/drivers/video/bw2.c
index
1e35ba6
..
b0b147c
100644
(file)
--- a/
drivers/video/bw2.c
+++ b/
drivers/video/bw2.c
@@
-111,9
+111,7
@@
struct bw2_par {
u32 flags;
#define BW2_FLAG_BLANKED 0x00000001
u32 flags;
#define BW2_FLAG_BLANKED 0x00000001
- unsigned long physbase;
unsigned long which_io;
unsigned long which_io;
- unsigned long fbsize;
};
/**
};
/**
@@
-167,17
+165,15
@@
static int bw2_mmap(struct fb_info *info, struct vm_area_struct *vma)
struct bw2_par *par = (struct bw2_par *)info->par;
return sbusfb_mmap_helper(bw2_mmap_map,
struct bw2_par *par = (struct bw2_par *)info->par;
return sbusfb_mmap_helper(bw2_mmap_map,
-
par->physbase, par->fbsize
,
+
info->fix.smem_start, info->fix.smem_len
,
par->which_io,
vma);
}
static int bw2_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
{
par->which_io,
vma);
}
static int bw2_ioctl(struct fb_info *info, unsigned int cmd, unsigned long arg)
{
- struct bw2_par *par = (struct bw2_par *) info->par;
-
return sbusfb_ioctl_helper(cmd, arg, info,
return sbusfb_ioctl_helper(cmd, arg, info,
- FBTYPE_SUN2BW, 1,
par->fbsize
);
+ FBTYPE_SUN2BW, 1,
info->fix.smem_len
);
}
/*
}
/*
@@
-294,7
+290,7
@@
static int __devinit bw2_probe(struct of_device *op, const struct of_device_id *
spin_lock_init(&par->lock);
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, 1);
par->which_io = op->resource[0].flags & IORESOURCE_BITS;
sbusfb_fill_var(&info->var, dp, 1);
@@
-317,13
+313,13
@@
static int __devinit bw2_probe(struct of_device *op, const struct of_device_id *
goto out_unmap_regs;
}
goto out_unmap_regs;
}
-
par->fbsize
= PAGE_ALIGN(linebytes * info->var.yres);
+
info->fix.smem_len
= PAGE_ALIGN(linebytes * info->var.yres);
info->flags = FBINFO_DEFAULT;
info->fbops = &bw2_ops;
info->screen_base = of_ioremap(&op->resource[0], 0,
info->flags = FBINFO_DEFAULT;
info->fbops = &bw2_ops;
info->screen_base = of_ioremap(&op->resource[0], 0,
-
par->fbsize
, "bw2 ram");
+
info->fix.smem_len
, "bw2 ram");
if (!info->screen_base)
goto out_unmap_regs;
if (!info->screen_base)
goto out_unmap_regs;
@@
-338,12
+334,12
@@
static int __devinit bw2_probe(struct of_device *op, const struct of_device_id *
dev_set_drvdata(&op->dev, info);
printk(KERN_INFO "%s: bwtwo at %lx:%lx\n",
dev_set_drvdata(&op->dev, info);
printk(KERN_INFO "%s: bwtwo at %lx:%lx\n",
- dp->full_name, par->which_io,
par->physbase
);
+ dp->full_name, par->which_io,
info->fix.smem_start
);
return 0;
out_unmap_screen:
return 0;
out_unmap_screen:
- of_iounmap(&op->resource[0], info->screen_base,
par->fbsize
);
+ of_iounmap(&op->resource[0], info->screen_base,
info->fix.smem_len
);
out_unmap_regs:
of_iounmap(&op->resource[0], par->regs, sizeof(struct bw2_regs));
out_unmap_regs:
of_iounmap(&op->resource[0], par->regs, sizeof(struct bw2_regs));
@@
-363,7
+359,7
@@
static int __devexit bw2_remove(struct of_device *op)
unregister_framebuffer(info);
of_iounmap(&op->resource[0], par->regs, sizeof(struct bw2_regs));
unregister_framebuffer(info);
of_iounmap(&op->resource[0], par->regs, sizeof(struct bw2_regs));
- of_iounmap(&op->resource[0], info->screen_base,
par->fbsize
);
+ of_iounmap(&op->resource[0], info->screen_base,
info->fix.smem_len
);
framebuffer_release(info);
framebuffer_release(info);