aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-s3c2440
diff options
context:
space:
mode:
authorKrzysztof Helt <krzysztof.h1@wp.pl>2007-10-16 04:28:57 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 12:43:16 -0400
commit1f4115376c488d3bb3490259ae5b2c3b035760a5 (patch)
tree26d93492e72aed892d1d752ce5082508fd2bd703 /arch/arm/mach-s3c2440
parent09fe75f6f934597f765748342ca6fb378ee7ecdb (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-s3c2440')
-rw-r--r--arch/arm/mach-s3c2440/mach-rx3715.c15
-rw-r--r--arch/arm/mach-s3c2440/mach-smdk2440.c2
2 files changed, 11 insertions, 6 deletions
diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c
index c83078878497..dab8e7b474d8 100644
--- a/arch/arm/mach-s3c2440/mach-rx3715.c
+++ b/arch/arm/mach-s3c2440/mach-rx3715.c
@@ -133,12 +133,15 @@ static struct s3c2410fb_display rx3715_lcdcfg __initdata = {
133 S3C2410_LCDCON5_HWSWP, 133 S3C2410_LCDCON5_HWSWP,
134 }, 134 },
135 135
136 .width = 240, 136 .type = S3C2410_LCDCON1_TFT,
137 .height = 320, 137 .width = 240,
138 138 .height = 320,
139 .xres = 240, 139
140 .yres = 320, 140 .xres = 240,
141 .bpp = 16, 141 .yres = 320,
142 .bpp = 16,
143 .left_margin = 36,
144 .right_margin = 36,
142}; 145};
143 146
144static struct s3c2410fb_mach_info rx3715_fb_info __initdata = { 147static struct s3c2410fb_mach_info rx3715_fb_info __initdata = {
diff --git a/arch/arm/mach-s3c2440/mach-smdk2440.c b/arch/arm/mach-s3c2440/mach-smdk2440.c
index f7dac7d54064..5930f1708027 100644
--- a/arch/arm/mach-s3c2440/mach-smdk2440.c
+++ b/arch/arm/mach-s3c2440/mach-smdk2440.c
@@ -137,6 +137,8 @@ static struct s3c2410fb_display smdk2440_lcd_cfg __initdata = {
137 .xres = 240, 137 .xres = 240,
138 .yres = 320, 138 .yres = 320,
139 .bpp = 16, 139 .bpp = 16,
140 .left_margin = 20,
141 .right_margin = 8,
140}; 142};
141 143
142static struct s3c2410fb_mach_info smdk2440_fb_info __initdata = { 144static struct s3c2410fb_mach_info smdk2440_fb_info __initdata = {