提交 4e591ac6 编写于 作者: P Pawel Osciak 提交者: Linus Torvalds

s3c-fb: separate S5PC100 and S5PV210 framebuffer driver data structures

S5PC100 and S5PV210 framebuffer devices differ slightly in terms of
available registers and their driver data structures have to be separate.
Those differences include dissimilar ways to control shadow register
updates.
Signed-off-by: NPawel Osciak <p.osciak@samsung.com>
Signed-off-by: NKyungmin Park <kyungmin.park@samsung.com>
Cc: InKi Dae <inki.dae@samsung.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Cc: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
上级 9fa424a4
...@@ -1251,7 +1251,35 @@ static struct s3c_fb_driverdata s3c_fb_data_64xx __devinitdata = { ...@@ -1251,7 +1251,35 @@ static struct s3c_fb_driverdata s3c_fb_data_64xx __devinitdata = {
.win[4] = &s3c_fb_data_64xx_wins[4], .win[4] = &s3c_fb_data_64xx_wins[4],
}; };
static struct s3c_fb_driverdata s3c_fb_data_s5p __devinitdata = { static struct s3c_fb_driverdata s3c_fb_data_s5pc100 __devinitdata = {
.variant = {
.nr_windows = 5,
.vidtcon = VIDTCON0,
.wincon = WINCON(0),
.winmap = WINxMAP(0),
.keycon = WKEYCON,
.osd = VIDOSD_BASE,
.osd_stride = 16,
.buf_start = VIDW_BUF_START(0),
.buf_size = VIDW_BUF_SIZE(0),
.buf_end = VIDW_BUF_END(0),
.palette = {
[0] = 0x2400,
[1] = 0x2800,
[2] = 0x2c00,
[3] = 0x3000,
[4] = 0x3400,
},
},
.win[0] = &s3c_fb_data_64xx_wins[0],
.win[1] = &s3c_fb_data_64xx_wins[1],
.win[2] = &s3c_fb_data_64xx_wins[2],
.win[3] = &s3c_fb_data_64xx_wins[3],
.win[4] = &s3c_fb_data_64xx_wins[4],
};
static struct s3c_fb_driverdata s3c_fb_data_s5pv210 __devinitdata = {
.variant = { .variant = {
.nr_windows = 5, .nr_windows = 5,
.vidtcon = VIDTCON0, .vidtcon = VIDTCON0,
...@@ -1319,8 +1347,11 @@ static struct platform_device_id s3c_fb_driver_ids[] = { ...@@ -1319,8 +1347,11 @@ static struct platform_device_id s3c_fb_driver_ids[] = {
.name = "s3c-fb", .name = "s3c-fb",
.driver_data = (unsigned long)&s3c_fb_data_64xx, .driver_data = (unsigned long)&s3c_fb_data_64xx,
}, { }, {
.name = "s5p-fb", .name = "s5pc100-fb",
.driver_data = (unsigned long)&s3c_fb_data_s5p, .driver_data = (unsigned long)&s3c_fb_data_s5pc100,
}, {
.name = "s5pv210-fb",
.driver_data = (unsigned long)&s3c_fb_data_s5pv210,
}, { }, {
.name = "s3c2443-fb", .name = "s3c2443-fb",
.driver_data = (unsigned long)&s3c_fb_data_s3c2443, .driver_data = (unsigned long)&s3c_fb_data_s3c2443,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册