From: Pawel Osciak <p.osciak@samsung.com>
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 10/19] s3c-fb: Separate S5PC100 and S5PV210 framebuffer driver
Date: Fri, 09 Jul 2010 08:49:58 +0000 [thread overview]
Message-ID: <1278665407-18002-11-git-send-email-p.osciak@samsung.com> (raw)
In-Reply-To: <1278665407-18002-1-git-send-email-p.osciak@samsung.com>
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: Pawel Osciak <p.osciak@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
---
drivers/video/s3c-fb.c | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
index 77f5765..5f931b4 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 = {
.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 = {
.nr_windows = 5,
.vidtcon = VIDTCON0,
@@ -1319,8 +1347,11 @@ static struct platform_device_id s3c_fb_driver_ids[] = {
.name = "s3c-fb",
.driver_data = (unsigned long)&s3c_fb_data_64xx,
}, {
- .name = "s5p-fb",
- .driver_data = (unsigned long)&s3c_fb_data_s5p,
+ .name = "s5pc100-fb",
+ .driver_data = (unsigned long)&s3c_fb_data_s5pc100,
+ }, {
+ .name = "s5pv210-fb",
+ .driver_data = (unsigned long)&s3c_fb_data_s5pv210,
}, {
.name = "s3c2443-fb",
.driver_data = (unsigned long)&s3c_fb_data_s3c2443,
--
1.7.1.569.g6f426
next prev parent reply other threads:[~2010-07-09 8:49 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-09 8:49 [PATCH v4 0/19] Various s3c-fb updates Pawel Osciak
2010-07-09 8:49 ` [PATCH 01/19] s3c-fb: Change to depending on CONFIG_S3C_FB_DEV Pawel Osciak
2010-07-09 11:33 ` Kukjin Kim
2010-07-09 11:55 ` Pawel Osciak
2010-07-09 8:49 ` [PATCH 02/19] s3c-fb: add default window feature Pawel Osciak
2010-07-09 8:49 ` [PATCH 03/19] s3c-fb: fixed distortedness situation for the mode more Pawel Osciak
2010-07-09 8:49 ` [PATCH 04/19] s3c-fb: only init window colour key controls for windows Pawel Osciak
2010-07-09 8:49 ` [PATCH 05/19] s3c-fb: Initial move to unifying the header files Pawel Osciak
2010-07-09 8:49 ` [PATCH 06/19] s3c-fb: udpate to support s3c2416/s3c2443 style hardware Pawel Osciak
2010-07-09 8:49 ` [PATCH 07/19] s3c-fb: Integrate palette setup code into main driver Pawel Osciak
2010-07-09 8:49 ` [PATCH 08/19] s3c-fb: Fix various null references on framebuffer Pawel Osciak
2010-07-09 8:49 ` [PATCH 09/19] s3c-fb: Correct FRAMESEL1 bitfield defines for Pawel Osciak
2010-07-09 8:49 ` Pawel Osciak [this message]
2010-07-09 8:49 ` [PATCH 11/19] s3c-fb: Add device name initialization Pawel Osciak
2010-07-09 8:50 ` [PATCH 12/19] s3c-fb: Add support for display panning Pawel Osciak
2010-07-09 8:50 ` [PATCH 13/19] s3c-fb: Add wait for VSYNC ioctl Pawel Osciak
2010-07-09 8:50 ` [PATCH 14/19] s3c-fb: window 3 of 64xx+ does not have an osd_d register Pawel Osciak
2010-07-09 8:50 ` [PATCH 15/19] s3c-fb: Add SHADOWCON shadow register locking support Pawel Osciak
2010-07-09 8:50 ` [PATCH 16/19] s3c-fb: Correct window osd size and alpha register Pawel Osciak
2010-07-09 8:50 ` [PATCH 17/19] s3c-fb: Protect window-specific registers during updates Pawel Osciak
2010-07-09 8:50 ` [PATCH 18/19] s3c-fb: fix section mismatch Pawel Osciak
2010-07-09 8:50 ` [PATCH 19/19] s3c-fb: Add support for DMA channel control on S5PV210 Pawel Osciak
2010-07-09 11:58 ` [PATCH v4 0/19] Various s3c-fb updates Kukjin Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1278665407-18002-11-git-send-email-p.osciak@samsung.com \
--to=p.osciak@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).