1 files changed, 16 insertions, 16 deletions
diff --git a/drivers/video/macfb.c b/drivers/video/macfb.c
index 3a437f937779..d66887e8cbb1 100644
--- a/drivers/video/macfb.c
+++ b/drivers/video/macfb.c
@@ -77,34 +77,34 @@ static int csc_setpalette (unsigned int regno, unsigned int red,
                           unsigned int green, unsigned int blue,
                           struct fb_info *fb_info);
-static volatile struct {
+static struct {
        unsigned char addr;
        /* Note: word-aligned */
        char pad[3];
        unsigned char lut;
-} *valkyrie_cmap_regs;
+} __iomem *valkyrie_cmap_regs;
-static volatile struct {
+static struct {
        unsigned char addr;
        unsigned char lut;
-} *v8_brazil_cmap_regs;
+} __iomem *v8_brazil_cmap_regs;
-static volatile struct {
+static struct {
        unsigned char addr;
        char pad1[3]; /* word aligned */
        unsigned char lut;
        char pad2[3]; /* word aligned */
        unsigned char cntl; /* a guess as to purpose */
-} *rbv_cmap_regs;
+} __iomem *rbv_cmap_regs;
-static volatile struct {
+static struct {
        unsigned long reset;
        unsigned long pad1[3];
        unsigned char pad2[3];
        unsigned char lut;
-} *dafb_cmap_regs;
+} __iomem *dafb_cmap_regs;
-static volatile struct {
+static struct {
        unsigned char addr;     /* OFFSET: 0x00 */
        unsigned char pad1[15];
        unsigned char lut;      /* OFFSET: 0x10 */
@@ -113,16 +113,16 @@ static volatile struct {
        unsigned char pad3[7];
        unsigned long vbl_addr; /* OFFSET: 0x28 */
        unsigned int  status2;  /* OFFSET: 0x2C */
-} *civic_cmap_regs;
+} __iomem *civic_cmap_regs;
-static volatile struct {
+static struct {
        char    pad1[0x40];
        unsigned char   clut_waddr;     /* 0x40 */
        char    pad2;
        unsigned char   clut_data;      /* 0x42 */
        char    pad3[0x3];
        unsigned char   clut_raddr;     /* 0x46 */
-} *csc_cmap_regs;
+} __iomem *csc_cmap_regs;
 /* We will leave these the way they are for the time being */
 struct mdc_cmap_regs {
@@ -506,10 +506,10 @@ static int csc_setpalette (unsigned int regno, unsigned int red,
                           struct fb_info *info)
 {
        mdelay(1);
-        csc_cmap_regs->clut_waddr = regno;
+        nubus_writeb(regno, &csc_cmap_regs->clut_waddr);
-        csc_cmap_regs->clut_data = red;
+        nubus_writeb(red,   &csc_cmap_regs->clut_data);
-        csc_cmap_regs->clut_data = green;
+        nubus_writeb(green, &csc_cmap_regs->clut_data);
-        csc_cmap_regs->clut_data = blue;
+        nubus_writeb(blue,  &csc_cmap_regs->clut_data);
        return 0;
 }

diff --git a/drivers/video/macfb.c b/drivers/video/macfb.c index 3a437f937779..d66887e8cbb1 100644 --- a/drivers/video/macfb.c +++ b/drivers/video/macfb.c
@@ -77,34 +77,34 @@ static int csc_setpalette (unsigned int regno, unsigned int red,
77	unsigned int green, unsigned int blue,	77	unsigned int green, unsigned int blue,
78	struct fb_info *fb_info);	78	struct fb_info *fb_info);
79		79
80	static volatile struct {	80	static struct {
81	unsigned char addr;	81	unsigned char addr;
82	/* Note: word-aligned */	82	/* Note: word-aligned */
83	char pad[3];	83	char pad[3];
84	unsigned char lut;	84	unsigned char lut;
85	} *valkyrie_cmap_regs;	85	} __iomem *valkyrie_cmap_regs;
86		86
87	static volatile struct {	87	static struct {
88	unsigned char addr;	88	unsigned char addr;
89	unsigned char lut;	89	unsigned char lut;
90	} *v8_brazil_cmap_regs;	90	} __iomem *v8_brazil_cmap_regs;
91		91
92	static volatile struct {	92	static struct {
93	unsigned char addr;	93	unsigned char addr;
94	char pad1[3]; /* word aligned */	94	char pad1[3]; /* word aligned */
95	unsigned char lut;	95	unsigned char lut;
96	char pad2[3]; /* word aligned */	96	char pad2[3]; /* word aligned */
97	unsigned char cntl; /* a guess as to purpose */	97	unsigned char cntl; /* a guess as to purpose */
98	} *rbv_cmap_regs;	98	} __iomem *rbv_cmap_regs;
99		99
100	static volatile struct {	100	static struct {
101	unsigned long reset;	101	unsigned long reset;
102	unsigned long pad1[3];	102	unsigned long pad1[3];
103	unsigned char pad2[3];	103	unsigned char pad2[3];
104	unsigned char lut;	104	unsigned char lut;
105	} *dafb_cmap_regs;	105	} __iomem *dafb_cmap_regs;
106		106
107	static volatile struct {	107	static struct {
108	unsigned char addr; /* OFFSET: 0x00 */	108	unsigned char addr; /* OFFSET: 0x00 */
109	unsigned char pad1[15];	109	unsigned char pad1[15];
110	unsigned char lut; /* OFFSET: 0x10 */	110	unsigned char lut; /* OFFSET: 0x10 */
@@ -113,16 +113,16 @@ static volatile struct {
113	unsigned char pad3[7];	113	unsigned char pad3[7];
114	unsigned long vbl_addr; /* OFFSET: 0x28 */	114	unsigned long vbl_addr; /* OFFSET: 0x28 */
115	unsigned int status2; /* OFFSET: 0x2C */	115	unsigned int status2; /* OFFSET: 0x2C */
116	} *civic_cmap_regs;	116	} __iomem *civic_cmap_regs;
117		117
118	static volatile struct {	118	static struct {
119	char pad1[0x40];	119	char pad1[0x40];
120	unsigned char clut_waddr; /* 0x40 */	120	unsigned char clut_waddr; /* 0x40 */
121	char pad2;	121	char pad2;
122	unsigned char clut_data; /* 0x42 */	122	unsigned char clut_data; /* 0x42 */
123	char pad3[0x3];	123	char pad3[0x3];
124	unsigned char clut_raddr; /* 0x46 */	124	unsigned char clut_raddr; /* 0x46 */
125	} *csc_cmap_regs;	125	} __iomem *csc_cmap_regs;
126		126
127	/* We will leave these the way they are for the time being */	127	/* We will leave these the way they are for the time being */
128	struct mdc_cmap_regs {	128	struct mdc_cmap_regs {
@@ -506,10 +506,10 @@ static int csc_setpalette (unsigned int regno, unsigned int red,
506	struct fb_info *info)	506	struct fb_info *info)
507	{	507	{
508	mdelay(1);	508	mdelay(1);
509	csc_cmap_regs->clut_waddr = regno;	509	nubus_writeb(regno, &csc_cmap_regs->clut_waddr);
510	csc_cmap_regs->clut_data = red;	510	nubus_writeb(red, &csc_cmap_regs->clut_data);
511	csc_cmap_regs->clut_data = green;	511	nubus_writeb(green, &csc_cmap_regs->clut_data);
512	csc_cmap_regs->clut_data = blue;	512	nubus_writeb(blue, &csc_cmap_regs->clut_data);
513	return 0;	513	return 0;
514	}	514	}
515		515