1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
|
From 449ff8409e92f76f71baf538867f600a832f92e3 Mon Sep 17 00:00:00 2001
From: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Date: Thu, 28 May 2009 13:29:55 +0300
Subject: [PATCH 089/146] DSS2: Panel driver changes for new device model
Changes to generic, samsung and sharp panel drivers
---
drivers/video/omap2/displays/panel-generic.c | 72 ++++++++++--------
.../omap2/displays/panel-samsung-lte430wq-f0c.c | 77 ++++++++++---------
.../video/omap2/displays/panel-sharp-ls037v7dw01.c | 79 ++++++++++----------
3 files changed, 122 insertions(+), 106 deletions(-)
diff --git a/drivers/video/omap2/displays/panel-generic.c b/drivers/video/omap2/displays/panel-generic.c
index 8382acb..738147e 100644
--- a/drivers/video/omap2/displays/panel-generic.c
+++ b/drivers/video/omap2/displays/panel-generic.c
@@ -22,73 +22,81 @@
#include <mach/display.h>
-static int generic_panel_init(struct omap_display *display)
+static struct omap_video_timings generic_panel_timings = {
+ /* 640 x 480 @ 60 Hz Reduced blanking VESA CVT 0.31M3-R */
+ .x_res = 640,
+ .y_res = 480,
+ .pixel_clock = 23500,
+ .hfp = 48,
+ .hsw = 32,
+ .hbp = 80,
+ .vfp = 3,
+ .vsw = 4,
+ .vbp = 7,
+};
+
+static int generic_panel_probe(struct omap_dss_device *dssdev)
{
+ dssdev->panel.config = OMAP_DSS_LCD_TFT;
+ dssdev->panel.timings = generic_panel_timings;
+
return 0;
}
-static int generic_panel_enable(struct omap_display *display)
+static void generic_panel_remove(struct omap_dss_device *dssdev)
+{
+}
+
+static int generic_panel_enable(struct omap_dss_device *dssdev)
{
int r = 0;
- if (display->hw_config.panel_enable)
- r = display->hw_config.panel_enable(display);
+ if (dssdev->platform_enable)
+ r = dssdev->platform_enable(dssdev);
return r;
}
-static void generic_panel_disable(struct omap_display *display)
+static void generic_panel_disable(struct omap_dss_device *dssdev)
{
- if (display->hw_config.panel_disable)
- display->hw_config.panel_disable(display);
+ if (dssdev->platform_disable)
+ dssdev->platform_disable(dssdev);
}
-static int generic_panel_suspend(struct omap_display *display)
+static int generic_panel_suspend(struct omap_dss_device *dssdev)
{
- generic_panel_disable(display);
+ generic_panel_disable(dssdev);
return 0;
}
-static int generic_panel_resume(struct omap_display *display)
+static int generic_panel_resume(struct omap_dss_device *dssdev)
{
- return generic_panel_enable(display);
+ return generic_panel_enable(dssdev);
}
-static struct omap_panel generic_panel = {
- .owner = THIS_MODULE,
- .name = "panel-generic",
- .init = generic_panel_init,
+static struct omap_dss_driver generic_driver = {
+ .probe = generic_panel_probe,
+ .remove = generic_panel_remove,
+
.enable = generic_panel_enable,
.disable = generic_panel_disable,
.suspend = generic_panel_suspend,
.resume = generic_panel_resume,
- .timings = {
- /* 640 x 480 @ 60 Hz Reduced blanking VESA CVT 0.31M3-R */
- .x_res = 640,
- .y_res = 480,
- .pixel_clock = 23500,
- .hfp = 48,
- .hsw = 32,
- .hbp = 80,
- .vfp = 3,
- .vsw = 4,
- .vbp = 7,
+ .driver = {
+ .name = "generic_panel",
+ .owner = THIS_MODULE,
},
-
- .config = OMAP_DSS_LCD_TFT,
};
-
static int __init generic_panel_drv_init(void)
{
- omap_dss_register_panel(&generic_panel);
- return 0;
+ return omap_dss_register_driver(&generic_driver);
}
static void __exit generic_panel_drv_exit(void)
{
- omap_dss_unregister_panel(&generic_panel);
+ omap_dss_unregister_driver(&generic_driver);
}
module_init(generic_panel_drv_init);
diff --git a/drivers/video/omap2/displays/panel-samsung-lte430wq-f0c.c b/drivers/video/omap2/displays/panel-samsung-lte430wq-f0c.c
index e4bb781..eafe581 100644
--- a/drivers/video/omap2/displays/panel-samsung-lte430wq-f0c.c
+++ b/drivers/video/omap2/displays/panel-samsung-lte430wq-f0c.c
@@ -21,86 +21,91 @@
#include <mach/display.h>
-static int samsung_lte_panel_init(struct omap_display *display)
+static struct omap_video_timings samsung_lte_timings = {
+ .x_res = 480,
+ .y_res = 272,
+
+ .pixel_clock = 9200,
+
+ .hsw = 41,
+ .hfp = 8,
+ .hbp = 45-41,
+
+ .vsw = 10,
+ .vfp = 4,
+ .vbp = 12-10,
+};
+
+static int samsung_lte_panel_probe(struct omap_dss_device *dssdev)
{
+ dssdev->panel.config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+ OMAP_DSS_LCD_IHS;
+ dssdev->panel.timings = samsung_lte_timings;
+
return 0;
}
-static void samsung_lte_panel_cleanup(struct omap_display *display)
+static void samsung_lte_panel_remove(struct omap_dss_device *dssdev)
{
}
-static int samsung_lte_panel_enable(struct omap_display *display)
+static int samsung_lte_panel_enable(struct omap_dss_device *dssdev)
{
int r = 0;
/* wait couple of vsyncs until enabling the LCD */
msleep(50);
- if (display->hw_config.panel_enable)
- r = display->hw_config.panel_enable(display);
+ if (dssdev->platform_enable)
+ r = dssdev->platform_enable(dssdev);
return r;
}
-static void samsung_lte_panel_disable(struct omap_display *display)
+static void samsung_lte_panel_disable(struct omap_dss_device *dssdev)
{
- if (display->hw_config.panel_disable)
- display->hw_config.panel_disable(display);
+ if (dssdev->platform_disable)
+ dssdev->platform_disable(dssdev);
/* wait at least 5 vsyncs after disabling the LCD */
+
msleep(100);
}
-static int samsung_lte_panel_suspend(struct omap_display *display)
+static int samsung_lte_panel_suspend(struct omap_dss_device *dssdev)
{
- samsung_lte_panel_disable(display);
+ samsung_lte_panel_disable(dssdev);
return 0;
}
-static int samsung_lte_panel_resume(struct omap_display *display)
+static int samsung_lte_panel_resume(struct omap_dss_device *dssdev)
{
- return samsung_lte_panel_enable(display);
+ return samsung_lte_panel_enable(dssdev);
}
-static struct omap_panel samsung_lte_panel = {
- .owner = THIS_MODULE,
- .name = "samsung-lte430wq-f0c",
- .init = samsung_lte_panel_init,
- .cleanup = samsung_lte_panel_cleanup,
+static struct omap_dss_driver samsung_lte_driver = {
+ .probe = samsung_lte_panel_probe,
+ .remove = samsung_lte_panel_remove,
+
.enable = samsung_lte_panel_enable,
.disable = samsung_lte_panel_disable,
.suspend = samsung_lte_panel_suspend,
.resume = samsung_lte_panel_resume,
- .timings = {
- .x_res = 480,
- .y_res = 272,
-
- .pixel_clock = 9200,
-
- .hsw = 41,
- .hfp = 8,
- .hbp = 45-41,
-
- .vsw = 10,
- .vfp = 4,
- .vbp = 12-10,
+ .driver = {
+ .name = "samsung_lte_panel",
+ .owner = THIS_MODULE,
},
-
- .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IHS | OMAP_DSS_LCD_IVS,
};
-
static int __init samsung_lte_panel_drv_init(void)
{
- omap_dss_register_panel(&samsung_lte_panel);
- return 0;
+ return omap_dss_register_driver(&samsung_lte_driver);
}
static void __exit samsung_lte_panel_drv_exit(void)
{
- omap_dss_unregister_panel(&samsung_lte_panel);
+ omap_dss_unregister_driver(&samsung_lte_driver);
}
module_init(samsung_lte_panel_drv_init);
diff --git a/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c b/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
index 1f99150..6b93ea5 100644
--- a/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
+++ b/drivers/video/omap2/displays/panel-sharp-ls037v7dw01.c
@@ -22,89 +22,92 @@
#include <mach/display.h>
-static int sharp_ls_panel_init(struct omap_display *display)
+static struct omap_video_timings sharp_ls_timings = {
+ .x_res = 480,
+ .y_res = 640,
+
+ .pixel_clock = 19200,
+
+ .hsw = 2,
+ .hfp = 1,
+ .hbp = 28,
+
+ .vsw = 1,
+ .vfp = 1,
+ .vbp = 1,
+};
+
+static int sharp_ls_panel_probe(struct omap_dss_device *dssdev)
{
+ dssdev->panel.config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS |
+ OMAP_DSS_LCD_IHS;
+ dssdev->panel.acb = 0x28;
+ dssdev->panel.timings = sharp_ls_timings;
+
return 0;
}
-static void sharp_ls_panel_cleanup(struct omap_display *display)
+static void sharp_ls_panel_remove(struct omap_dss_device *dssdev)
{
}
-static int sharp_ls_panel_enable(struct omap_display *display)
+static int sharp_ls_panel_enable(struct omap_dss_device *dssdev)
{
int r = 0;
/* wait couple of vsyncs until enabling the LCD */
msleep(50);
- if (display->hw_config.panel_enable)
- r = display->hw_config.panel_enable(display);
+ if (dssdev->platform_enable)
+ r = dssdev->platform_enable(dssdev);
return r;
}
-static void sharp_ls_panel_disable(struct omap_display *display)
+static void sharp_ls_panel_disable(struct omap_dss_device *dssdev)
{
- if (display->hw_config.panel_disable)
- display->hw_config.panel_disable(display);
+ if (dssdev->platform_disable)
+ dssdev->platform_disable(dssdev);
/* wait at least 5 vsyncs after disabling the LCD */
msleep(100);
}
-static int sharp_ls_panel_suspend(struct omap_display *display)
+static int sharp_ls_panel_suspend(struct omap_dss_device *dssdev)
{
- sharp_ls_panel_disable(display);
+ sharp_ls_panel_disable(dssdev);
return 0;
}
-static int sharp_ls_panel_resume(struct omap_display *display)
+static int sharp_ls_panel_resume(struct omap_dss_device *dssdev)
{
- return sharp_ls_panel_enable(display);
+ return sharp_ls_panel_enable(dssdev);
}
-static struct omap_panel sharp_ls_panel = {
- .owner = THIS_MODULE,
- .name = "sharp-ls037v7dw01",
- .init = sharp_ls_panel_init,
- .cleanup = sharp_ls_panel_cleanup,
+static struct omap_dss_driver sharp_ls_driver = {
+ .probe = sharp_ls_panel_probe,
+ .remove = sharp_ls_panel_remove,
+
.enable = sharp_ls_panel_enable,
.disable = sharp_ls_panel_disable,
.suspend = sharp_ls_panel_suspend,
.resume = sharp_ls_panel_resume,
- .timings = {
- .x_res = 480,
- .y_res = 640,
-
- .pixel_clock = 19200,
-
- .hsw = 2,
- .hfp = 1,
- .hbp = 28,
-
- .vsw = 1,
- .vfp = 1,
- .vbp = 1,
+ .driver = {
+ .name = "sharp_ls_panel",
+ .owner = THIS_MODULE,
},
-
- .acb = 0x28,
-
- .config = OMAP_DSS_LCD_TFT | OMAP_DSS_LCD_IVS | OMAP_DSS_LCD_IHS,
};
-
static int __init sharp_ls_panel_drv_init(void)
{
- omap_dss_register_panel(&sharp_ls_panel);
- return 0;
+ return omap_dss_register_driver(&sharp_ls_driver);
}
static void __exit sharp_ls_panel_drv_exit(void)
{
- omap_dss_unregister_panel(&sharp_ls_panel);
+ omap_dss_unregister_driver(&sharp_ls_driver);
}
module_init(sharp_ls_panel_drv_init);
--
1.6.2.4
|
