diff options
author | Mayuresh Janorkar <mayur@ti.com> | 2011-01-11 09:24:03 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-12 00:57:52 -0500 |
commit | ccd8c79c5608fc4835dcb0244623ceae2489f72d (patch) | |
tree | 7055663adccb216e272d95b936f868163a943c7d /drivers/video/modedb.c | |
parent | 90a48151599b5f5137aeb0c8849557231e9c1640 (diff) |
video: tidy up modedb formatting.
A part of file: drivers/video/modedb.c was not as per the coding guidelines.
The cleanup includes:
1) Converting spcaes to tabs
2) Adding spaces on either sides of "|" operator
Signed-off-by: Mayuresh Janorkar <mayur@ti.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'drivers/video/modedb.c')
-rw-r--r-- | drivers/video/modedb.c | 420 |
1 files changed, 220 insertions, 200 deletions
diff --git a/drivers/video/modedb.c b/drivers/video/modedb.c index d2bb365f09b3..48c3ea8652b6 100644 --- a/drivers/video/modedb.c +++ b/drivers/video/modedb.c | |||
@@ -32,300 +32,320 @@ | |||
32 | const char *fb_mode_option; | 32 | const char *fb_mode_option; |
33 | EXPORT_SYMBOL_GPL(fb_mode_option); | 33 | EXPORT_SYMBOL_GPL(fb_mode_option); |
34 | 34 | ||
35 | /* | 35 | /* |
36 | * Standard video mode definitions (taken from XFree86) | 36 | * Standard video mode definitions (taken from XFree86) |
37 | */ | 37 | */ |
38 | 38 | ||
39 | static const struct fb_videomode modedb[] = { | 39 | static const struct fb_videomode modedb[] = { |
40 | { | 40 | |
41 | /* 640x400 @ 70 Hz, 31.5 kHz hsync */ | 41 | /* 640x400 @ 70 Hz, 31.5 kHz hsync */ |
42 | NULL, 70, 640, 400, 39721, 40, 24, 39, 9, 96, 2, | 42 | { NULL, 70, 640, 400, 39721, 40, 24, 39, 9, 96, 2, 0, |
43 | 0, FB_VMODE_NONINTERLACED | 43 | FB_VMODE_NONINTERLACED }, |
44 | }, { | 44 | |
45 | /* 640x480 @ 60 Hz, 31.5 kHz hsync */ | 45 | /* 640x480 @ 60 Hz, 31.5 kHz hsync */ |
46 | NULL, 60, 640, 480, 39721, 40, 24, 32, 11, 96, 2, | 46 | { NULL, 60, 640, 480, 39721, 40, 24, 32, 11, 96, 2, 0, |
47 | 0, FB_VMODE_NONINTERLACED | 47 | FB_VMODE_NONINTERLACED }, |
48 | }, { | 48 | |
49 | /* 800x600 @ 56 Hz, 35.15 kHz hsync */ | 49 | /* 800x600 @ 56 Hz, 35.15 kHz hsync */ |
50 | NULL, 56, 800, 600, 27777, 128, 24, 22, 1, 72, 2, | 50 | { NULL, 56, 800, 600, 27777, 128, 24, 22, 1, 72, 2, 0, |
51 | 0, FB_VMODE_NONINTERLACED | 51 | FB_VMODE_NONINTERLACED }, |
52 | }, { | 52 | |
53 | /* 1024x768 @ 87 Hz interlaced, 35.5 kHz hsync */ | 53 | /* 1024x768 @ 87 Hz interlaced, 35.5 kHz hsync */ |
54 | NULL, 87, 1024, 768, 22271, 56, 24, 33, 8, 160, 8, | 54 | { NULL, 87, 1024, 768, 22271, 56, 24, 33, 8, 160, 8, 0, |
55 | 0, FB_VMODE_INTERLACED | 55 | FB_VMODE_INTERLACED }, |
56 | }, { | 56 | |
57 | /* 640x400 @ 85 Hz, 37.86 kHz hsync */ | 57 | /* 640x400 @ 85 Hz, 37.86 kHz hsync */ |
58 | NULL, 85, 640, 400, 31746, 96, 32, 41, 1, 64, 3, | 58 | { NULL, 85, 640, 400, 31746, 96, 32, 41, 1, 64, 3, |
59 | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED | 59 | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED }, |
60 | }, { | 60 | |
61 | /* 640x480 @ 72 Hz, 36.5 kHz hsync */ | 61 | /* 640x480 @ 72 Hz, 36.5 kHz hsync */ |
62 | NULL, 72, 640, 480, 31746, 144, 40, 30, 8, 40, 3, | 62 | { NULL, 72, 640, 480, 31746, 144, 40, 30, 8, 40, 3, 0, |
63 | 0, FB_VMODE_NONINTERLACED | 63 | FB_VMODE_NONINTERLACED }, |
64 | }, { | 64 | |
65 | /* 640x480 @ 75 Hz, 37.50 kHz hsync */ | 65 | /* 640x480 @ 75 Hz, 37.50 kHz hsync */ |
66 | NULL, 75, 640, 480, 31746, 120, 16, 16, 1, 64, 3, | 66 | { NULL, 75, 640, 480, 31746, 120, 16, 16, 1, 64, 3, 0, |
67 | 0, FB_VMODE_NONINTERLACED | 67 | FB_VMODE_NONINTERLACED }, |
68 | }, { | 68 | |
69 | /* 800x600 @ 60 Hz, 37.8 kHz hsync */ | 69 | /* 800x600 @ 60 Hz, 37.8 kHz hsync */ |
70 | NULL, 60, 800, 600, 25000, 88, 40, 23, 1, 128, 4, | 70 | { NULL, 60, 800, 600, 25000, 88, 40, 23, 1, 128, 4, |
71 | FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED | 71 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
72 | }, { | 72 | FB_VMODE_NONINTERLACED }, |
73 | |||
73 | /* 640x480 @ 85 Hz, 43.27 kHz hsync */ | 74 | /* 640x480 @ 85 Hz, 43.27 kHz hsync */ |
74 | NULL, 85, 640, 480, 27777, 80, 56, 25, 1, 56, 3, | 75 | { NULL, 85, 640, 480, 27777, 80, 56, 25, 1, 56, 3, 0, |
75 | 0, FB_VMODE_NONINTERLACED | 76 | FB_VMODE_NONINTERLACED }, |
76 | }, { | 77 | |
77 | /* 1152x864 @ 89 Hz interlaced, 44 kHz hsync */ | 78 | /* 1152x864 @ 89 Hz interlaced, 44 kHz hsync */ |
78 | NULL, 89, 1152, 864, 15384, 96, 16, 110, 1, 216, 10, | 79 | { NULL, 89, 1152, 864, 15384, 96, 16, 110, 1, 216, 10, 0, |
79 | 0, FB_VMODE_INTERLACED | 80 | FB_VMODE_INTERLACED }, |
80 | }, { | ||
81 | /* 800x600 @ 72 Hz, 48.0 kHz hsync */ | 81 | /* 800x600 @ 72 Hz, 48.0 kHz hsync */ |
82 | NULL, 72, 800, 600, 20000, 64, 56, 23, 37, 120, 6, | 82 | { NULL, 72, 800, 600, 20000, 64, 56, 23, 37, 120, 6, |
83 | FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED | 83 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
84 | }, { | 84 | FB_VMODE_NONINTERLACED }, |
85 | |||
85 | /* 1024x768 @ 60 Hz, 48.4 kHz hsync */ | 86 | /* 1024x768 @ 60 Hz, 48.4 kHz hsync */ |
86 | NULL, 60, 1024, 768, 15384, 168, 8, 29, 3, 144, 6, | 87 | { NULL, 60, 1024, 768, 15384, 168, 8, 29, 3, 144, 6, 0, |
87 | 0, FB_VMODE_NONINTERLACED | 88 | FB_VMODE_NONINTERLACED }, |
88 | }, { | 89 | |
89 | /* 640x480 @ 100 Hz, 53.01 kHz hsync */ | 90 | /* 640x480 @ 100 Hz, 53.01 kHz hsync */ |
90 | NULL, 100, 640, 480, 21834, 96, 32, 36, 8, 96, 6, | 91 | { NULL, 100, 640, 480, 21834, 96, 32, 36, 8, 96, 6, 0, |
91 | 0, FB_VMODE_NONINTERLACED | 92 | FB_VMODE_NONINTERLACED }, |
92 | }, { | 93 | |
93 | /* 1152x864 @ 60 Hz, 53.5 kHz hsync */ | 94 | /* 1152x864 @ 60 Hz, 53.5 kHz hsync */ |
94 | NULL, 60, 1152, 864, 11123, 208, 64, 16, 4, 256, 8, | 95 | { NULL, 60, 1152, 864, 11123, 208, 64, 16, 4, 256, 8, 0, |
95 | 0, FB_VMODE_NONINTERLACED | 96 | FB_VMODE_NONINTERLACED }, |
96 | }, { | 97 | |
97 | /* 800x600 @ 85 Hz, 55.84 kHz hsync */ | 98 | /* 800x600 @ 85 Hz, 55.84 kHz hsync */ |
98 | NULL, 85, 800, 600, 16460, 160, 64, 36, 16, 64, 5, | 99 | { NULL, 85, 800, 600, 16460, 160, 64, 36, 16, 64, 5, 0, |
99 | 0, FB_VMODE_NONINTERLACED | 100 | FB_VMODE_NONINTERLACED }, |
100 | }, { | 101 | |
101 | /* 1024x768 @ 70 Hz, 56.5 kHz hsync */ | 102 | /* 1024x768 @ 70 Hz, 56.5 kHz hsync */ |
102 | NULL, 70, 1024, 768, 13333, 144, 24, 29, 3, 136, 6, | 103 | { NULL, 70, 1024, 768, 13333, 144, 24, 29, 3, 136, 6, 0, |
103 | 0, FB_VMODE_NONINTERLACED | 104 | FB_VMODE_NONINTERLACED }, |
104 | }, { | 105 | |
105 | /* 1280x1024 @ 87 Hz interlaced, 51 kHz hsync */ | 106 | /* 1280x1024 @ 87 Hz interlaced, 51 kHz hsync */ |
106 | NULL, 87, 1280, 1024, 12500, 56, 16, 128, 1, 216, 12, | 107 | { NULL, 87, 1280, 1024, 12500, 56, 16, 128, 1, 216, 12, 0, |
107 | 0, FB_VMODE_INTERLACED | 108 | FB_VMODE_INTERLACED }, |
108 | }, { | 109 | |
109 | /* 800x600 @ 100 Hz, 64.02 kHz hsync */ | 110 | /* 800x600 @ 100 Hz, 64.02 kHz hsync */ |
110 | NULL, 100, 800, 600, 14357, 160, 64, 30, 4, 64, 6, | 111 | { NULL, 100, 800, 600, 14357, 160, 64, 30, 4, 64, 6, 0, |
111 | 0, FB_VMODE_NONINTERLACED | 112 | FB_VMODE_NONINTERLACED }, |
112 | }, { | 113 | |
113 | /* 1024x768 @ 76 Hz, 62.5 kHz hsync */ | 114 | /* 1024x768 @ 76 Hz, 62.5 kHz hsync */ |
114 | NULL, 76, 1024, 768, 11764, 208, 8, 36, 16, 120, 3, | 115 | { NULL, 76, 1024, 768, 11764, 208, 8, 36, 16, 120, 3, 0, |
115 | 0, FB_VMODE_NONINTERLACED | 116 | FB_VMODE_NONINTERLACED }, |
116 | }, { | 117 | |
117 | /* 1152x864 @ 70 Hz, 62.4 kHz hsync */ | 118 | /* 1152x864 @ 70 Hz, 62.4 kHz hsync */ |
118 | NULL, 70, 1152, 864, 10869, 106, 56, 20, 1, 160, 10, | 119 | { NULL, 70, 1152, 864, 10869, 106, 56, 20, 1, 160, 10, 0, |
119 | 0, FB_VMODE_NONINTERLACED | 120 | FB_VMODE_NONINTERLACED }, |
120 | }, { | 121 | |
121 | /* 1280x1024 @ 61 Hz, 64.2 kHz hsync */ | 122 | /* 1280x1024 @ 61 Hz, 64.2 kHz hsync */ |
122 | NULL, 61, 1280, 1024, 9090, 200, 48, 26, 1, 184, 3, | 123 | { NULL, 61, 1280, 1024, 9090, 200, 48, 26, 1, 184, 3, 0, |
123 | 0, FB_VMODE_NONINTERLACED | 124 | FB_VMODE_NONINTERLACED }, |
124 | }, { | 125 | |
125 | /* 1400x1050 @ 60Hz, 63.9 kHz hsync */ | 126 | /* 1400x1050 @ 60Hz, 63.9 kHz hsync */ |
126 | NULL, 60, 1400, 1050, 9259, 136, 40, 13, 1, 112, 3, | 127 | { NULL, 60, 1400, 1050, 9259, 136, 40, 13, 1, 112, 3, 0, |
127 | 0, FB_VMODE_NONINTERLACED | 128 | FB_VMODE_NONINTERLACED }, |
128 | }, { | 129 | |
129 | /* 1400x1050 @ 75,107 Hz, 82,392 kHz +hsync +vsync*/ | 130 | /* 1400x1050 @ 75,107 Hz, 82,392 kHz +hsync +vsync*/ |
130 | NULL, 75, 1400, 1050, 7190, 120, 56, 23, 10, 112, 13, | 131 | { NULL, 75, 1400, 1050, 7190, 120, 56, 23, 10, 112, 13, |
131 | FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED | 132 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
132 | }, { | 133 | FB_VMODE_NONINTERLACED }, |
134 | |||
133 | /* 1400x1050 @ 60 Hz, ? kHz +hsync +vsync*/ | 135 | /* 1400x1050 @ 60 Hz, ? kHz +hsync +vsync*/ |
134 | NULL, 60, 1400, 1050, 9259, 128, 40, 12, 0, 112, 3, | 136 | { NULL, 60, 1400, 1050, 9259, 128, 40, 12, 0, 112, 3, |
135 | FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED | 137 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
136 | }, { | 138 | FB_VMODE_NONINTERLACED }, |
139 | |||
137 | /* 1024x768 @ 85 Hz, 70.24 kHz hsync */ | 140 | /* 1024x768 @ 85 Hz, 70.24 kHz hsync */ |
138 | NULL, 85, 1024, 768, 10111, 192, 32, 34, 14, 160, 6, | 141 | { NULL, 85, 1024, 768, 10111, 192, 32, 34, 14, 160, 6, 0, |
139 | 0, FB_VMODE_NONINTERLACED | 142 | FB_VMODE_NONINTERLACED }, |
140 | }, { | 143 | |
141 | /* 1152x864 @ 78 Hz, 70.8 kHz hsync */ | 144 | /* 1152x864 @ 78 Hz, 70.8 kHz hsync */ |
142 | NULL, 78, 1152, 864, 9090, 228, 88, 32, 0, 84, 12, | 145 | { NULL, 78, 1152, 864, 9090, 228, 88, 32, 0, 84, 12, 0, |
143 | 0, FB_VMODE_NONINTERLACED | 146 | FB_VMODE_NONINTERLACED }, |
144 | }, { | 147 | |
145 | /* 1280x1024 @ 70 Hz, 74.59 kHz hsync */ | 148 | /* 1280x1024 @ 70 Hz, 74.59 kHz hsync */ |
146 | NULL, 70, 1280, 1024, 7905, 224, 32, 28, 8, 160, 8, | 149 | { NULL, 70, 1280, 1024, 7905, 224, 32, 28, 8, 160, 8, 0, |
147 | 0, FB_VMODE_NONINTERLACED | 150 | FB_VMODE_NONINTERLACED }, |
148 | }, { | 151 | |
149 | /* 1600x1200 @ 60Hz, 75.00 kHz hsync */ | 152 | /* 1600x1200 @ 60Hz, 75.00 kHz hsync */ |
150 | NULL, 60, 1600, 1200, 6172, 304, 64, 46, 1, 192, 3, | 153 | { NULL, 60, 1600, 1200, 6172, 304, 64, 46, 1, 192, 3, |
151 | FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED | 154 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
152 | }, { | 155 | FB_VMODE_NONINTERLACED }, |
156 | |||
153 | /* 1152x864 @ 84 Hz, 76.0 kHz hsync */ | 157 | /* 1152x864 @ 84 Hz, 76.0 kHz hsync */ |
154 | NULL, 84, 1152, 864, 7407, 184, 312, 32, 0, 128, 12, | 158 | { NULL, 84, 1152, 864, 7407, 184, 312, 32, 0, 128, 12, 0, |
155 | 0, FB_VMODE_NONINTERLACED | 159 | FB_VMODE_NONINTERLACED }, |
156 | }, { | 160 | |
157 | /* 1280x1024 @ 74 Hz, 78.85 kHz hsync */ | 161 | /* 1280x1024 @ 74 Hz, 78.85 kHz hsync */ |
158 | NULL, 74, 1280, 1024, 7407, 256, 32, 34, 3, 144, 3, | 162 | { NULL, 74, 1280, 1024, 7407, 256, 32, 34, 3, 144, 3, 0, |
159 | 0, FB_VMODE_NONINTERLACED | 163 | FB_VMODE_NONINTERLACED }, |
160 | }, { | 164 | |
161 | /* 1024x768 @ 100Hz, 80.21 kHz hsync */ | 165 | /* 1024x768 @ 100Hz, 80.21 kHz hsync */ |
162 | NULL, 100, 1024, 768, 8658, 192, 32, 21, 3, 192, 10, | 166 | { NULL, 100, 1024, 768, 8658, 192, 32, 21, 3, 192, 10, 0, |
163 | 0, FB_VMODE_NONINTERLACED | 167 | FB_VMODE_NONINTERLACED }, |
164 | }, { | 168 | |
165 | /* 1280x1024 @ 76 Hz, 81.13 kHz hsync */ | 169 | /* 1280x1024 @ 76 Hz, 81.13 kHz hsync */ |
166 | NULL, 76, 1280, 1024, 7407, 248, 32, 34, 3, 104, 3, | 170 | { NULL, 76, 1280, 1024, 7407, 248, 32, 34, 3, 104, 3, 0, |
167 | 0, FB_VMODE_NONINTERLACED | 171 | FB_VMODE_NONINTERLACED }, |
168 | }, { | 172 | |
169 | /* 1600x1200 @ 70 Hz, 87.50 kHz hsync */ | 173 | /* 1600x1200 @ 70 Hz, 87.50 kHz hsync */ |
170 | NULL, 70, 1600, 1200, 5291, 304, 64, 46, 1, 192, 3, | 174 | { NULL, 70, 1600, 1200, 5291, 304, 64, 46, 1, 192, 3, 0, |
171 | 0, FB_VMODE_NONINTERLACED | 175 | FB_VMODE_NONINTERLACED }, |
172 | }, { | 176 | |
173 | /* 1152x864 @ 100 Hz, 89.62 kHz hsync */ | 177 | /* 1152x864 @ 100 Hz, 89.62 kHz hsync */ |
174 | NULL, 100, 1152, 864, 7264, 224, 32, 17, 2, 128, 19, | 178 | { NULL, 100, 1152, 864, 7264, 224, 32, 17, 2, 128, 19, 0, |
175 | 0, FB_VMODE_NONINTERLACED | 179 | FB_VMODE_NONINTERLACED }, |
176 | }, { | 180 | |
177 | /* 1280x1024 @ 85 Hz, 91.15 kHz hsync */ | 181 | /* 1280x1024 @ 85 Hz, 91.15 kHz hsync */ |
178 | NULL, 85, 1280, 1024, 6349, 224, 64, 44, 1, 160, 3, | 182 | { NULL, 85, 1280, 1024, 6349, 224, 64, 44, 1, 160, 3, |
179 | FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED | 183 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
180 | }, { | 184 | FB_VMODE_NONINTERLACED }, |
185 | |||
181 | /* 1600x1200 @ 75 Hz, 93.75 kHz hsync */ | 186 | /* 1600x1200 @ 75 Hz, 93.75 kHz hsync */ |
182 | NULL, 75, 1600, 1200, 4938, 304, 64, 46, 1, 192, 3, | 187 | { NULL, 75, 1600, 1200, 4938, 304, 64, 46, 1, 192, 3, |
183 | FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED | 188 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
184 | }, { | 189 | FB_VMODE_NONINTERLACED }, |
190 | |||
185 | /* 1680x1050 @ 60 Hz, 65.191 kHz hsync */ | 191 | /* 1680x1050 @ 60 Hz, 65.191 kHz hsync */ |
186 | NULL, 60, 1680, 1050, 6848, 280, 104, 30, 3, 176, 6, | 192 | { NULL, 60, 1680, 1050, 6848, 280, 104, 30, 3, 176, 6, |
187 | FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED | 193 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
188 | }, { | 194 | FB_VMODE_NONINTERLACED }, |
195 | |||
189 | /* 1600x1200 @ 85 Hz, 105.77 kHz hsync */ | 196 | /* 1600x1200 @ 85 Hz, 105.77 kHz hsync */ |
190 | NULL, 85, 1600, 1200, 4545, 272, 16, 37, 4, 192, 3, | 197 | { NULL, 85, 1600, 1200, 4545, 272, 16, 37, 4, 192, 3, |
191 | FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED | 198 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
192 | }, { | 199 | FB_VMODE_NONINTERLACED }, |
200 | |||
193 | /* 1280x1024 @ 100 Hz, 107.16 kHz hsync */ | 201 | /* 1280x1024 @ 100 Hz, 107.16 kHz hsync */ |
194 | NULL, 100, 1280, 1024, 5502, 256, 32, 26, 7, 128, 15, | 202 | { NULL, 100, 1280, 1024, 5502, 256, 32, 26, 7, 128, 15, 0, |
195 | 0, FB_VMODE_NONINTERLACED | 203 | FB_VMODE_NONINTERLACED }, |
196 | }, { | 204 | |
197 | /* 1800x1440 @ 64Hz, 96.15 kHz hsync */ | 205 | /* 1800x1440 @ 64Hz, 96.15 kHz hsync */ |
198 | NULL, 64, 1800, 1440, 4347, 304, 96, 46, 1, 192, 3, | 206 | { NULL, 64, 1800, 1440, 4347, 304, 96, 46, 1, 192, 3, |
199 | FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED | 207 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
200 | }, { | 208 | FB_VMODE_NONINTERLACED }, |
209 | |||
201 | /* 1800x1440 @ 70Hz, 104.52 kHz hsync */ | 210 | /* 1800x1440 @ 70Hz, 104.52 kHz hsync */ |
202 | NULL, 70, 1800, 1440, 4000, 304, 96, 46, 1, 192, 3, | 211 | { NULL, 70, 1800, 1440, 4000, 304, 96, 46, 1, 192, 3, |
203 | FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED | 212 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
204 | }, { | 213 | FB_VMODE_NONINTERLACED }, |
214 | |||
205 | /* 512x384 @ 78 Hz, 31.50 kHz hsync */ | 215 | /* 512x384 @ 78 Hz, 31.50 kHz hsync */ |
206 | NULL, 78, 512, 384, 49603, 48, 16, 16, 1, 64, 3, | 216 | { NULL, 78, 512, 384, 49603, 48, 16, 16, 1, 64, 3, 0, |
207 | 0, FB_VMODE_NONINTERLACED | 217 | FB_VMODE_NONINTERLACED }, |
208 | }, { | 218 | |
209 | /* 512x384 @ 85 Hz, 34.38 kHz hsync */ | 219 | /* 512x384 @ 85 Hz, 34.38 kHz hsync */ |
210 | NULL, 85, 512, 384, 45454, 48, 16, 16, 1, 64, 3, | 220 | { NULL, 85, 512, 384, 45454, 48, 16, 16, 1, 64, 3, 0, |
211 | 0, FB_VMODE_NONINTERLACED | 221 | FB_VMODE_NONINTERLACED }, |
212 | }, { | 222 | |
213 | /* 320x200 @ 70 Hz, 31.5 kHz hsync, 8:5 aspect ratio */ | 223 | /* 320x200 @ 70 Hz, 31.5 kHz hsync, 8:5 aspect ratio */ |
214 | NULL, 70, 320, 200, 79440, 16, 16, 20, 4, 48, 1, | 224 | { NULL, 70, 320, 200, 79440, 16, 16, 20, 4, 48, 1, 0, |
215 | 0, FB_VMODE_DOUBLE | 225 | FB_VMODE_DOUBLE }, |
216 | }, { | 226 | |
217 | /* 320x240 @ 60 Hz, 31.5 kHz hsync, 4:3 aspect ratio */ | 227 | /* 320x240 @ 60 Hz, 31.5 kHz hsync, 4:3 aspect ratio */ |
218 | NULL, 60, 320, 240, 79440, 16, 16, 16, 5, 48, 1, | 228 | { NULL, 60, 320, 240, 79440, 16, 16, 16, 5, 48, 1, 0, |
219 | 0, FB_VMODE_DOUBLE | 229 | FB_VMODE_DOUBLE }, |
220 | }, { | 230 | |
221 | /* 320x240 @ 72 Hz, 36.5 kHz hsync */ | 231 | /* 320x240 @ 72 Hz, 36.5 kHz hsync */ |
222 | NULL, 72, 320, 240, 63492, 16, 16, 16, 4, 48, 2, | 232 | { NULL, 72, 320, 240, 63492, 16, 16, 16, 4, 48, 2, 0, |
223 | 0, FB_VMODE_DOUBLE | 233 | FB_VMODE_DOUBLE }, |
224 | }, { | 234 | |
225 | /* 400x300 @ 56 Hz, 35.2 kHz hsync, 4:3 aspect ratio */ | 235 | /* 400x300 @ 56 Hz, 35.2 kHz hsync, 4:3 aspect ratio */ |
226 | NULL, 56, 400, 300, 55555, 64, 16, 10, 1, 32, 1, | 236 | { NULL, 56, 400, 300, 55555, 64, 16, 10, 1, 32, 1, 0, |
227 | 0, FB_VMODE_DOUBLE | 237 | FB_VMODE_DOUBLE }, |
228 | }, { | 238 | |
229 | /* 400x300 @ 60 Hz, 37.8 kHz hsync */ | 239 | /* 400x300 @ 60 Hz, 37.8 kHz hsync */ |
230 | NULL, 60, 400, 300, 50000, 48, 16, 11, 1, 64, 2, | 240 | { NULL, 60, 400, 300, 50000, 48, 16, 11, 1, 64, 2, 0, |
231 | 0, FB_VMODE_DOUBLE | 241 | FB_VMODE_DOUBLE }, |
232 | }, { | 242 | |
233 | /* 400x300 @ 72 Hz, 48.0 kHz hsync */ | 243 | /* 400x300 @ 72 Hz, 48.0 kHz hsync */ |
234 | NULL, 72, 400, 300, 40000, 32, 24, 11, 19, 64, 3, | 244 | { NULL, 72, 400, 300, 40000, 32, 24, 11, 19, 64, 3, 0, |
235 | 0, FB_VMODE_DOUBLE | 245 | FB_VMODE_DOUBLE }, |
236 | }, { | 246 | |
237 | /* 480x300 @ 56 Hz, 35.2 kHz hsync, 8:5 aspect ratio */ | 247 | /* 480x300 @ 56 Hz, 35.2 kHz hsync, 8:5 aspect ratio */ |
238 | NULL, 56, 480, 300, 46176, 80, 16, 10, 1, 40, 1, | 248 | { NULL, 56, 480, 300, 46176, 80, 16, 10, 1, 40, 1, 0, |
239 | 0, FB_VMODE_DOUBLE | 249 | FB_VMODE_DOUBLE }, |
240 | }, { | 250 | |
241 | /* 480x300 @ 60 Hz, 37.8 kHz hsync */ | 251 | /* 480x300 @ 60 Hz, 37.8 kHz hsync */ |
242 | NULL, 60, 480, 300, 41858, 56, 16, 11, 1, 80, 2, | 252 | { NULL, 60, 480, 300, 41858, 56, 16, 11, 1, 80, 2, 0, |
243 | 0, FB_VMODE_DOUBLE | 253 | FB_VMODE_DOUBLE }, |
244 | }, { | 254 | |
245 | /* 480x300 @ 63 Hz, 39.6 kHz hsync */ | 255 | /* 480x300 @ 63 Hz, 39.6 kHz hsync */ |
246 | NULL, 63, 480, 300, 40000, 56, 16, 11, 1, 80, 2, | 256 | { NULL, 63, 480, 300, 40000, 56, 16, 11, 1, 80, 2, 0, |
247 | 0, FB_VMODE_DOUBLE | 257 | FB_VMODE_DOUBLE }, |
248 | }, { | 258 | |
249 | /* 480x300 @ 72 Hz, 48.0 kHz hsync */ | 259 | /* 480x300 @ 72 Hz, 48.0 kHz hsync */ |
250 | NULL, 72, 480, 300, 33386, 40, 24, 11, 19, 80, 3, | 260 | { NULL, 72, 480, 300, 33386, 40, 24, 11, 19, 80, 3, 0, |
251 | 0, FB_VMODE_DOUBLE | 261 | FB_VMODE_DOUBLE }, |
252 | }, { | 262 | |
253 | /* 1920x1200 @ 60 Hz, 74.5 Khz hsync */ | 263 | /* 1920x1200 @ 60 Hz, 74.5 Khz hsync */ |
254 | NULL, 60, 1920, 1200, 5177, 128, 336, 1, 38, 208, 3, | 264 | { NULL, 60, 1920, 1200, 5177, 128, 336, 1, 38, 208, 3, |
255 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, | 265 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
256 | FB_VMODE_NONINTERLACED | 266 | FB_VMODE_NONINTERLACED }, |
257 | }, { | 267 | |
258 | /* 1152x768, 60 Hz, PowerBook G4 Titanium I and II */ | 268 | /* 1152x768, 60 Hz, PowerBook G4 Titanium I and II */ |
259 | NULL, 60, 1152, 768, 14047, 158, 26, 29, 3, 136, 6, | 269 | { NULL, 60, 1152, 768, 14047, 158, 26, 29, 3, 136, 6, |
260 | FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED | 270 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
261 | }, { | 271 | FB_VMODE_NONINTERLACED }, |
272 | |||
262 | /* 1366x768, 60 Hz, 47.403 kHz hsync, WXGA 16:9 aspect ratio */ | 273 | /* 1366x768, 60 Hz, 47.403 kHz hsync, WXGA 16:9 aspect ratio */ |
263 | NULL, 60, 1366, 768, 13806, 120, 10, 14, 3, 32, 5, | 274 | { NULL, 60, 1366, 768, 13806, 120, 10, 14, 3, 32, 5, 0, |
264 | 0, FB_VMODE_NONINTERLACED | 275 | FB_VMODE_NONINTERLACED }, |
265 | }, { | 276 | |
266 | /* 1280x800, 60 Hz, 47.403 kHz hsync, WXGA 16:10 aspect ratio */ | 277 | /* 1280x800, 60 Hz, 47.403 kHz hsync, WXGA 16:10 aspect ratio */ |
267 | NULL, 60, 1280, 800, 12048, 200, 64, 24, 1, 136, 3, | 278 | { NULL, 60, 1280, 800, 12048, 200, 64, 24, 1, 136, 3, 0, |
268 | 0, FB_VMODE_NONINTERLACED | 279 | FB_VMODE_NONINTERLACED }, |
269 | }, { | 280 | |
270 | /* 720x576i @ 50 Hz, 15.625 kHz hsync (PAL RGB) */ | 281 | /* 720x576i @ 50 Hz, 15.625 kHz hsync (PAL RGB) */ |
271 | NULL, 50, 720, 576, 74074, 64, 16, 39, 5, 64, 5, | 282 | { NULL, 50, 720, 576, 74074, 64, 16, 39, 5, 64, 5, 0, |
272 | 0, FB_VMODE_INTERLACED | 283 | FB_VMODE_INTERLACED }, |
273 | }, { | 284 | |
274 | /* 800x520i @ 50 Hz, 15.625 kHz hsync (PAL RGB) */ | 285 | /* 800x520i @ 50 Hz, 15.625 kHz hsync (PAL RGB) */ |
275 | NULL, 50, 800, 520, 58823, 144, 64, 72, 28, 80, 5, | 286 | { NULL, 50, 800, 520, 58823, 144, 64, 72, 28, 80, 5, 0, |
276 | 0, FB_VMODE_INTERLACED | 287 | FB_VMODE_INTERLACED }, |
277 | }, { | 288 | |
278 | /* 864x480 @ 60 Hz, 35.15 kHz hsync */ | 289 | /* 864x480 @ 60 Hz, 35.15 kHz hsync */ |
279 | NULL, 60, 864, 480, 27777, 1, 1, 1, 1, 0, 0, | 290 | { NULL, 60, 864, 480, 27777, 1, 1, 1, 1, 0, 0, |
280 | 0, FB_VMODE_NONINTERLACED | 291 | 0, FB_VMODE_NONINTERLACED }, |
281 | }, | ||
282 | }; | 292 | }; |
283 | 293 | ||
284 | #ifdef CONFIG_FB_MODE_HELPERS | 294 | #ifdef CONFIG_FB_MODE_HELPERS |
285 | const struct fb_videomode cea_modes[64] = { | 295 | const struct fb_videomode cea_modes[64] = { |
286 | /* #1: 640x480p@59.94/60Hz */ | 296 | /* #1: 640x480p@59.94/60Hz */ |
287 | [1] = { | 297 | [1] = { |
288 | NULL, 60, 640, 480, 39722, 48, 16, 33, 10, 96, 2, 0, FB_VMODE_NONINTERLACED, 0, | 298 | NULL, 60, 640, 480, 39722, 48, 16, 33, 10, 96, 2, 0, |
299 | FB_VMODE_NONINTERLACED, 0, | ||
289 | }, | 300 | }, |
290 | /* #3: 720x480p@59.94/60Hz */ | 301 | /* #3: 720x480p@59.94/60Hz */ |
291 | [3] = { | 302 | [3] = { |
292 | NULL, 60, 720, 480, 37037, 60, 16, 30, 9, 62, 6, 0, FB_VMODE_NONINTERLACED, 0, | 303 | NULL, 60, 720, 480, 37037, 60, 16, 30, 9, 62, 6, 0, |
304 | FB_VMODE_NONINTERLACED, 0, | ||
293 | }, | 305 | }, |
294 | /* #5: 1920x1080i@59.94/60Hz */ | 306 | /* #5: 1920x1080i@59.94/60Hz */ |
295 | [5] = { | 307 | [5] = { |
296 | NULL, 60, 1920, 1080, 13763, 148, 88, 15, 2, 44, 5, | 308 | NULL, 60, 1920, 1080, 13763, 148, 88, 15, 2, 44, 5, |
297 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_INTERLACED, 0, | 309 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
310 | FB_VMODE_INTERLACED, 0, | ||
298 | }, | 311 | }, |
299 | /* #7: 720(1440)x480iH@59.94/60Hz */ | 312 | /* #7: 720(1440)x480iH@59.94/60Hz */ |
300 | [7] = { | 313 | [7] = { |
301 | NULL, 60, 1440, 480, 18554/*37108*/, 114, 38, 15, 4, 124, 3, 0, FB_VMODE_INTERLACED, 0, | 314 | NULL, 60, 1440, 480, 18554/*37108*/, 114, 38, 15, 4, 124, 3, 0, |
315 | FB_VMODE_INTERLACED, 0, | ||
302 | }, | 316 | }, |
303 | /* #9: 720(1440)x240pH@59.94/60Hz */ | 317 | /* #9: 720(1440)x240pH@59.94/60Hz */ |
304 | [9] = { | 318 | [9] = { |
305 | NULL, 60, 1440, 240, 18554, 114, 38, 16, 4, 124, 3, 0, FB_VMODE_NONINTERLACED, 0, | 319 | NULL, 60, 1440, 240, 18554, 114, 38, 16, 4, 124, 3, 0, |
320 | FB_VMODE_NONINTERLACED, 0, | ||
306 | }, | 321 | }, |
307 | /* #18: 720x576pH@50Hz */ | 322 | /* #18: 720x576pH@50Hz */ |
308 | [18] = { | 323 | [18] = { |
309 | NULL, 50, 720, 576, 37037, 68, 12, 39, 5, 64, 5, 0, FB_VMODE_NONINTERLACED, 0, | 324 | NULL, 50, 720, 576, 37037, 68, 12, 39, 5, 64, 5, 0, |
325 | FB_VMODE_NONINTERLACED, 0, | ||
310 | }, | 326 | }, |
311 | /* #19: 1280x720p@50Hz */ | 327 | /* #19: 1280x720p@50Hz */ |
312 | [19] = { | 328 | [19] = { |
313 | NULL, 50, 1280, 720, 13468, 220, 440, 20, 5, 40, 5, | 329 | NULL, 50, 1280, 720, 13468, 220, 440, 20, 5, 40, 5, |
314 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, 0, | 330 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
331 | FB_VMODE_NONINTERLACED, 0, | ||
315 | }, | 332 | }, |
316 | /* #20: 1920x1080i@50Hz */ | 333 | /* #20: 1920x1080i@50Hz */ |
317 | [20] = { | 334 | [20] = { |
318 | NULL, 50, 1920, 1080, 13480, 148, 528, 15, 5, 528, 5, | 335 | NULL, 50, 1920, 1080, 13480, 148, 528, 15, 5, 528, 5, |
319 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_INTERLACED, 0, | 336 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
337 | FB_VMODE_INTERLACED, 0, | ||
320 | }, | 338 | }, |
321 | /* #32: 1920x1080p@23.98/24Hz */ | 339 | /* #32: 1920x1080p@23.98/24Hz */ |
322 | [32] = { | 340 | [32] = { |
323 | NULL, 24, 1920, 1080, 13468, 148, 638, 36, 4, 44, 5, | 341 | NULL, 24, 1920, 1080, 13468, 148, 638, 36, 4, 44, 5, |
324 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, 0, | 342 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
343 | FB_VMODE_NONINTERLACED, 0, | ||
325 | }, | 344 | }, |
326 | /* #35: (2880)x480p4x@59.94/60Hz */ | 345 | /* #35: (2880)x480p4x@59.94/60Hz */ |
327 | [35] = { | 346 | [35] = { |
328 | NULL, 60, 2880, 480, 9250, 240, 64, 30, 9, 248, 6, 0, FB_VMODE_NONINTERLACED, 0, | 347 | NULL, 60, 2880, 480, 9250, 240, 64, 30, 9, 248, 6, 0, |
348 | FB_VMODE_NONINTERLACED, 0, | ||
329 | }, | 349 | }, |
330 | }; | 350 | }; |
331 | 351 | ||
@@ -340,10 +360,10 @@ const struct fb_videomode vesa_modes[] = { | |||
340 | { NULL, 85, 721, 400, 28169, 108, 36, 42, 01, 72, 3, | 360 | { NULL, 85, 721, 400, 28169, 108, 36, 42, 01, 72, 3, |
341 | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA }, | 361 | FB_SYNC_VERT_HIGH_ACT, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA }, |
342 | /* 3 640x480-60 VESA */ | 362 | /* 3 640x480-60 VESA */ |
343 | { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2, | 363 | { NULL, 60, 640, 480, 39682, 48, 16, 33, 10, 96, 2, |
344 | 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA }, | 364 | 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA }, |
345 | /* 4 640x480-72 VESA */ | 365 | /* 4 640x480-72 VESA */ |
346 | { NULL, 72, 640, 480, 31746, 128, 24, 29, 9, 40, 2, | 366 | { NULL, 72, 640, 480, 31746, 128, 24, 29, 9, 40, 2, |
347 | 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA }, | 367 | 0, FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA }, |
348 | /* 5 640x480-75 VESA */ | 368 | /* 5 640x480-75 VESA */ |
349 | { NULL, 75, 640, 480, 31746, 120, 16, 16, 01, 64, 3, | 369 | { NULL, 75, 640, 480, 31746, 120, 16, 16, 01, 64, 3, |
@@ -426,7 +446,7 @@ const struct fb_videomode vesa_modes[] = { | |||
426 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, | 446 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
427 | FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA }, | 447 | FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA }, |
428 | /* 26 1600x1200-75 VESA */ | 448 | /* 26 1600x1200-75 VESA */ |
429 | { NULL, 75, 1600, 1200, 4938, 304, 64, 46, 1, 192, 3, | 449 | { NULL, 75, 1600, 1200, 4938, 304, 64, 46, 1, 192, 3, |
430 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, | 450 | FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT, |
431 | FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA }, | 451 | FB_VMODE_NONINTERLACED, FB_MODE_IS_VESA }, |
432 | /* 27 1600x1200-85 VESA */ | 452 | /* 27 1600x1200-85 VESA */ |