s3c2410fb: multi-display support

This patch adds a new structure to describe and handle
more than one panel (display mode) for the s3c2410 framebuffer.
This structure is added after the pxafb 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>

2 files changed, 33 insertions, 46 deletions

diff --git a/arch/arm/mach-s3c2440/mach-rx3715.c b/arch/arm/mach-s3c2440/mach-rx3715.c
index b59e6d39f2f2..c83078878497 100644
--- a/arch/arm/mach-s3c2440/mach-rx3715.c
+++ b/arch/arm/mach-s3c2440/mach-rx3715.c
@@ -110,7 +110,7 @@ static struct s3c2410_uartcfg rx3715_uartcfgs[] = {
 
 /* framebuffer lcd controller information */
 
-static struct s3c2410fb_mach_info rx3715_lcdcfg __initdata = {
+static struct s3c2410fb_display rx3715_lcdcfg __initdata = {
         .regs   = {
                 .lcdcon1 =      S3C2410_LCDCON1_TFT16BPP | \
                                 S3C2410_LCDCON1_TFT | \
@@ -133,6 +133,20 @@ static struct s3c2410fb_mach_info rx3715_lcdcfg __initdata = {
                                 S3C2410_LCDCON5_HWSWP,
         },
 
+        .width  =       240,
+        .height =       320,
+
+        .xres   = 240,
+        .yres   = 320,
+        .bpp    = 16,
+};
+
+static struct s3c2410fb_mach_info rx3715_fb_info __initdata = {
+
+        .displays =     &rx3715_lcdcfg,
+        .num_displays = 1,
+        .default_display = 0,
+
         .lpcsel =       0xf82,
 
         .gpccon =       0xaa955699,
@@ -146,26 +160,6 @@ static struct s3c2410fb_mach_info rx3715_lcdcfg __initdata = {
         .gpdup_mask =   0xffffffff,
 
         .fixed_syncs =  1,
-        .width  =       240,
-        .height =       320,
-
-        .xres   = {
-                .min =          240,
-                .max =          240,
-                .defval =       240,
-        },
-
-        .yres   = {
-                .max =          320,
-                .min =          320,
-                .defval =       320,
-        },
-
-        .bpp    = {
-                .min =          16,
-                .max =          16,
-                .defval =       16,
-        },
 };
 
 static struct mtd_partition rx3715_nand_part[] = {
@@ -224,7 +218,7 @@ static void __init rx3715_init_machine(void)
 #endif
         s3c2410_pm_init();
 
-        s3c24xx_fb_set_platdata(&rx3715_lcdcfg);
+        s3c24xx_fb_set_platdata(&rx3715_fb_info);
         platform_add_devices(rx3715_devices, ARRAY_SIZE(rx3715_devices));
 }
 
diff --git a/arch/arm/mach-s3c2440/mach-smdk2440.c b/arch/arm/mach-s3c2440/mach-smdk2440.c
index 670115b8a12e..f7dac7d54064 100644
--- a/arch/arm/mach-s3c2440/mach-smdk2440.c
+++ b/arch/arm/mach-s3c2440/mach-smdk2440.c
@@ -103,7 +103,7 @@ static struct s3c2410_uartcfg smdk2440_uartcfgs[] __initdata = {
 
 /* LCD driver info */
 
-static struct s3c2410fb_mach_info smdk2440_lcd_cfg __initdata = {
+static struct s3c2410fb_display smdk2440_lcd_cfg __initdata = {
         .regs   = {
 
                 .lcdcon1        = S3C2410_LCDCON1_TFT16BPP |
@@ -129,6 +129,21 @@ static struct s3c2410fb_mach_info smdk2440_lcd_cfg __initdata = {
                                   S3C2410_LCDCON5_HWSWP,
         },
 
+        .type           = S3C2410_LCDCON1_TFT16BPP,
+
+        .width          = 240,
+        .height         = 320,
+
+        .xres           = 240,
+        .yres           = 320,
+        .bpp            = 16,
+};
+
+static struct s3c2410fb_mach_info smdk2440_fb_info __initdata = {
+        .displays       = &smdk2440_lcd_cfg,
+        .num_displays   = 1,
+        .default_display = 0,
+
 #if 0
         /* currently setup by downloader */
         .gpccon         = 0xaa940659,
@@ -142,28 +157,6 @@ static struct s3c2410fb_mach_info smdk2440_lcd_cfg __initdata = {
 #endif
 
         .lpcsel         = ((0xCE6) & ~7) | 1<<4,
-        .type           = S3C2410_LCDCON1_TFT16BPP,
-
-        .width          = 240,
-        .height         = 320,
-
-        .xres           = {
-                .min    = 240,
-                .max    = 240,
-                .defval = 240,
-        },
-
-        .yres           = {
-                .min    = 320,
-                .max    = 320,
-                .defval = 320,
-        },
-
-        .bpp            = {
-                .min    = 16,
-                .max    = 16,
-                .defval = 16,
-        },
 };
 
 static struct platform_device *smdk2440_devices[] __initdata = {
@@ -183,7 +176,7 @@ static void __init smdk2440_map_io(void)
 
 static void __init smdk2440_machine_init(void)
 {
-        s3c24xx_fb_set_platdata(&smdk2440_lcd_cfg);
+        s3c24xx_fb_set_platdata(&smdk2440_fb_info);
 
         platform_add_devices(smdk2440_devices, ARRAY_SIZE(smdk2440_devices));
         smdk_machine_init();