aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/s3c-fb.c37
1 files changed, 34 insertions, 3 deletions
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
index 77f576589a89..5f931b4933bd 100644
--- a/drivers/video/s3c-fb.c
+++ b/drivers/video/s3c-fb.c
@@ -1251,7 +1251,35 @@ static struct s3c_fb_driverdata s3c_fb_data_64xx __devinitdata = {
1251 .win[4] = &s3c_fb_data_64xx_wins[4], 1251 .win[4] = &s3c_fb_data_64xx_wins[4],
1252}; 1252};
1253 1253
1254static struct s3c_fb_driverdata s3c_fb_data_s5p __devinitdata = { 1254static struct s3c_fb_driverdata s3c_fb_data_s5pc100 __devinitdata = {
1255 .variant = {
1256 .nr_windows = 5,
1257 .vidtcon = VIDTCON0,
1258 .wincon = WINCON(0),
1259 .winmap = WINxMAP(0),
1260 .keycon = WKEYCON,
1261 .osd = VIDOSD_BASE,
1262 .osd_stride = 16,
1263 .buf_start = VIDW_BUF_START(0),
1264 .buf_size = VIDW_BUF_SIZE(0),
1265 .buf_end = VIDW_BUF_END(0),
1266
1267 .palette = {
1268 [0] = 0x2400,
1269 [1] = 0x2800,
1270 [2] = 0x2c00,
1271 [3] = 0x3000,
1272 [4] = 0x3400,
1273 },
1274 },
1275 .win[0] = &s3c_fb_data_64xx_wins[0],
1276 .win[1] = &s3c_fb_data_64xx_wins[1],
1277 .win[2] = &s3c_fb_data_64xx_wins[2],
1278 .win[3] = &s3c_fb_data_64xx_wins[3],
1279 .win[4] = &s3c_fb_data_64xx_wins[4],
1280};
1281
1282static struct s3c_fb_driverdata s3c_fb_data_s5pv210 __devinitdata = {
1255 .variant = { 1283 .variant = {
1256 .nr_windows = 5, 1284 .nr_windows = 5,
1257 .vidtcon = VIDTCON0, 1285 .vidtcon = VIDTCON0,
@@ -1319,8 +1347,11 @@ static struct platform_device_id s3c_fb_driver_ids[] = {
1319 .name = "s3c-fb", 1347 .name = "s3c-fb",
1320 .driver_data = (unsigned long)&s3c_fb_data_64xx, 1348 .driver_data = (unsigned long)&s3c_fb_data_64xx,
1321 }, { 1349 }, {
1322 .name = "s5p-fb", 1350 .name = "s5pc100-fb",
1323 .driver_data = (unsigned long)&s3c_fb_data_s5p, 1351 .driver_data = (unsigned long)&s3c_fb_data_s5pc100,
1352 }, {
1353 .name = "s5pv210-fb",
1354 .driver_data = (unsigned long)&s3c_fb_data_s5pv210,
1324 }, { 1355 }, {
1325 .name = "s3c2443-fb", 1356 .name = "s3c2443-fb",
1326 .driver_data = (unsigned long)&s3c_fb_data_s3c2443, 1357 .driver_data = (unsigned long)&s3c_fb_data_s3c2443,