diff options
author | Krzysztof Helt <krzysztof.h1@wp.pl> | 2007-10-16 04:28:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-16 12:43:16 -0400 |
commit | 1f4115376c488d3bb3490259ae5b2c3b035760a5 (patch) | |
tree | 26d93492e72aed892d1d752ce5082508fd2bd703 /arch/arm/mach-s3c2410/mach-amlm5900.c | |
parent | 09fe75f6f934597f765748342ca6fb378ee7ecdb (diff) |
s3c2410fb: add margin fields to s3c2410fb_display
This patch adds margins fields to the s3c2410fb_display
structure. It also sets display type and horizontal
margins in all platform files that use the s3c2410fb
driver.
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-s3c2410/mach-amlm5900.c')
-rw-r--r-- | arch/arm/mach-s3c2410/mach-amlm5900.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/mach-amlm5900.c b/arch/arm/mach-s3c2410/mach-amlm5900.c index 19469340af04..e96b413a114d 100644 --- a/arch/arm/mach-s3c2410/mach-amlm5900.c +++ b/arch/arm/mach-s3c2410/mach-amlm5900.c | |||
@@ -172,12 +172,13 @@ static struct s3c2410fb_display __initdata amlm5900_lcd_info = { | |||
172 | .width = 160, | 172 | .width = 160, |
173 | .height = 160, | 173 | .height = 160, |
174 | 174 | ||
175 | /* commented out until stn patch is submitted | 175 | .type = S3C2410_LCDCON1_STN4, |
176 | * .type = S3C2410_LCDCON1_STN4, | 176 | |
177 | */ | ||
178 | .xres = 160, | 177 | .xres = 160, |
179 | .yres = 160, | 178 | .yres = 160, |
180 | .bpp = 4, | 179 | .bpp = 4, |
180 | .left_margin = 1 << (4 + 3), | ||
181 | .right_margin = 8 << 3, | ||
181 | 182 | ||
182 | .regs = { | 183 | .regs = { |
183 | .lcdcon1 = 0x00008225, | 184 | .lcdcon1 = 0x00008225, |