Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit ccd8c79c5608fc4835dcb0244623ceae2489f72d

Authored by Mayuresh Janorkar
Committed by Paul Mundt
1 parent 90a4815159
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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>

Showing 1 changed file with 220 additions and 200 deletions Side-by-side Diff

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