* - s3c2410fb-add-vertical-margins-fields-to-s3c2410fb_display.patch removed from -mm tree
@ 2007-10-16 20:43 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2007-10-16 20:43 UTC (permalink / raw)
To: krzysztof.h1, adaplas, mm-commits
The patch titled
s3c2410fb: add vertical margins fields to s3c2410fb_display
has been removed from the -mm tree. Its filename was
s3c2410fb-add-vertical-margins-fields-to-s3c2410fb_display.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: s3c2410fb: add vertical margins fields to s3c2410fb_display
From: Krzysztof Helt <krzysztof.h1@wp.pl>
This patch adds vertical margins values to all
s3c24xx platform.
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>
---
arch/arm/mach-s3c2410/mach-amlm5900.c | 2 ++
arch/arm/mach-s3c2410/mach-bast.c | 19 +++++++++++++++++++
arch/arm/mach-s3c2410/mach-h1940.c | 2 ++
arch/arm/mach-s3c2410/mach-qt2410.c | 6 ++++++
arch/arm/mach-s3c2440/mach-rx3715.c | 2 ++
arch/arm/mach-s3c2440/mach-smdk2440.c | 2 ++
6 files changed, 33 insertions(+)
diff -puN arch/arm/mach-s3c2410/mach-amlm5900.c~s3c2410fb-add-vertical-margins-fields-to-s3c2410fb_display arch/arm/mach-s3c2410/mach-amlm5900.c
--- a/arch/arm/mach-s3c2410/mach-amlm5900.c~s3c2410fb-add-vertical-margins-fields-to-s3c2410fb_display
+++ a/arch/arm/mach-s3c2410/mach-amlm5900.c
@@ -179,6 +179,8 @@ static struct s3c2410fb_display __initda
.bpp = 4,
.left_margin = 1 << (4 + 3),
.right_margin = 8 << 3,
+ .upper_margin = 0,
+ .lower_margin = 0,
.lcdcon1 = 0x00008225,
.lcdcon2 = 0x0027c000,
diff -puN arch/arm/mach-s3c2410/mach-bast.c~s3c2410fb-add-vertical-margins-fields-to-s3c2410fb_display arch/arm/mach-s3c2410/mach-bast.c
--- a/arch/arm/mach-s3c2410/mach-bast.c~s3c2410fb-add-vertical-margins-fields-to-s3c2410fb_display
+++ a/arch/arm/mach-s3c2410/mach-bast.c
@@ -472,10 +472,13 @@ static struct s3c2410fb_display __initda
.type = S3C2410_LCDCON1_TFT,
.width = 640,
.height = 480,
+
.xres = 320,
.yres = 240,
.left_margin = 40,
.right_margin = 20,
+ .upper_margin = 30,
+ .lower_margin = 32,
.bpp = 4,
@@ -494,6 +497,8 @@ static struct s3c2410fb_display __initda
.bpp = 4,
.left_margin = 40,
.right_margin = 20,
+ .upper_margin = 30,
+ .lower_margin = 32,
.lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2,
@@ -510,6 +515,8 @@ static struct s3c2410fb_display __initda
.bpp = 4,
.left_margin = 40,
.right_margin = 20,
+ .upper_margin = 30,
+ .lower_margin = 32,
.lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2,
@@ -526,6 +533,8 @@ static struct s3c2410fb_display __initda
.bpp = 8,
.left_margin = 40,
.right_margin = 20,
+ .upper_margin = 30,
+ .lower_margin = 32,
.lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2,
@@ -542,6 +551,8 @@ static struct s3c2410fb_display __initda
.bpp = 8,
.left_margin = 40,
.right_margin = 20,
+ .upper_margin = 30,
+ .lower_margin = 32,
.lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2,
@@ -558,6 +569,8 @@ static struct s3c2410fb_display __initda
.bpp = 8,
.left_margin = 40,
.right_margin = 20,
+ .upper_margin = 30,
+ .lower_margin = 32,
.lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2,
@@ -574,6 +587,8 @@ static struct s3c2410fb_display __initda
.bpp = 16,
.left_margin = 40,
.right_margin = 20,
+ .upper_margin = 30,
+ .lower_margin = 32,
.lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2,
@@ -590,6 +605,8 @@ static struct s3c2410fb_display __initda
.bpp = 16,
.left_margin = 40,
.right_margin = 20,
+ .upper_margin = 30,
+ .lower_margin = 32,
.lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2,
@@ -606,6 +623,8 @@ static struct s3c2410fb_display __initda
.bpp = 16,
.left_margin = 40,
.right_margin = 20,
+ .upper_margin = 30,
+ .lower_margin = 32,
.lcdcon1 = 0x00000176,
.lcdcon2 = 0x1d77c7c2,
diff -puN arch/arm/mach-s3c2410/mach-h1940.c~s3c2410fb-add-vertical-margins-fields-to-s3c2410fb_display arch/arm/mach-s3c2410/mach-h1940.c
--- a/arch/arm/mach-s3c2410/mach-h1940.c~s3c2410fb-add-vertical-margins-fields-to-s3c2410fb_display
+++ a/arch/arm/mach-s3c2410/mach-h1940.c
@@ -158,6 +158,8 @@ static struct s3c2410fb_display h1940_lc
.bpp = 16,
.left_margin = 20,
.right_margin = 8,
+ .upper_margin = 8,
+ .lower_margin = 7,
};
static struct s3c2410fb_mach_info h1940_fb_info __initdata = {
diff -puN arch/arm/mach-s3c2410/mach-qt2410.c~s3c2410fb-add-vertical-margins-fields-to-s3c2410fb_display arch/arm/mach-s3c2410/mach-qt2410.c
--- a/arch/arm/mach-s3c2410/mach-qt2410.c~s3c2410fb-add-vertical-margins-fields-to-s3c2410fb_display
+++ a/arch/arm/mach-s3c2410/mach-qt2410.c
@@ -125,6 +125,8 @@ static struct s3c2410fb_display qt2410_l
.bpp = 16,
.left_margin = 44,
.right_margin = 116,
+ .upper_margin = 19,
+ .lower_margin = 11,
},
{
/* Configuration for 480x640 toppoly TD028TTEC1 */
@@ -154,6 +156,8 @@ static struct s3c2410fb_display qt2410_l
.bpp = 16,
.left_margin = 8,
.right_margin = 24,
+ .upper_margin = 2,
+ .lower_margin = 4,
},
{
/* Config for 240x320 LCD */
@@ -183,6 +187,8 @@ static struct s3c2410fb_display qt2410_l
.bpp = 16,
.left_margin = 13,
.right_margin = 8,
+ .upper_margin = 2,
+ .lower_margin = 7,
},
};
diff -puN arch/arm/mach-s3c2440/mach-rx3715.c~s3c2410fb-add-vertical-margins-fields-to-s3c2410fb_display arch/arm/mach-s3c2440/mach-rx3715.c
--- a/arch/arm/mach-s3c2440/mach-rx3715.c~s3c2410fb-add-vertical-margins-fields-to-s3c2410fb_display
+++ a/arch/arm/mach-s3c2440/mach-rx3715.c
@@ -136,6 +136,8 @@ static struct s3c2410fb_display rx3715_l
.bpp = 16,
.left_margin = 36,
.right_margin = 36,
+ .upper_margin = 6,
+ .lower_margin = 7,
};
static struct s3c2410fb_mach_info rx3715_fb_info __initdata = {
diff -puN arch/arm/mach-s3c2440/mach-smdk2440.c~s3c2410fb-add-vertical-margins-fields-to-s3c2410fb_display arch/arm/mach-s3c2440/mach-smdk2440.c
--- a/arch/arm/mach-s3c2440/mach-smdk2440.c~s3c2410fb-add-vertical-margins-fields-to-s3c2410fb_display
+++ a/arch/arm/mach-s3c2440/mach-smdk2440.c
@@ -133,6 +133,8 @@ static struct s3c2410fb_display smdk2440
.bpp = 16,
.left_margin = 20,
.right_margin = 8,
+ .upper_margin = 8,
+ .lower_margin = 7,
};
static struct s3c2410fb_mach_info smdk2440_fb_info __initdata = {
_
Patches currently in -mm which might be from krzysztof.h1@wp.pl are
origin.patch
git-alsa.patch
cyber2000fb-checkpatch-fixes.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-10-16 21:13 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-10-16 20:43 - s3c2410fb-add-vertical-margins-fields-to-s3c2410fb_display.patch removed from -mm tree akpm
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.