Commit 6cd5a86b authored by Robert Reif's avatar Robert Reif Committed by David S. Miller
Browse files

sparc video: remove open boot prom code 



Replace remaining open boot prom code with of.

Boot tested on sparc32 and compile tested on sparc64.

Signed-off-by: default avatarRobert Reif <reif@earthlink.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dc5dc7e6

drivers/video/bw2.c

+2 −4
Original line number Diff line number Diff line
@@ -17,11 +17,9 @@ 
#include <linux/init.h>

#include <linux/fb.h>

#include <linux/mm.h>

#include <linux/of_device.h>



#include <asm/io.h>

#include <asm/oplib.h>

#include <asm/prom.h>

#include <asm/of_device.h>

#include <asm/fbio.h>



#include "sbuslib.h"
@@ -299,7 +297,7 @@ static int __devinit bw2_probe(struct of_device *op, const struct of_device_id * 
	par->physbase = op->resource[0].start;

	par->which_io = op->resource[0].flags & IORESOURCE_BITS;



	sbusfb_fill_var(&info->var, dp->node, 1);

	sbusfb_fill_var(&info->var, dp, 1);

	linebytes = of_getintprop_default(dp, "linebytes",

					  info->var.xres);

drivers/video/cg14.c

+2 −3
Original line number Diff line number Diff line
@@ -17,10 +17,9 @@ 
#include <linux/fb.h>

#include <linux/mm.h>

#include <linux/uaccess.h>

#include <linux/of_device.h>



#include <asm/io.h>

#include <asm/prom.h>

#include <asm/of_device.h>

#include <asm/fbio.h>



#include "sbuslib.h"
@@ -482,7 +481,7 @@ static int __devinit cg14_probe(struct of_device *op, const struct of_device_id 


	spin_lock_init(&par->lock);



	sbusfb_fill_var(&info->var, dp->node, 8);

	sbusfb_fill_var(&info->var, dp, 8);

	info->var.red.length = 8;

	info->var.green.length = 8;

	info->var.blue.length = 8;

drivers/video/cg3.c

+2 −4
Original line number Diff line number Diff line
@@ -17,11 +17,9 @@ 
#include <linux/init.h>

#include <linux/fb.h>

#include <linux/mm.h>

#include <linux/of_device.h>



#include <asm/io.h>

#include <asm/oplib.h>

#include <asm/prom.h>

#include <asm/of_device.h>

#include <asm/fbio.h>



#include "sbuslib.h"
@@ -373,7 +371,7 @@ static int __devinit cg3_probe(struct of_device *op, 
	par->physbase = op->resource[0].start;

	par->which_io = op->resource[0].flags & IORESOURCE_BITS;



	sbusfb_fill_var(&info->var, dp->node, 8);

	sbusfb_fill_var(&info->var, dp, 8);

	info->var.red.length = 8;

	info->var.green.length = 8;

	info->var.blue.length = 8;

drivers/video/cg6.c

+2 −2
Original line number Diff line number Diff line
@@ -17,9 +17,9 @@ 
#include <linux/init.h>

#include <linux/fb.h>

#include <linux/mm.h>

#include <linux/of_device.h>



#include <asm/io.h>

#include <asm/of_device.h>

#include <asm/fbio.h>



#include "sbuslib.h"
@@ -728,7 +728,7 @@ static int __devinit cg6_probe(struct of_device *op, 
	par->physbase = op->resource[0].start;

	par->which_io = op->resource[0].flags & IORESOURCE_BITS;



	sbusfb_fill_var(&info->var, dp->node, 8);

	sbusfb_fill_var(&info->var, dp, 8);

	info->var.red.length = 8;

	info->var.green.length = 8;

	info->var.blue.length = 8;

drivers/video/ffb.c

+2 −3
Original line number Diff line number Diff line
@@ -16,11 +16,10 @@ 
#include <linux/fb.h>

#include <linux/mm.h>

#include <linux/timer.h>

#include <linux/of_device.h>



#include <asm/io.h>

#include <asm/upa.h>

#include <asm/prom.h>

#include <asm/of_device.h>

#include <asm/fbio.h>



#include "sbuslib.h"
@@ -941,7 +940,7 @@ static int __devinit ffb_probe(struct of_device *op, 
	info->screen_base = (char *) par->physbase + FFB_DFB24_POFF;

	info->pseudo_palette = par->pseudo_palette;



	sbusfb_fill_var(&info->var, dp->node, 32);

	sbusfb_fill_var(&info->var, dp, 32);

	par->fbsize = PAGE_ALIGN(info->var.xres * info->var.yres * 4);

	ffb_fixup_var_rgb(&info->var);