aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2440
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2007-10-16 04:28:58 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 12:43:16 -0400
commitf28ef573ad09596b771b67c276bbc5f49281fa9d (patch)
tree5061be2ae82f513a8c23e220b8a97f30b08ec34a /arch/arm/mach-s3c2440
parent9939a481cd66a109e4ad09328df1bd0540e0aa84 (diff)
s3c2410fb: remove lcdcon3 register from s3c2410fb_display
This patch removes unused lcdcon3 register from the s3c2410fb_display structure. Signed-off-by: Krzysztof Helt <krzysztof.h1@wp.pl> Signed-off-by: Antonino Daplas <adaplas@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/arm/mach-s3c2440')
-rw-r--r--arch/arm/mach-s3c2440/mach-rx3715.c36
-rw-r--r--arch/arm/mach-s3c2440/mach-smdk2440.c34
2 files changed, 29 insertions, 41 deletions
diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c
index dab8e7b474d8..305827242bec 100644
--- a/arch/arm/mach-s3c2440/mach-rx3715.c
+++ b/arch/arm/mach-s3c2440/mach-rx3715.c
@@ -111,27 +111,21 @@ static struct s3c2410_uartcfg rx3715_uartcfgs[] = {
111/* framebuffer lcd controller information */ 111/* framebuffer lcd controller information */
112 112
113static struct s3c2410fb_display rx3715_lcdcfg __initdata = { 113static struct s3c2410fb_display rx3715_lcdcfg __initdata = {
114 .regs = { 114 .lcdcon1 = S3C2410_LCDCON1_TFT16BPP | \
115 .lcdcon1 = S3C2410_LCDCON1_TFT16BPP | \ 115 S3C2410_LCDCON1_TFT | \
116 S3C2410_LCDCON1_TFT | \ 116 S3C2410_LCDCON1_CLKVAL(0x0C),
117 S3C2410_LCDCON1_CLKVAL(0x0C), 117
118 118 .lcdcon2 = S3C2410_LCDCON2_VBPD(5) | \
119 .lcdcon2 = S3C2410_LCDCON2_VBPD(5) | \ 119 S3C2410_LCDCON2_LINEVAL(319) | \
120 S3C2410_LCDCON2_LINEVAL(319) | \ 120 S3C2410_LCDCON2_VFPD(6) | \
121 S3C2410_LCDCON2_VFPD(6) | \ 121 S3C2410_LCDCON2_VSPW(2),
122 S3C2410_LCDCON2_VSPW(2), 122
123 123 .lcdcon4 = S3C2410_LCDCON4_MVAL(0) | \
124 .lcdcon3 = S3C2410_LCDCON3_HBPD(35) | \ 124 S3C2410_LCDCON4_HSPW(7),
125 S3C2410_LCDCON3_HOZVAL(239) | \ 125
126 S3C2410_LCDCON3_HFPD(35), 126 .lcdcon5 = S3C2410_LCDCON5_INVVLINE |
127 127 S3C2410_LCDCON5_FRM565 |
128 .lcdcon4 = S3C2410_LCDCON4_MVAL(0) | \ 128 S3C2410_LCDCON5_HWSWP,
129 S3C2410_LCDCON4_HSPW(7),
130
131 .lcdcon5 = S3C2410_LCDCON5_INVVLINE |
132 S3C2410_LCDCON5_FRM565 |
133 S3C2410_LCDCON5_HWSWP,
134 },
135 129
136 .type = S3C2410_LCDCON1_TFT, 130 .type = S3C2410_LCDCON1_TFT,
137 .width = 240, 131 .width = 240,
diff --git a/arch/arm/mach-s3c2440/mach-smdk2440.c b/arch/arm/mach-s3c2440/mach-smdk2440.c
index 5930f1708027..33b364476c18 100644
--- a/arch/arm/mach-s3c2440/mach-smdk2440.c
+++ b/arch/arm/mach-s3c2440/mach-smdk2440.c
@@ -104,30 +104,24 @@ static struct s3c2410_uartcfg smdk2440_uartcfgs[] __initdata = {
104/* LCD driver info */ 104/* LCD driver info */
105 105
106static struct s3c2410fb_display smdk2440_lcd_cfg __initdata = { 106static struct s3c2410fb_display smdk2440_lcd_cfg __initdata = {
107 .regs = {
108 107
109 .lcdcon1 = S3C2410_LCDCON1_TFT16BPP | 108 .lcdcon1 = S3C2410_LCDCON1_TFT16BPP |
110 S3C2410_LCDCON1_TFT | 109 S3C2410_LCDCON1_TFT |
111 S3C2410_LCDCON1_CLKVAL(0x04), 110 S3C2410_LCDCON1_CLKVAL(0x04),
112 111
113 .lcdcon2 = S3C2410_LCDCON2_VBPD(7) | 112 .lcdcon2 = S3C2410_LCDCON2_VBPD(7) |
114 S3C2410_LCDCON2_LINEVAL(319) | 113 S3C2410_LCDCON2_LINEVAL(319) |
115 S3C2410_LCDCON2_VFPD(6) | 114 S3C2410_LCDCON2_VFPD(6) |
116 S3C2410_LCDCON2_VSPW(3), 115 S3C2410_LCDCON2_VSPW(3),
117 116
118 .lcdcon3 = S3C2410_LCDCON3_HBPD(19) | 117 .lcdcon4 = S3C2410_LCDCON4_MVAL(0) |
119 S3C2410_LCDCON3_HOZVAL(239) | 118 S3C2410_LCDCON4_HSPW(3),
120 S3C2410_LCDCON3_HFPD(7),
121 119
122 .lcdcon4 = S3C2410_LCDCON4_MVAL(0) | 120 .lcdcon5 = S3C2410_LCDCON5_FRM565 |
123 S3C2410_LCDCON4_HSPW(3), 121 S3C2410_LCDCON5_INVVLINE |
124 122 S3C2410_LCDCON5_INVVFRAME |
125 .lcdcon5 = S3C2410_LCDCON5_FRM565 | 123 S3C2410_LCDCON5_PWREN |
126 S3C2410_LCDCON5_INVVLINE | 124 S3C2410_LCDCON5_HWSWP,
127 S3C2410_LCDCON5_INVVFRAME |
128 S3C2410_LCDCON5_PWREN |
129 S3C2410_LCDCON5_HWSWP,
130 },
131 125
132 .type = S3C2410_LCDCON1_TFT16BPP, 126 .type = S3C2410_LCDCON1_TFT16BPP,
133 127