aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2008-12-16 05:44:08 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2008-12-16 09:40:21 -0500
commit24b9baf7a5678b95edb2a358594abd54dc69f8a0 (patch)
tree261e030c1b9fe9eb9c0a3185ee243173a44a0f72 /drivers
parentd6ed5755ac26044473bcc9c9d2659624003652c8 (diff)
i.MX Framebuffer: remove header file
Move contents of imxfb.h to imxfb.c since it is used only in this file Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/video/imxfb.c62
-rw-r--r--drivers/video/imxfb.h74
2 files changed, 60 insertions, 76 deletions
diff --git a/drivers/video/imxfb.c b/drivers/video/imxfb.c
index feaae73f56ac..7b3400cfae6d 100644
--- a/drivers/video/imxfb.c
+++ b/drivers/video/imxfb.c
@@ -40,8 +40,6 @@
40 */ 40 */
41#define DEBUG_VAR 1 41#define DEBUG_VAR 1
42 42
43#include "imxfb.h"
44
45#define DRIVER_NAME "imx-fb" 43#define DRIVER_NAME "imx-fb"
46 44
47#define LCDC_SSA 0x00 45#define LCDC_SSA 0x00
@@ -109,6 +107,66 @@
109#define LCDISR_EOF (1<<1) 107#define LCDISR_EOF (1<<1)
110#define LCDISR_BOF (1<<0) 108#define LCDISR_BOF (1<<0)
111 109
110/*
111 * These are the bitfields for each
112 * display depth that we support.
113 */
114struct imxfb_rgb {
115 struct fb_bitfield red;
116 struct fb_bitfield green;
117 struct fb_bitfield blue;
118 struct fb_bitfield transp;
119};
120
121#define RGB_16 (0)
122#define RGB_8 (1)
123#define NR_RGB 2
124
125struct imxfb_info {
126 struct platform_device *pdev;
127 void __iomem *regs;
128
129 struct imxfb_rgb *rgb[NR_RGB];
130
131 u_int max_bpp;
132 u_int max_xres;
133 u_int max_yres;
134
135 /*
136 * These are the addresses we mapped
137 * the framebuffer memory region to.
138 */
139 dma_addr_t map_dma;
140 u_char *map_cpu;
141 u_int map_size;
142
143 u_char *screen_cpu;
144 dma_addr_t screen_dma;
145 u_int palette_size;
146
147 dma_addr_t dbar1;
148 dma_addr_t dbar2;
149
150 u_int pcr;
151 u_int pwmr;
152 u_int lscr1;
153 u_int dmacr;
154 u_int cmap_inverse:1,
155 cmap_static:1,
156 unused:30;
157
158 void (*lcd_power)(int);
159 void (*backlight_power)(int);
160};
161
162#define IMX_NAME "IMX"
163
164/*
165 * Minimum X and Y resolutions
166 */
167#define MIN_XRES 64
168#define MIN_YRES 64
169
112static struct imxfb_rgb def_rgb_16 = { 170static struct imxfb_rgb def_rgb_16 = {
113 .red = { .offset = 8, .length = 4, }, 171 .red = { .offset = 8, .length = 4, },
114 .green = { .offset = 4, .length = 4, }, 172 .green = { .offset = 4, .length = 4, },
diff --git a/drivers/video/imxfb.h b/drivers/video/imxfb.h
deleted file mode 100644
index baa86a0fe29e..000000000000
--- a/drivers/video/imxfb.h
+++ /dev/null
@@ -1,74 +0,0 @@
1/*
2 * linux/drivers/video/imxfb.h
3 *
4 * Freescale i.MX Frame Buffer device driver
5 *
6 * Copyright (C) 2004 S.Hauer, Pengutronix
7 *
8 * Copyright (C) 1999 Eric A. Thomas
9 * Based on acornfb.c Copyright (C) Russell King.
10 *
11 * This file is subject to the terms and conditions of the GNU General Public
12 * License. See the file COPYING in the main directory of this archive
13 * for more details.
14 */
15
16/*
17 * These are the bitfields for each
18 * display depth that we support.
19 */
20struct imxfb_rgb {
21 struct fb_bitfield red;
22 struct fb_bitfield green;
23 struct fb_bitfield blue;
24 struct fb_bitfield transp;
25};
26
27#define RGB_16 (0)
28#define RGB_8 (1)
29#define NR_RGB 2
30
31struct imxfb_info {
32 void __iomem *regs;
33
34 struct imxfb_rgb *rgb[NR_RGB];
35
36 u_int max_bpp;
37 u_int max_xres;
38 u_int max_yres;
39
40 /*
41 * These are the addresses we mapped
42 * the framebuffer memory region to.
43 */
44 dma_addr_t map_dma;
45 u_char * map_cpu;
46 u_int map_size;
47
48 u_char * screen_cpu;
49 dma_addr_t screen_dma;
50 u_int palette_size;
51
52 dma_addr_t dbar1;
53 dma_addr_t dbar2;
54
55 u_int pcr;
56 u_int pwmr;
57 u_int lscr1;
58 u_int dmacr;
59 u_int cmap_inverse:1,
60 cmap_static:1,
61 unused:30;
62
63 void (*lcd_power)(int);
64 void (*backlight_power)(int);
65};
66
67#define IMX_NAME "IMX"
68
69/*
70 * Minimum X and Y resolutions
71 */
72#define MIN_XRES 64
73#define MIN_YRES 64
74