Commit e88a0f461aeadfe309d36a2a4fac9ffb1b0ed651

Authored by Henrik Kretzschmar
Committed by Linus Torvalds
1 parent 49c39b4953

hitfb: fix sections

Since the drivers probe call was changed from .init.text to .devinit.text
in commit c2e13037e6794bd0d9de3f9ecabf5615f15c160b ("platform-drivers:
move probe to .devinit.text in drivers/video") the fb_fix_screeninfo and
fb_var_screeninfo structures must be changed from .init.data to
.devinit.data, too.

Also the drivers remove routine should be moved from .exit.text to
.devexit.text

Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Cc: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 4 additions and 4 deletions Inline Diff

drivers/video/hitfb.c
1 /* 1 /*
2 * linux/drivers/video/hitfb.c -- Hitachi LCD frame buffer device 2 * linux/drivers/video/hitfb.c -- Hitachi LCD frame buffer device
3 * 3 *
4 * (C) 1999 Mihai Spatar 4 * (C) 1999 Mihai Spatar
5 * (C) 2000 YAEGASHI Takeshi 5 * (C) 2000 YAEGASHI Takeshi
6 * (C) 2003, 2004 Paul Mundt 6 * (C) 2003, 2004 Paul Mundt
7 * (C) 2003, 2004, 2006 Andriy Skulysh 7 * (C) 2003, 2004, 2006 Andriy Skulysh
8 * 8 *
9 * This file is subject to the terms and conditions of the GNU General Public 9 * This file is subject to the terms and conditions of the GNU General Public
10 * License. See the file COPYING in the main directory of this archive for 10 * License. See the file COPYING in the main directory of this archive for
11 * more details. 11 * more details.
12 */ 12 */
13 13
14 #include <linux/module.h> 14 #include <linux/module.h>
15 #include <linux/kernel.h> 15 #include <linux/kernel.h>
16 #include <linux/errno.h> 16 #include <linux/errno.h>
17 #include <linux/string.h> 17 #include <linux/string.h>
18 #include <linux/mm.h> 18 #include <linux/mm.h>
19 #include <linux/delay.h> 19 #include <linux/delay.h>
20 #include <linux/init.h> 20 #include <linux/init.h>
21 #include <linux/platform_device.h> 21 #include <linux/platform_device.h>
22 #include <linux/fb.h> 22 #include <linux/fb.h>
23 23
24 #include <asm/machvec.h> 24 #include <asm/machvec.h>
25 #include <asm/uaccess.h> 25 #include <asm/uaccess.h>
26 #include <asm/pgtable.h> 26 #include <asm/pgtable.h>
27 #include <asm/io.h> 27 #include <asm/io.h>
28 #include <asm/hd64461.h> 28 #include <asm/hd64461.h>
29 #include <cpu/dac.h> 29 #include <cpu/dac.h>
30 30
31 #define WIDTH 640 31 #define WIDTH 640
32 32
33 static struct fb_var_screeninfo hitfb_var __initdata = { 33 static struct fb_var_screeninfo hitfb_var __devinitdata = {
34 .activate = FB_ACTIVATE_NOW, 34 .activate = FB_ACTIVATE_NOW,
35 .height = -1, 35 .height = -1,
36 .width = -1, 36 .width = -1,
37 .vmode = FB_VMODE_NONINTERLACED, 37 .vmode = FB_VMODE_NONINTERLACED,
38 }; 38 };
39 39
40 static struct fb_fix_screeninfo hitfb_fix __initdata = { 40 static struct fb_fix_screeninfo hitfb_fix __devinitdata = {
41 .id = "Hitachi HD64461", 41 .id = "Hitachi HD64461",
42 .type = FB_TYPE_PACKED_PIXELS, 42 .type = FB_TYPE_PACKED_PIXELS,
43 .accel = FB_ACCEL_NONE, 43 .accel = FB_ACCEL_NONE,
44 }; 44 };
45 45
46 static inline void hitfb_accel_wait(void) 46 static inline void hitfb_accel_wait(void)
47 { 47 {
48 while (fb_readw(HD64461_GRCFGR) & HD64461_GRCFGR_ACCSTATUS) ; 48 while (fb_readw(HD64461_GRCFGR) & HD64461_GRCFGR_ACCSTATUS) ;
49 } 49 }
50 50
51 static inline void hitfb_accel_start(int truecolor) 51 static inline void hitfb_accel_start(int truecolor)
52 { 52 {
53 if (truecolor) { 53 if (truecolor) {
54 fb_writew(6, HD64461_GRCFGR); 54 fb_writew(6, HD64461_GRCFGR);
55 } else { 55 } else {
56 fb_writew(7, HD64461_GRCFGR); 56 fb_writew(7, HD64461_GRCFGR);
57 } 57 }
58 } 58 }
59 59
60 static inline void hitfb_accel_set_dest(int truecolor, u16 dx, u16 dy, 60 static inline void hitfb_accel_set_dest(int truecolor, u16 dx, u16 dy,
61 u16 width, u16 height) 61 u16 width, u16 height)
62 { 62 {
63 u32 saddr = WIDTH * dy + dx; 63 u32 saddr = WIDTH * dy + dx;
64 if (truecolor) 64 if (truecolor)
65 saddr <<= 1; 65 saddr <<= 1;
66 66
67 fb_writew(width-1, HD64461_BBTDWR); 67 fb_writew(width-1, HD64461_BBTDWR);
68 fb_writew(height-1, HD64461_BBTDHR); 68 fb_writew(height-1, HD64461_BBTDHR);
69 69
70 fb_writew(saddr & 0xffff, HD64461_BBTDSARL); 70 fb_writew(saddr & 0xffff, HD64461_BBTDSARL);
71 fb_writew(saddr >> 16, HD64461_BBTDSARH); 71 fb_writew(saddr >> 16, HD64461_BBTDSARH);
72 72
73 } 73 }
74 74
75 static inline void hitfb_accel_bitblt(int truecolor, u16 sx, u16 sy, u16 dx, 75 static inline void hitfb_accel_bitblt(int truecolor, u16 sx, u16 sy, u16 dx,
76 u16 dy, u16 width, u16 height, u16 rop, 76 u16 dy, u16 width, u16 height, u16 rop,
77 u32 mask_addr) 77 u32 mask_addr)
78 { 78 {
79 u32 saddr, daddr; 79 u32 saddr, daddr;
80 u32 maddr = 0; 80 u32 maddr = 0;
81 81
82 height--; 82 height--;
83 width--; 83 width--;
84 fb_writew(rop, HD64461_BBTROPR); 84 fb_writew(rop, HD64461_BBTROPR);
85 if ((sy < dy) || ((sy == dy) && (sx <= dx))) { 85 if ((sy < dy) || ((sy == dy) && (sx <= dx))) {
86 saddr = WIDTH * (sy + height) + sx + width; 86 saddr = WIDTH * (sy + height) + sx + width;
87 daddr = WIDTH * (dy + height) + dx + width; 87 daddr = WIDTH * (dy + height) + dx + width;
88 if (mask_addr) { 88 if (mask_addr) {
89 if (truecolor) 89 if (truecolor)
90 maddr = ((width >> 3) + 1) * (height + 1) - 1; 90 maddr = ((width >> 3) + 1) * (height + 1) - 1;
91 else 91 else
92 maddr = 92 maddr =
93 (((width >> 4) + 1) * (height + 1) - 1) * 2; 93 (((width >> 4) + 1) * (height + 1) - 1) * 2;
94 94
95 fb_writew((1 << 5) | 1, HD64461_BBTMDR); 95 fb_writew((1 << 5) | 1, HD64461_BBTMDR);
96 } else 96 } else
97 fb_writew(1, HD64461_BBTMDR); 97 fb_writew(1, HD64461_BBTMDR);
98 } else { 98 } else {
99 saddr = WIDTH * sy + sx; 99 saddr = WIDTH * sy + sx;
100 daddr = WIDTH * dy + dx; 100 daddr = WIDTH * dy + dx;
101 if (mask_addr) { 101 if (mask_addr) {
102 fb_writew((1 << 5), HD64461_BBTMDR); 102 fb_writew((1 << 5), HD64461_BBTMDR);
103 } else { 103 } else {
104 fb_writew(0, HD64461_BBTMDR); 104 fb_writew(0, HD64461_BBTMDR);
105 } 105 }
106 } 106 }
107 if (truecolor) { 107 if (truecolor) {
108 saddr <<= 1; 108 saddr <<= 1;
109 daddr <<= 1; 109 daddr <<= 1;
110 } 110 }
111 fb_writew(width, HD64461_BBTDWR); 111 fb_writew(width, HD64461_BBTDWR);
112 fb_writew(height, HD64461_BBTDHR); 112 fb_writew(height, HD64461_BBTDHR);
113 fb_writew(saddr & 0xffff, HD64461_BBTSSARL); 113 fb_writew(saddr & 0xffff, HD64461_BBTSSARL);
114 fb_writew(saddr >> 16, HD64461_BBTSSARH); 114 fb_writew(saddr >> 16, HD64461_BBTSSARH);
115 fb_writew(daddr & 0xffff, HD64461_BBTDSARL); 115 fb_writew(daddr & 0xffff, HD64461_BBTDSARL);
116 fb_writew(daddr >> 16, HD64461_BBTDSARH); 116 fb_writew(daddr >> 16, HD64461_BBTDSARH);
117 if (mask_addr) { 117 if (mask_addr) {
118 maddr += mask_addr; 118 maddr += mask_addr;
119 fb_writew(maddr & 0xffff, HD64461_BBTMARL); 119 fb_writew(maddr & 0xffff, HD64461_BBTMARL);
120 fb_writew(maddr >> 16, HD64461_BBTMARH); 120 fb_writew(maddr >> 16, HD64461_BBTMARH);
121 } 121 }
122 hitfb_accel_start(truecolor); 122 hitfb_accel_start(truecolor);
123 } 123 }
124 124
125 static void hitfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect) 125 static void hitfb_fillrect(struct fb_info *p, const struct fb_fillrect *rect)
126 { 126 {
127 if (rect->rop != ROP_COPY) 127 if (rect->rop != ROP_COPY)
128 cfb_fillrect(p, rect); 128 cfb_fillrect(p, rect);
129 else { 129 else {
130 hitfb_accel_wait(); 130 hitfb_accel_wait();
131 fb_writew(0x00f0, HD64461_BBTROPR); 131 fb_writew(0x00f0, HD64461_BBTROPR);
132 fb_writew(16, HD64461_BBTMDR); 132 fb_writew(16, HD64461_BBTMDR);
133 133
134 if (p->var.bits_per_pixel == 16) { 134 if (p->var.bits_per_pixel == 16) {
135 fb_writew(((u32 *) (p->pseudo_palette))[rect->color], 135 fb_writew(((u32 *) (p->pseudo_palette))[rect->color],
136 HD64461_GRSCR); 136 HD64461_GRSCR);
137 hitfb_accel_set_dest(1, rect->dx, rect->dy, rect->width, 137 hitfb_accel_set_dest(1, rect->dx, rect->dy, rect->width,
138 rect->height); 138 rect->height);
139 hitfb_accel_start(1); 139 hitfb_accel_start(1);
140 } else { 140 } else {
141 fb_writew(rect->color, HD64461_GRSCR); 141 fb_writew(rect->color, HD64461_GRSCR);
142 hitfb_accel_set_dest(0, rect->dx, rect->dy, rect->width, 142 hitfb_accel_set_dest(0, rect->dx, rect->dy, rect->width,
143 rect->height); 143 rect->height);
144 hitfb_accel_start(0); 144 hitfb_accel_start(0);
145 } 145 }
146 } 146 }
147 } 147 }
148 148
149 static void hitfb_copyarea(struct fb_info *p, const struct fb_copyarea *area) 149 static void hitfb_copyarea(struct fb_info *p, const struct fb_copyarea *area)
150 { 150 {
151 hitfb_accel_wait(); 151 hitfb_accel_wait();
152 hitfb_accel_bitblt(p->var.bits_per_pixel == 16, area->sx, area->sy, 152 hitfb_accel_bitblt(p->var.bits_per_pixel == 16, area->sx, area->sy,
153 area->dx, area->dy, area->width, area->height, 153 area->dx, area->dy, area->width, area->height,
154 0x00cc, 0); 154 0x00cc, 0);
155 } 155 }
156 156
157 static int hitfb_pan_display(struct fb_var_screeninfo *var, 157 static int hitfb_pan_display(struct fb_var_screeninfo *var,
158 struct fb_info *info) 158 struct fb_info *info)
159 { 159 {
160 int xoffset = var->xoffset; 160 int xoffset = var->xoffset;
161 int yoffset = var->yoffset; 161 int yoffset = var->yoffset;
162 162
163 if (xoffset != 0) 163 if (xoffset != 0)
164 return -EINVAL; 164 return -EINVAL;
165 165
166 fb_writew((yoffset*info->fix.line_length)>>10, HD64461_LCDCBAR); 166 fb_writew((yoffset*info->fix.line_length)>>10, HD64461_LCDCBAR);
167 167
168 return 0; 168 return 0;
169 } 169 }
170 170
171 int hitfb_blank(int blank_mode, struct fb_info *info) 171 int hitfb_blank(int blank_mode, struct fb_info *info)
172 { 172 {
173 unsigned short v; 173 unsigned short v;
174 174
175 if (blank_mode) { 175 if (blank_mode) {
176 v = fb_readw(HD64461_LDR1); 176 v = fb_readw(HD64461_LDR1);
177 v &= ~HD64461_LDR1_DON; 177 v &= ~HD64461_LDR1_DON;
178 fb_writew(v, HD64461_LDR1); 178 fb_writew(v, HD64461_LDR1);
179 179
180 v = fb_readw(HD64461_LCDCCR); 180 v = fb_readw(HD64461_LCDCCR);
181 v |= HD64461_LCDCCR_MOFF; 181 v |= HD64461_LCDCCR_MOFF;
182 fb_writew(v, HD64461_LCDCCR); 182 fb_writew(v, HD64461_LCDCCR);
183 183
184 v = fb_readw(HD64461_STBCR); 184 v = fb_readw(HD64461_STBCR);
185 v |= HD64461_STBCR_SLCDST; 185 v |= HD64461_STBCR_SLCDST;
186 fb_writew(v, HD64461_STBCR); 186 fb_writew(v, HD64461_STBCR);
187 } else { 187 } else {
188 v = fb_readw(HD64461_STBCR); 188 v = fb_readw(HD64461_STBCR);
189 v &= ~HD64461_STBCR_SLCDST; 189 v &= ~HD64461_STBCR_SLCDST;
190 fb_writew(v, HD64461_STBCR); 190 fb_writew(v, HD64461_STBCR);
191 191
192 v = fb_readw(HD64461_LCDCCR); 192 v = fb_readw(HD64461_LCDCCR);
193 v &= ~(HD64461_LCDCCR_MOFF | HD64461_LCDCCR_STREQ); 193 v &= ~(HD64461_LCDCCR_MOFF | HD64461_LCDCCR_STREQ);
194 fb_writew(v, HD64461_LCDCCR); 194 fb_writew(v, HD64461_LCDCCR);
195 195
196 do { 196 do {
197 v = fb_readw(HD64461_LCDCCR); 197 v = fb_readw(HD64461_LCDCCR);
198 } while(v&HD64461_LCDCCR_STBACK); 198 } while(v&HD64461_LCDCCR_STBACK);
199 199
200 v = fb_readw(HD64461_LDR1); 200 v = fb_readw(HD64461_LDR1);
201 v |= HD64461_LDR1_DON; 201 v |= HD64461_LDR1_DON;
202 fb_writew(v, HD64461_LDR1); 202 fb_writew(v, HD64461_LDR1);
203 } 203 }
204 return 0; 204 return 0;
205 } 205 }
206 206
207 static int hitfb_setcolreg(unsigned regno, unsigned red, unsigned green, 207 static int hitfb_setcolreg(unsigned regno, unsigned red, unsigned green,
208 unsigned blue, unsigned transp, struct fb_info *info) 208 unsigned blue, unsigned transp, struct fb_info *info)
209 { 209 {
210 if (regno >= 256) 210 if (regno >= 256)
211 return 1; 211 return 1;
212 212
213 switch (info->var.bits_per_pixel) { 213 switch (info->var.bits_per_pixel) {
214 case 8: 214 case 8:
215 fb_writew(regno << 8, HD64461_CPTWAR); 215 fb_writew(regno << 8, HD64461_CPTWAR);
216 fb_writew(red >> 10, HD64461_CPTWDR); 216 fb_writew(red >> 10, HD64461_CPTWDR);
217 fb_writew(green >> 10, HD64461_CPTWDR); 217 fb_writew(green >> 10, HD64461_CPTWDR);
218 fb_writew(blue >> 10, HD64461_CPTWDR); 218 fb_writew(blue >> 10, HD64461_CPTWDR);
219 break; 219 break;
220 case 16: 220 case 16:
221 if (regno >= 16) 221 if (regno >= 16)
222 return 1; 222 return 1;
223 ((u32 *) (info->pseudo_palette))[regno] = 223 ((u32 *) (info->pseudo_palette))[regno] =
224 ((red & 0xf800)) | 224 ((red & 0xf800)) |
225 ((green & 0xfc00) >> 5) | ((blue & 0xf800) >> 11); 225 ((green & 0xfc00) >> 5) | ((blue & 0xf800) >> 11);
226 break; 226 break;
227 } 227 }
228 return 0; 228 return 0;
229 } 229 }
230 230
231 static int hitfb_sync(struct fb_info *info) 231 static int hitfb_sync(struct fb_info *info)
232 { 232 {
233 hitfb_accel_wait(); 233 hitfb_accel_wait();
234 234
235 return 0; 235 return 0;
236 } 236 }
237 237
238 static int hitfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) 238 static int hitfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info)
239 { 239 {
240 int maxy; 240 int maxy;
241 241
242 var->xres = info->var.xres; 242 var->xres = info->var.xres;
243 var->xres_virtual = info->var.xres; 243 var->xres_virtual = info->var.xres;
244 var->yres = info->var.yres; 244 var->yres = info->var.yres;
245 245
246 if ((var->bits_per_pixel != 8) && (var->bits_per_pixel != 16)) 246 if ((var->bits_per_pixel != 8) && (var->bits_per_pixel != 16))
247 var->bits_per_pixel = info->var.bits_per_pixel; 247 var->bits_per_pixel = info->var.bits_per_pixel;
248 248
249 if (var->yres_virtual < var->yres) 249 if (var->yres_virtual < var->yres)
250 var->yres_virtual = var->yres; 250 var->yres_virtual = var->yres;
251 251
252 maxy = info->fix.smem_len / var->xres; 252 maxy = info->fix.smem_len / var->xres;
253 253
254 if (var->bits_per_pixel == 16) 254 if (var->bits_per_pixel == 16)
255 maxy /= 2; 255 maxy /= 2;
256 256
257 if (var->yres_virtual > maxy) 257 if (var->yres_virtual > maxy)
258 var->yres_virtual = maxy; 258 var->yres_virtual = maxy;
259 259
260 var->xoffset = 0; 260 var->xoffset = 0;
261 var->yoffset = 0; 261 var->yoffset = 0;
262 262
263 switch (var->bits_per_pixel) { 263 switch (var->bits_per_pixel) {
264 case 8: 264 case 8:
265 var->red.offset = 0; 265 var->red.offset = 0;
266 var->red.length = 8; 266 var->red.length = 8;
267 var->green.offset = 0; 267 var->green.offset = 0;
268 var->green.length = 8; 268 var->green.length = 8;
269 var->blue.offset = 0; 269 var->blue.offset = 0;
270 var->blue.length = 8; 270 var->blue.length = 8;
271 var->transp.offset = 0; 271 var->transp.offset = 0;
272 var->transp.length = 0; 272 var->transp.length = 0;
273 break; 273 break;
274 case 16: /* RGB 565 */ 274 case 16: /* RGB 565 */
275 var->red.offset = 11; 275 var->red.offset = 11;
276 var->red.length = 5; 276 var->red.length = 5;
277 var->green.offset = 5; 277 var->green.offset = 5;
278 var->green.length = 6; 278 var->green.length = 6;
279 var->blue.offset = 0; 279 var->blue.offset = 0;
280 var->blue.length = 5; 280 var->blue.length = 5;
281 var->transp.offset = 0; 281 var->transp.offset = 0;
282 var->transp.length = 0; 282 var->transp.length = 0;
283 break; 283 break;
284 } 284 }
285 285
286 return 0; 286 return 0;
287 } 287 }
288 288
289 static int hitfb_set_par(struct fb_info *info) 289 static int hitfb_set_par(struct fb_info *info)
290 { 290 {
291 unsigned short ldr3; 291 unsigned short ldr3;
292 292
293 switch (info->var.bits_per_pixel) { 293 switch (info->var.bits_per_pixel) {
294 case 8: 294 case 8:
295 info->fix.line_length = info->var.xres; 295 info->fix.line_length = info->var.xres;
296 info->fix.visual = FB_VISUAL_PSEUDOCOLOR; 296 info->fix.visual = FB_VISUAL_PSEUDOCOLOR;
297 info->fix.ypanstep = 16; 297 info->fix.ypanstep = 16;
298 break; 298 break;
299 case 16: 299 case 16:
300 info->fix.line_length = info->var.xres*2; 300 info->fix.line_length = info->var.xres*2;
301 info->fix.visual = FB_VISUAL_TRUECOLOR; 301 info->fix.visual = FB_VISUAL_TRUECOLOR;
302 info->fix.ypanstep = 8; 302 info->fix.ypanstep = 8;
303 break; 303 break;
304 } 304 }
305 305
306 fb_writew(info->fix.line_length, HD64461_LCDCLOR); 306 fb_writew(info->fix.line_length, HD64461_LCDCLOR);
307 ldr3 = fb_readw(HD64461_LDR3); 307 ldr3 = fb_readw(HD64461_LDR3);
308 ldr3 &= ~15; 308 ldr3 &= ~15;
309 ldr3 |= (info->var.bits_per_pixel == 8) ? 4 : 8; 309 ldr3 |= (info->var.bits_per_pixel == 8) ? 4 : 8;
310 fb_writew(ldr3, HD64461_LDR3); 310 fb_writew(ldr3, HD64461_LDR3);
311 return 0; 311 return 0;
312 } 312 }
313 313
314 static struct fb_ops hitfb_ops = { 314 static struct fb_ops hitfb_ops = {
315 .owner = THIS_MODULE, 315 .owner = THIS_MODULE,
316 .fb_check_var = hitfb_check_var, 316 .fb_check_var = hitfb_check_var,
317 .fb_set_par = hitfb_set_par, 317 .fb_set_par = hitfb_set_par,
318 .fb_setcolreg = hitfb_setcolreg, 318 .fb_setcolreg = hitfb_setcolreg,
319 .fb_blank = hitfb_blank, 319 .fb_blank = hitfb_blank,
320 .fb_sync = hitfb_sync, 320 .fb_sync = hitfb_sync,
321 .fb_pan_display = hitfb_pan_display, 321 .fb_pan_display = hitfb_pan_display,
322 .fb_fillrect = hitfb_fillrect, 322 .fb_fillrect = hitfb_fillrect,
323 .fb_copyarea = hitfb_copyarea, 323 .fb_copyarea = hitfb_copyarea,
324 .fb_imageblit = cfb_imageblit, 324 .fb_imageblit = cfb_imageblit,
325 }; 325 };
326 326
327 static int __devinit hitfb_probe(struct platform_device *dev) 327 static int __devinit hitfb_probe(struct platform_device *dev)
328 { 328 {
329 unsigned short lcdclor, ldr3, ldvndr; 329 unsigned short lcdclor, ldr3, ldvndr;
330 struct fb_info *info; 330 struct fb_info *info;
331 int ret; 331 int ret;
332 332
333 if (fb_get_options("hitfb", NULL)) 333 if (fb_get_options("hitfb", NULL))
334 return -ENODEV; 334 return -ENODEV;
335 335
336 hitfb_fix.mmio_start = HD64461_IO_OFFSET(0x1000); 336 hitfb_fix.mmio_start = HD64461_IO_OFFSET(0x1000);
337 hitfb_fix.mmio_len = 0x1000; 337 hitfb_fix.mmio_len = 0x1000;
338 hitfb_fix.smem_start = HD64461_IO_OFFSET(0x02000000); 338 hitfb_fix.smem_start = HD64461_IO_OFFSET(0x02000000);
339 hitfb_fix.smem_len = 512 * 1024; 339 hitfb_fix.smem_len = 512 * 1024;
340 340
341 lcdclor = fb_readw(HD64461_LCDCLOR); 341 lcdclor = fb_readw(HD64461_LCDCLOR);
342 ldvndr = fb_readw(HD64461_LDVNDR); 342 ldvndr = fb_readw(HD64461_LDVNDR);
343 ldr3 = fb_readw(HD64461_LDR3); 343 ldr3 = fb_readw(HD64461_LDR3);
344 344
345 switch (ldr3 & 15) { 345 switch (ldr3 & 15) {
346 default: 346 default:
347 case 4: 347 case 4:
348 hitfb_var.bits_per_pixel = 8; 348 hitfb_var.bits_per_pixel = 8;
349 hitfb_var.xres = lcdclor; 349 hitfb_var.xres = lcdclor;
350 break; 350 break;
351 case 8: 351 case 8:
352 hitfb_var.bits_per_pixel = 16; 352 hitfb_var.bits_per_pixel = 16;
353 hitfb_var.xres = lcdclor / 2; 353 hitfb_var.xres = lcdclor / 2;
354 break; 354 break;
355 } 355 }
356 hitfb_fix.line_length = lcdclor; 356 hitfb_fix.line_length = lcdclor;
357 hitfb_fix.visual = (hitfb_var.bits_per_pixel == 8) ? 357 hitfb_fix.visual = (hitfb_var.bits_per_pixel == 8) ?
358 FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR; 358 FB_VISUAL_PSEUDOCOLOR : FB_VISUAL_TRUECOLOR;
359 hitfb_var.yres = ldvndr + 1; 359 hitfb_var.yres = ldvndr + 1;
360 hitfb_var.xres_virtual = hitfb_var.xres; 360 hitfb_var.xres_virtual = hitfb_var.xres;
361 hitfb_var.yres_virtual = hitfb_fix.smem_len / lcdclor; 361 hitfb_var.yres_virtual = hitfb_fix.smem_len / lcdclor;
362 switch (hitfb_var.bits_per_pixel) { 362 switch (hitfb_var.bits_per_pixel) {
363 case 8: 363 case 8:
364 hitfb_var.red.offset = 0; 364 hitfb_var.red.offset = 0;
365 hitfb_var.red.length = 8; 365 hitfb_var.red.length = 8;
366 hitfb_var.green.offset = 0; 366 hitfb_var.green.offset = 0;
367 hitfb_var.green.length = 8; 367 hitfb_var.green.length = 8;
368 hitfb_var.blue.offset = 0; 368 hitfb_var.blue.offset = 0;
369 hitfb_var.blue.length = 8; 369 hitfb_var.blue.length = 8;
370 hitfb_var.transp.offset = 0; 370 hitfb_var.transp.offset = 0;
371 hitfb_var.transp.length = 0; 371 hitfb_var.transp.length = 0;
372 break; 372 break;
373 case 16: /* RGB 565 */ 373 case 16: /* RGB 565 */
374 hitfb_var.red.offset = 11; 374 hitfb_var.red.offset = 11;
375 hitfb_var.red.length = 5; 375 hitfb_var.red.length = 5;
376 hitfb_var.green.offset = 5; 376 hitfb_var.green.offset = 5;
377 hitfb_var.green.length = 6; 377 hitfb_var.green.length = 6;
378 hitfb_var.blue.offset = 0; 378 hitfb_var.blue.offset = 0;
379 hitfb_var.blue.length = 5; 379 hitfb_var.blue.length = 5;
380 hitfb_var.transp.offset = 0; 380 hitfb_var.transp.offset = 0;
381 hitfb_var.transp.length = 0; 381 hitfb_var.transp.length = 0;
382 break; 382 break;
383 } 383 }
384 384
385 info = framebuffer_alloc(sizeof(u32) * 16, &dev->dev); 385 info = framebuffer_alloc(sizeof(u32) * 16, &dev->dev);
386 if (unlikely(!info)) 386 if (unlikely(!info))
387 return -ENOMEM; 387 return -ENOMEM;
388 388
389 info->fbops = &hitfb_ops; 389 info->fbops = &hitfb_ops;
390 info->var = hitfb_var; 390 info->var = hitfb_var;
391 info->fix = hitfb_fix; 391 info->fix = hitfb_fix;
392 info->pseudo_palette = info->par; 392 info->pseudo_palette = info->par;
393 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN | 393 info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_YPAN |
394 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA; 394 FBINFO_HWACCEL_FILLRECT | FBINFO_HWACCEL_COPYAREA;
395 395
396 info->screen_base = (void *)hitfb_fix.smem_start; 396 info->screen_base = (void *)hitfb_fix.smem_start;
397 397
398 ret = fb_alloc_cmap(&info->cmap, 256, 0); 398 ret = fb_alloc_cmap(&info->cmap, 256, 0);
399 if (unlikely(ret < 0)) 399 if (unlikely(ret < 0))
400 goto err_fb; 400 goto err_fb;
401 401
402 ret = register_framebuffer(info); 402 ret = register_framebuffer(info);
403 if (unlikely(ret < 0)) 403 if (unlikely(ret < 0))
404 goto err; 404 goto err;
405 405
406 platform_set_drvdata(dev, info); 406 platform_set_drvdata(dev, info);
407 407
408 printk(KERN_INFO "fb%d: %s frame buffer device\n", 408 printk(KERN_INFO "fb%d: %s frame buffer device\n",
409 info->node, info->fix.id); 409 info->node, info->fix.id);
410 410
411 return 0; 411 return 0;
412 412
413 err: 413 err:
414 fb_dealloc_cmap(&info->cmap); 414 fb_dealloc_cmap(&info->cmap);
415 err_fb: 415 err_fb:
416 framebuffer_release(info); 416 framebuffer_release(info);
417 return ret; 417 return ret;
418 } 418 }
419 419
420 static int __exit hitfb_remove(struct platform_device *dev) 420 static int __devexit hitfb_remove(struct platform_device *dev)
421 { 421 {
422 struct fb_info *info = platform_get_drvdata(dev); 422 struct fb_info *info = platform_get_drvdata(dev);
423 423
424 unregister_framebuffer(info); 424 unregister_framebuffer(info);
425 fb_dealloc_cmap(&info->cmap); 425 fb_dealloc_cmap(&info->cmap);
426 framebuffer_release(info); 426 framebuffer_release(info);
427 427
428 return 0; 428 return 0;
429 } 429 }
430 430
431 static int hitfb_suspend(struct device *dev) 431 static int hitfb_suspend(struct device *dev)
432 { 432 {
433 u16 v; 433 u16 v;
434 434
435 hitfb_blank(1,0); 435 hitfb_blank(1,0);
436 v = fb_readw(HD64461_STBCR); 436 v = fb_readw(HD64461_STBCR);
437 v |= HD64461_STBCR_SLCKE_IST; 437 v |= HD64461_STBCR_SLCKE_IST;
438 fb_writew(v, HD64461_STBCR); 438 fb_writew(v, HD64461_STBCR);
439 439
440 return 0; 440 return 0;
441 } 441 }
442 442
443 static int hitfb_resume(struct device *dev) 443 static int hitfb_resume(struct device *dev)
444 { 444 {
445 u16 v; 445 u16 v;
446 446
447 v = fb_readw(HD64461_STBCR); 447 v = fb_readw(HD64461_STBCR);
448 v &= ~HD64461_STBCR_SLCKE_OST; 448 v &= ~HD64461_STBCR_SLCKE_OST;
449 msleep(100); 449 msleep(100);
450 v = fb_readw(HD64461_STBCR); 450 v = fb_readw(HD64461_STBCR);
451 v &= ~HD64461_STBCR_SLCKE_IST; 451 v &= ~HD64461_STBCR_SLCKE_IST;
452 fb_writew(v, HD64461_STBCR); 452 fb_writew(v, HD64461_STBCR);
453 hitfb_blank(0,0); 453 hitfb_blank(0,0);
454 454
455 return 0; 455 return 0;
456 } 456 }
457 457
458 static const struct dev_pm_ops hitfb_dev_pm_ops = { 458 static const struct dev_pm_ops hitfb_dev_pm_ops = {
459 .suspend = hitfb_suspend, 459 .suspend = hitfb_suspend,
460 .resume = hitfb_resume, 460 .resume = hitfb_resume,
461 }; 461 };
462 462
463 static struct platform_driver hitfb_driver = { 463 static struct platform_driver hitfb_driver = {
464 .probe = hitfb_probe, 464 .probe = hitfb_probe,
465 .remove = __exit_p(hitfb_remove), 465 .remove = __devexit_p(hitfb_remove),
466 .driver = { 466 .driver = {
467 .name = "hitfb", 467 .name = "hitfb",
468 .owner = THIS_MODULE, 468 .owner = THIS_MODULE,
469 .pm = &hitfb_dev_pm_ops, 469 .pm = &hitfb_dev_pm_ops,
470 }, 470 },
471 }; 471 };
472 472
473 static struct platform_device hitfb_device = { 473 static struct platform_device hitfb_device = {
474 .name = "hitfb", 474 .name = "hitfb",
475 .id = -1, 475 .id = -1,
476 }; 476 };
477 477
478 static int __init hitfb_init(void) 478 static int __init hitfb_init(void)
479 { 479 {
480 int ret; 480 int ret;
481 481
482 ret = platform_driver_register(&hitfb_driver); 482 ret = platform_driver_register(&hitfb_driver);
483 if (!ret) { 483 if (!ret) {
484 ret = platform_device_register(&hitfb_device); 484 ret = platform_device_register(&hitfb_device);
485 if (ret) 485 if (ret)
486 platform_driver_unregister(&hitfb_driver); 486 platform_driver_unregister(&hitfb_driver);
487 } 487 }
488 return ret; 488 return ret;
489 } 489 }
490 490
491 491
492 static void __exit hitfb_exit(void) 492 static void __exit hitfb_exit(void)
493 { 493 {
494 platform_device_unregister(&hitfb_device); 494 platform_device_unregister(&hitfb_device);
495 platform_driver_unregister(&hitfb_driver); 495 platform_driver_unregister(&hitfb_driver);
496 } 496 }
497 497
498 module_init(hitfb_init); 498 module_init(hitfb_init);
499 module_exit(hitfb_exit); 499 module_exit(hitfb_exit);
500 500
501 MODULE_LICENSE("GPL"); 501 MODULE_LICENSE("GPL");
502 502