Commit 77375e79 authored by Andrew Morton's avatar Andrew Morton Committed by Linus Torvalds

[PATCH] m68k: Amiga Framemaster II fb sysfsification

From: Geert Uytterhoeven <geert@linux-m68k.org>

Amiga Framemaster II fb: Add sysfs support (from James Simmons)
parent c138cf43
......@@ -127,12 +127,7 @@
static volatile unsigned char *fm2fb_reg;
#define arraysize(x) (sizeof(x)/sizeof(*(x)))
static struct fb_info fb_info;
static u32 pseudo_palette[17];
static struct fb_fix_screeninfo fb_fix __initdata = {
static struct fb_fix_screeninfo fb_fix __devinitdata = {
.smem_len = FRAMEMASTER_REG,
.type = FB_TYPE_PACKED_PIXELS,
.visual = FB_VISUAL_TRUECOLOR,
......@@ -141,12 +136,12 @@ static struct fb_fix_screeninfo fb_fix __initdata = {
.accel = FB_ACCEL_NONE,
};
static int fm2fb_mode __initdata = -1;
static int fm2fb_mode __devinitdata = -1;
#define FM2FB_MODE_PAL 0
#define FM2FB_MODE_NTSC 1
static struct fb_var_screeninfo fb_var_modes[] __initdata = {
static struct fb_var_screeninfo fb_var_modes[] __devinitdata = {
{
/* 768 x 576, 32 bpp (PAL) */
768, 576, 768, 576, 0, 0, 32, 0,
......@@ -165,7 +160,6 @@ static struct fb_var_screeninfo fb_var_modes[] __initdata = {
/*
* Interface used by the world
*/
int fm2fb_init(void);
static int fm2fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
u_int transp, struct fb_info *info);
......@@ -202,7 +196,7 @@ static int fm2fb_blank(int blank, struct fb_info *info)
static int fm2fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
u_int transp, struct fb_info *info)
{
if (regno > 15)
if (regno > info->cmap.len)
return 1;
red >>= 8;
green >>= 8;
......@@ -216,29 +210,51 @@ static int fm2fb_setcolreg(u_int regno, u_int red, u_int green, u_int blue,
* Initialisation
*/
int __init fm2fb_init(void)
static int __devinit fm2fb_probe(struct zorro_dev *z,
const struct zorro_device_id *id);
static struct zorro_device_id fm2fb_devices[] __devinitdata = {
{ ZORRO_PROD_BSC_FRAMEMASTER_II },
{ ZORRO_PROD_HELFRICH_RAINBOW_II },
{ 0 }
};
static struct zorro_driver fm2fb_driver = {
.name = "fm2fb",
.id_table = fm2fb_devices,
.probe = fm2fb_probe,
};
static int __devinit fm2fb_probe(struct zorro_dev *z,
const struct zorro_device_id *id)
{
struct zorro_dev *z = NULL;
struct fb_info *info;
unsigned long *ptr;
int is_fm;
int x, y;
while ((z = zorro_find_device(ZORRO_WILDCARD, z))) {
if (z->id == ZORRO_PROD_BSC_FRAMEMASTER_II)
is_fm = 1;
else if (z->id == ZORRO_PROD_HELFRICH_RAINBOW_II)
is_fm = 0;
else
continue;
is_fm = z->id == ZORRO_PROD_BSC_FRAMEMASTER_II;
if (!zorro_request_device(z,"fm2fb"))
return -ENXIO;
if (!request_mem_region(z->resource.start, FRAMEMASTER_SIZE, "fm2fb"))
continue;
info = framebuffer_alloc(256 * sizeof(u32), &z->dev);
if (!info) {
zorro_release_device(z);
return -ENOMEM;
}
if (fb_alloc_cmap(&info->cmap, 256, 0) < 0) {
framebuffer_release(info);
zorro_release_device(z);
return -ENOMEM;
}
/* assigning memory to kernel space */
fb_fix.smem_start = z->resource.start;
fb_info.screen_base = ioremap(fb_fix.smem_start, FRAMEMASTER_SIZE);
fb_fix.smem_start = zorro_resource_start(z);
info->screen_base = ioremap(fb_fix.smem_start, FRAMEMASTER_SIZE);
fb_fix.mmio_start = fb_fix.smem_start + FRAMEMASTER_REG;
fm2fb_reg = (unsigned char *)(fb_info.screen_base+FRAMEMASTER_REG);
fm2fb_reg = (unsigned char *)(info->screen_base+FRAMEMASTER_REG);
strcpy(fb_fix.id, is_fm ? "FrameMaster II" : "Rainbow II");
......@@ -254,28 +270,31 @@ int __init fm2fb_init(void)
for (x = 0; x < 96; x++) *ptr++ = 0x0000ff;/* blue */
for (x = 0; x < 96; x++) *ptr++ = 0x000000;/* black */
}
fm2fb_blank(0, NULL);
fm2fb_blank(0, info);
if (fm2fb_mode == -1)
fm2fb_mode = FM2FB_MODE_PAL;
fb_info.fbops = &fm2fb_ops;
fb_info.var = fb_var_modes[fm2fb_mode];
fb_info.screen_base = (char *)fb_fix.smem_start;
fb_info.pseudo_palette = pseudo_palette;
fb_info.fix = fb_fix;
fb_info.flags = FBINFO_FLAG_DEFAULT;
/* The below fields will go away !!!! */
fb_alloc_cmap(&fb_info.cmap, 16, 0);
if (register_framebuffer(&fb_info) < 0)
info->fbops = &fm2fb_ops;
info->var = fb_var_modes[fm2fb_mode];
info->pseudo_palette = info->par;
info->par = NULL;
info->fix = fb_fix;
info->flags = FBINFO_FLAG_DEFAULT;
if (register_framebuffer(info) < 0) {
fb_dealloc_cmap(&info->cmap);
framebuffer_release(info);
zorro_release_device(z);
return -EINVAL;
printk("fb%d: %s frame buffer device\n", fb_info.node, fb_fix.id);
return 0;
}
return -ENXIO;
printk("fb%d: %s frame buffer device\n", info->node, fb_fix.id);
return 0;
}
int __init fm2fb_init(void)
{
return zorro_register_driver(&fm2fb_driver);
}
int __init fm2fb_setup(char *options)
......
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