From: "Antonino A. Daplas" <adaplas@gmail.com>
To: Andrew Morton <akpm@osdl.org>
Cc: Linux Fbdev development list
<linux-fbdev-devel@lists.sourceforge.net>,
Ben Dooks <ben-linux@fluff.org>,
"Arnaud Patard (Rtp)" <arnaud.patard@rtp-net.org>
Subject: [PATCH 14/22] s3c2410fb: remove lcdcon2 and lcdcon3 register fields
Date: Mon, 13 Aug 2007 20:38:12 +0800 [thread overview]
Message-ID: <46C050B4.6070701@gmail.com> (raw)
From: Krzysztof Helt <krzysztof.h1@wp.pl>
This patch removes unused lcdcon2 and lcdcon3 register value
from the s3c2410fb_display structure.
Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Signed-off-by: Antonino Daplas <adaplas@gmail.com>
---
arch/arm/mach-s3c2410/mach-amlm5900.c | 2 --
arch/arm/mach-s3c2410/mach-bast.c | 18 ------------------
arch/arm/mach-s3c2410/mach-h1940.c | 10 ----------
arch/arm/mach-s3c2410/mach-qt2410.c | 24 ------------------------
arch/arm/mach-s3c2440/mach-rx3715.c | 10 ----------
arch/arm/mach-s3c2440/mach-smdk2440.c | 8 --------
drivers/video/s3c2410fb.c | 8 ++------
include/asm-arm/arch-s3c2410/fb.h | 3 ---
8 files changed, 2 insertions(+), 81 deletions(-)
diff --git a/arch/arm/mach-s3c2410/mach-amlm5900.c b/arch/arm/mach-s3c2410/mach-amlm5900.c
index 4c958b7..c475422 100644
--- a/arch/arm/mach-s3c2410/mach-amlm5900.c
+++ b/arch/arm/mach-s3c2410/mach-amlm5900.c
@@ -184,8 +184,6 @@ static struct s3c2410fb_display __initda
.lower_margin = 0,
.lcdcon1 = 0x00008225,
- .lcdcon2 = 0x0027c000,
- .lcdcon4 = 0x00000002,
.lcdcon5 = 0x00000001,
};
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c
index e9c9df0..61d5b2a 100644
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -485,8 +485,6 @@ static struct s3c2410fb_display __initda
.bpp = 4,
.lcdcon1 = 0x00000176,
- .lcdcon2 = 0x1d77c7c2,
- .lcdcon4 = 0x00000057,
.lcdcon5 = 0x00014b02,
},
{
@@ -505,8 +503,6 @@ static struct s3c2410fb_display __initda
.vsync_len = 3,
.lcdcon1 = 0x00000176,
- .lcdcon2 = 0x1d77c7c2,
- .lcdcon4 = 0x00000057,
.lcdcon5 = 0x00014b02,
},
{
@@ -525,8 +521,6 @@ static struct s3c2410fb_display __initda
.vsync_len = 3,
.lcdcon1 = 0x00000176,
- .lcdcon2 = 0x1d77c7c2,
- .lcdcon4 = 0x00000057,
.lcdcon5 = 0x00014b02,
},
{
@@ -545,8 +539,6 @@ static struct s3c2410fb_display __initda
.vsync_len = 3,
.lcdcon1 = 0x00000176,
- .lcdcon2 = 0x1d77c7c2,
- .lcdcon4 = 0x00000057,
.lcdcon5 = 0x00014b02,
},
{
@@ -565,8 +557,6 @@ static struct s3c2410fb_display __initda
.vsync_len = 3,
.lcdcon1 = 0x00000176,
- .lcdcon2 = 0x1d77c7c2,
- .lcdcon4 = 0x00000057,
.lcdcon5 = 0x00014b02,
},
{
@@ -585,8 +575,6 @@ static struct s3c2410fb_display __initda
.vsync_len = 3,
.lcdcon1 = 0x00000176,
- .lcdcon2 = 0x1d77c7c2,
- .lcdcon4 = 0x00000057,
.lcdcon5 = 0x00014b02,
},
{
@@ -605,8 +593,6 @@ static struct s3c2410fb_display __initda
.vsync_len = 3,
.lcdcon1 = 0x00000176,
- .lcdcon2 = 0x1d77c7c2,
- .lcdcon4 = 0x00000057,
.lcdcon5 = 0x00014b02,
},
{
@@ -625,8 +611,6 @@ static struct s3c2410fb_display __initda
.vsync_len = 3,
.lcdcon1 = 0x00000176,
- .lcdcon2 = 0x1d77c7c2,
- .lcdcon4 = 0x00000057,
.lcdcon5 = 0x00014b02,
},
{
@@ -645,8 +629,6 @@ static struct s3c2410fb_display __initda
.vsync_len = 3,
.lcdcon1 = 0x00000176,
- .lcdcon2 = 0x1d77c7c2,
- .lcdcon4 = 0x00000057,
.lcdcon5 = 0x00014b02,
},
};
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c
index c0933b6..78dfc7d 100644
--- a/arch/arm/mach-s3c2410/mach-h1940.c
+++ b/arch/arm/mach-s3c2410/mach-h1940.c
@@ -138,14 +138,6 @@ static struct s3c2410fb_display h1940_lc
S3C2410_LCDCON1_TFT | \
S3C2410_LCDCON1_CLKVAL(0x0C),
- .lcdcon2= S3C2410_LCDCON2_VBPD(7) | \
- S3C2410_LCDCON2_LINEVAL(319) | \
- S3C2410_LCDCON2_VFPD(6) | \
- S3C2410_LCDCON2_VSPW(0),
-
- .lcdcon4= S3C2410_LCDCON4_MVAL(0) | \
- S3C2410_LCDCON4_HSPW(3),
-
.lcdcon5= S3C2410_LCDCON5_FRM565 | \
S3C2410_LCDCON5_INVVLINE | \
S3C2410_LCDCON5_HWSWP,
@@ -165,8 +157,6 @@ static struct s3c2410fb_display h1940_lc
};
static struct s3c2410fb_mach_info h1940_fb_info __initdata = {
- .fixed_syncs = 1,
-
.displays = &h1940_lcd,
.num_displays = 1,
.default_display = 0,
diff --git a/arch/arm/mach-s3c2410/mach-qt2410.c b/arch/arm/mach-s3c2410/mach-qt2410.c
index 50c0939..ac94d56 100644
--- a/arch/arm/mach-s3c2410/mach-qt2410.c
+++ b/arch/arm/mach-s3c2410/mach-qt2410.c
@@ -102,14 +102,6 @@ static struct s3c2410fb_display qt2410_l
S3C2410_LCDCON1_TFT |
S3C2410_LCDCON1_CLKVAL(0x01), /* HCLK/4 */
- .lcdcon2 = S3C2410_LCDCON2_VBPD(18) | /* 19 */
- S3C2410_LCDCON2_LINEVAL(479) |
- S3C2410_LCDCON2_VFPD(10) | /* 11 */
- S3C2410_LCDCON2_VSPW(14), /* 15 */
-
- .lcdcon4 = S3C2410_LCDCON4_MVAL(0) |
- S3C2410_LCDCON4_HSPW(95), /* 96 */
-
.lcdcon5 = S3C2410_LCDCON5_FRM565 |
S3C2410_LCDCON5_INVVLINE |
S3C2410_LCDCON5_INVVFRAME |
@@ -136,14 +128,6 @@ static struct s3c2410fb_display qt2410_l
S3C2410_LCDCON1_TFT |
S3C2410_LCDCON1_CLKVAL(0x01), /* HCLK/4 */
- .lcdcon2 = S3C2410_LCDCON2_VBPD(1) | /* 2 */
- S3C2410_LCDCON2_LINEVAL(639) |/* 640 */
- S3C2410_LCDCON2_VFPD(3) | /* 4 */
- S3C2410_LCDCON2_VSPW(1), /* 2 */
-
- .lcdcon4 = S3C2410_LCDCON4_MVAL(0) |
- S3C2410_LCDCON4_HSPW(7), /* 8 */
-
.lcdcon5 = S3C2410_LCDCON5_FRM565 |
S3C2410_LCDCON5_INVVLINE |
S3C2410_LCDCON5_INVVFRAME |
@@ -169,14 +153,6 @@ static struct s3c2410fb_display qt2410_l
S3C2410_LCDCON1_TFT |
S3C2410_LCDCON1_CLKVAL(0x04),
- .lcdcon2 = S3C2410_LCDCON2_VBPD(1) |
- S3C2410_LCDCON2_LINEVAL(319) |
- S3C2410_LCDCON2_VFPD(6) |
- S3C2410_LCDCON2_VSPW(3),
-
- .lcdcon4 = S3C2410_LCDCON4_MVAL(0) |
- S3C2410_LCDCON4_HSPW(3),
-
.lcdcon5 = S3C2410_LCDCON5_FRM565 |
S3C2410_LCDCON5_INVVLINE |
S3C2410_LCDCON5_INVVFRAME |
diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c
index da68b1f..f26adea 100644
--- a/arch/arm/mach-s3c2440/mach-rx3715.c
+++ b/arch/arm/mach-s3c2440/mach-rx3715.c
@@ -115,14 +115,6 @@ static struct s3c2410fb_display rx3715_l
S3C2410_LCDCON1_TFT | \
S3C2410_LCDCON1_CLKVAL(0x0C),
- .lcdcon2 = S3C2410_LCDCON2_VBPD(5) | \
- S3C2410_LCDCON2_LINEVAL(319) | \
- S3C2410_LCDCON2_VFPD(6) | \
- S3C2410_LCDCON2_VSPW(2),
-
- .lcdcon4 = S3C2410_LCDCON4_MVAL(0) | \
- S3C2410_LCDCON4_HSPW(7),
-
.lcdcon5 = S3C2410_LCDCON5_INVVLINE |
S3C2410_LCDCON5_FRM565 |
S3C2410_LCDCON5_HWSWP,
@@ -159,8 +151,6 @@ static struct s3c2410fb_mach_info rx3715
.gpdcon_mask = 0xffc0fff0,
.gpdup = 0x0000faff,
.gpdup_mask = 0xffffffff,
-
- .fixed_syncs = 1,
};
static struct mtd_partition rx3715_nand_part[] = {
diff --git a/arch/arm/mach-s3c2440/mach-smdk2440.c b/arch/arm/mach-s3c2440/mach-smdk2440.c
index 2919e6b..840a480 100644
--- a/arch/arm/mach-s3c2440/mach-smdk2440.c
+++ b/arch/arm/mach-s3c2440/mach-smdk2440.c
@@ -109,14 +109,6 @@ static struct s3c2410fb_display smdk2440
S3C2410_LCDCON1_TFT |
S3C2410_LCDCON1_CLKVAL(0x04),
- .lcdcon2 = S3C2410_LCDCON2_VBPD(7) |
- S3C2410_LCDCON2_LINEVAL(319) |
- S3C2410_LCDCON2_VFPD(6) |
- S3C2410_LCDCON2_VSPW(3),
-
- .lcdcon4 = S3C2410_LCDCON4_MVAL(0) |
- S3C2410_LCDCON4_HSPW(3),
-
.lcdcon5 = S3C2410_LCDCON5_FRM565 |
S3C2410_LCDCON5_INVVLINE |
S3C2410_LCDCON5_INVVFRAME |
diff --git a/drivers/video/s3c2410fb.c b/drivers/video/s3c2410fb.c
index 43749bd..e850f11 100644
--- a/drivers/video/s3c2410fb.c
+++ b/drivers/video/s3c2410fb.c
@@ -341,8 +341,7 @@ static void s3c2410fb_calculate_stn_lcd_
S3C2410_LCDCON3_LINEBLANK(var->right_margin / 8) |
S3C2410_LCDCON3_HOZVAL(hs - 1);
- regs->lcdcon4 &= ~S3C2410_LCDCON4_HSPW(0xff);
- regs->lcdcon4 |= S3C2410_LCDCON4_HSPW(wlh);
+ regs->lcdcon4 = S3C2410_LCDCON4_WLH(wlh);
}
/* s3c2410fb_calculate_tft_lcd_regs
@@ -399,8 +398,7 @@ static void s3c2410fb_calculate_tft_lcd_
S3C2410_LCDCON3_HFPD(var->left_margin - 1) |
S3C2410_LCDCON3_HOZVAL(var->xres - 1);
- regs->lcdcon4 &= ~S3C2410_LCDCON4_HSPW(0xff);
- regs->lcdcon4 |= S3C2410_LCDCON4_HSPW(var->hsync_len - 1);
+ regs->lcdcon4 = S3C2410_LCDCON4_HSPW(var->hsync_len - 1);
}
/* s3c2410fb_activate_var
@@ -850,8 +848,6 @@ static int __init s3c2410fb_probe(struct
strcpy(fbinfo->fix.id, driver_name);
info->regs.lcdcon1 = display->lcdcon1;
- info->regs.lcdcon2 = display->lcdcon2;
- info->regs.lcdcon4 = display->lcdcon4;
info->regs.lcdcon5 = display->lcdcon5;
/* Stop the video and unset ENVID if set */
diff --git a/include/asm-arm/arch-s3c2410/fb.h b/include/asm-arm/arch-s3c2410/fb.h
index 8a7fa1b..6f022bd 100644
--- a/include/asm-arm/arch-s3c2410/fb.h
+++ b/include/asm-arm/arch-s3c2410/fb.h
@@ -45,13 +45,10 @@ struct s3c2410fb_display {
/* lcd configuration registers */
unsigned long lcdcon1;
- unsigned long lcdcon2;
- unsigned long lcdcon4;
unsigned long lcdcon5;
};
struct s3c2410fb_mach_info {
- unsigned char fixed_syncs; /* do not update sync/border */
struct s3c2410fb_display *displays; /* attached diplays info */
unsigned num_displays; /* number of defined displays */
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
reply other threads:[~2007-08-13 16:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=46C050B4.6070701@gmail.com \
--to=adaplas@gmail.com \
--cc=akpm@osdl.org \
--cc=arnaud.patard@rtp-net.org \
--cc=ben-linux@fluff.org \
--cc=linux-fbdev-devel@lists.sourceforge.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.