16 files changed, 186 insertions, 457 deletions

diff --git a/arch/arm/mach-at91/board-cap9adk.c b/arch/arm/mach-at91/board-cap9adk.c
index 5dffd3be62d2..911d9862e6ff 100644
--- a/arch/arm/mach-at91/board-cap9adk.c
+++ b/arch/arm/mach-at91/board-cap9adk.c
@@ -299,7 +299,7 @@ static struct fb_videomode at91_tft_vga_modes[] = {
                 .xres           = 240,          .yres           = 320,
                 .pixclock       = KHZ2PICOS(4965),
 
-                .left_margin    = 1,            .right_margin   = 33,
+                .left_margin    = 1,            .right_margin   = 34,
                 .upper_margin   = 1,            .lower_margin   = 0,
                 .hsync_len      = 5,            .vsync_len      = 1,
 
diff --git a/arch/arm/mach-at91/board-neocore926.c b/arch/arm/mach-at91/board-neocore926.c
index ef816c17dc61..190dc19ce467 100644
--- a/arch/arm/mach-at91/board-neocore926.c
+++ b/arch/arm/mach-at91/board-neocore926.c
@@ -230,7 +230,7 @@ static struct fb_videomode at91_tft_vga_modes[] = {
                 .xres           = 240,          .yres           = 320,
                 .pixclock       = KHZ2PICOS(5000),
 
-                .left_margin    = 1,            .right_margin   = 33,
+                .left_margin    = 1,            .right_margin   = 34,
                 .upper_margin   = 1,            .lower_margin   = 0,
                 .hsync_len      = 5,            .vsync_len      = 1,
 
diff --git a/arch/arm/mach-at91/board-sam9261ek.c b/arch/arm/mach-at91/board-sam9261ek.c
index b005b738e8ff..4f469ea46969 100644
--- a/arch/arm/mach-at91/board-sam9261ek.c
+++ b/arch/arm/mach-at91/board-sam9261ek.c
@@ -365,7 +365,7 @@ static struct fb_videomode at91_stn_modes[] = {
                 .xres           = 320,          .yres           = 240,
                 .pixclock       = KHZ2PICOS(1440),
 
-                .left_margin    = 1,            .right_margin   = 1,
+                .left_margin    = 1,            .right_margin   = 2,
                 .upper_margin   = 0,            .lower_margin   = 0,
                 .hsync_len      = 1,            .vsync_len      = 1,
 
@@ -426,7 +426,7 @@ static struct fb_videomode at91_tft_vga_modes[] = {
                 .xres           = 240,          .yres           = 320,
                 .pixclock       = KHZ2PICOS(4965),
 
-                .left_margin    = 1,            .right_margin   = 33,
+                .left_margin    = 1,            .right_margin   = 34,
                 .upper_margin   = 1,            .lower_margin   = 0,
                 .hsync_len      = 5,            .vsync_len      = 1,
 
diff --git a/arch/arm/mach-at91/board-sam9263ek.c b/arch/arm/mach-at91/board-sam9263ek.c
index bccdcf23caa1..0e96ee9e4ad3 100644
--- a/arch/arm/mach-at91/board-sam9263ek.c
+++ b/arch/arm/mach-at91/board-sam9263ek.c
@@ -253,7 +253,7 @@ static struct fb_videomode at91_tft_vga_modes[] = {
                 .xres           = 240,          .yres           = 320,
                 .pixclock       = KHZ2PICOS(4965),
 
-                .left_margin    = 1,            .right_margin   = 33,
+                .left_margin    = 1,            .right_margin   = 34,
                 .upper_margin   = 1,            .lower_margin   = 0,
                 .hsync_len      = 5,            .vsync_len      = 1,
 
diff --git a/arch/arm/mach-at91/board-sam9m10g45ek.c b/arch/arm/mach-at91/board-sam9m10g45ek.c
index 92de9127923a..855c68b378d6 100644
--- a/arch/arm/mach-at91/board-sam9m10g45ek.c
+++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
@@ -192,7 +192,7 @@ static struct fb_videomode at91_tft_vga_modes[] = {
                 .xres           = 480,          .yres           = 272,
                 .pixclock       = KHZ2PICOS(9000),
 
-                .left_margin    = 1,            .right_margin   = 1,
+                .left_margin    = 1,            .right_margin   = 2,
                 .upper_margin   = 40,           .lower_margin   = 1,
                 .hsync_len      = 45,           .vsync_len      = 1,
 
diff --git a/arch/arm/mach-at91/board-sam9rlek.c b/arch/arm/mach-at91/board-sam9rlek.c
index b2b748239f36..0e943a2d9502 100644
--- a/arch/arm/mach-at91/board-sam9rlek.c
+++ b/arch/arm/mach-at91/board-sam9rlek.c
@@ -149,7 +149,7 @@ static struct fb_videomode at91_tft_vga_modes[] = {
                 .xres           = 240,          .yres           = 320,
                 .pixclock       = KHZ2PICOS(4965),
 
-                .left_margin    = 1,            .right_margin   = 33,
+                .left_margin    = 1,            .right_margin   = 34,
                 .upper_margin   = 1,            .lower_margin   = 0,
                 .hsync_len      = 5,            .vsync_len      = 1,
 
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index d83e967e4e15..dcf0a828f66e 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -2413,7 +2413,6 @@ source "drivers/video/omap/Kconfig"
 source "drivers/video/omap2/Kconfig"
 
 source "drivers/video/backlight/Kconfig"
-source "drivers/video/display/Kconfig"
 
 if VT
         source "drivers/video/console/Kconfig"
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 9b9d8fff7732..142606814d98 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -13,7 +13,7 @@ fb-objs                           := $(fb-y)
 
 obj-$(CONFIG_VT)                  += console/
 obj-$(CONFIG_LOGO)                += logo/
-obj-y                             += backlight/ display/
+obj-y                             += backlight/
 
 obj-$(CONFIG_FB_CFB_FILLRECT)  += cfbfillrect.o
 obj-$(CONFIG_FB_CFB_COPYAREA)  += cfbcopyarea.o
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 63409c122ae8..ced4419e56e2 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -100,8 +100,11 @@ static int atmel_bl_update_status(struct backlight_device *bl)
                 brightness = 0;
 
         lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_VAL, brightness);
-        lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR,
+        if (contrast_ctr & ATMEL_LCDC_POL_POSITIVE)
+                lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR,
                         brightness ? contrast_ctr : 0);
+        else
+                lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, contrast_ctr);
 
         bl->props.fb_blank = bl->props.power = sinfo->bl_power = power;
 
@@ -397,7 +400,7 @@ static int atmel_lcdfb_check_var(struct fb_var_screeninfo *var,
         var->lower_margin = min_t(u32, var->lower_margin,
                         ATMEL_LCDC_VFP);
         var->right_margin = min_t(u32, var->right_margin,
-                        (ATMEL_LCDC_HFP >> ATMEL_LCDC_HFP_OFFSET) + 1);
+                        (ATMEL_LCDC_HFP >> ATMEL_LCDC_HFP_OFFSET) + 2);
         var->hsync_len = min_t(u32, var->hsync_len,
                         (ATMEL_LCDC_HPW >> ATMEL_LCDC_HPW_OFFSET) + 1);
         var->left_margin = min_t(u32, var->left_margin,
@@ -582,7 +585,7 @@ static int atmel_lcdfb_set_par(struct fb_info *info)
         lcdc_writel(sinfo, ATMEL_LCDC_TIM1, value);
 
         /* Horizontal timing */
-        value = (info->var.right_margin - 1) << ATMEL_LCDC_HFP_OFFSET;
+        value = (info->var.right_margin - 2) << ATMEL_LCDC_HFP_OFFSET;
         value |= (info->var.hsync_len - 1) << ATMEL_LCDC_HPW_OFFSET;
         value |= (info->var.left_margin - 1);
         dev_dbg(info->device, "  * LCDTIM2 = %08lx\n", value);
@@ -682,14 +685,30 @@ static int atmel_lcdfb_setcolreg(unsigned int regno, unsigned int red,
 
         case FB_VISUAL_PSEUDOCOLOR:
                 if (regno < 256) {
-                        val  = ((red   >> 11) & 0x001f);
-                        val |= ((green >>  6) & 0x03e0);
-                        val |= ((blue  >>  1) & 0x7c00);
-
-                        /*
-                         * TODO: intensity bit. Maybe something like
-                         *   ~(red[10] ^ green[10] ^ blue[10]) & 1
-                         */
+                        if (cpu_is_at91sam9261() || cpu_is_at91sam9263()
+                            || cpu_is_at91sam9rl()) {
+                                /* old style I+BGR:555 */
+                                val  = ((red   >> 11) & 0x001f);
+                                val |= ((green >>  6) & 0x03e0);
+                                val |= ((blue  >>  1) & 0x7c00);
+
+                                /*
+                                 * TODO: intensity bit. Maybe something like
+                                 *   ~(red[10] ^ green[10] ^ blue[10]) & 1
+                                 */
+                        } else {
+                                /* new style BGR:565 / RGB:565 */
+                                if (sinfo->lcd_wiring_mode ==
+                                    ATMEL_LCDC_WIRING_RGB) {
+                                        val  = ((blue >> 11) & 0x001f);
+                                        val |= ((red  >>  0) & 0xf800);
+                                } else {
+                                        val  = ((red  >> 11) & 0x001f);
+                                        val |= ((blue >>  0) & 0xf800);
+                                }
+
+                                val |= ((green >>  5) & 0x07e0);
+                        }
 
                         lcdc_writel(sinfo, ATMEL_LCDC_LUT(regno), val);
                         ret = 0;
diff --git a/drivers/video/cirrusfb.c b/drivers/video/cirrusfb.c
index 6df7c54db0a3..6ea505c6f0c8 100644
--- a/drivers/video/cirrusfb.c
+++ b/drivers/video/cirrusfb.c
@@ -280,52 +280,74 @@ MODULE_DEVICE_TABLE(pci, cirrusfb_pci_table);
 #endif /* CONFIG_PCI */
 
 #ifdef CONFIG_ZORRO
-static const struct zorro_device_id cirrusfb_zorro_table[] = {
+struct zorrocl {
+        enum cirrus_board type; /* Board type */
+        u32 regoffset;          /* Offset of registers in first Zorro device */
+        u32 ramsize;            /* Size of video RAM in first Zorro device */
+                                /* If zero, use autoprobe on RAM device */
+        u32 ramoffset;          /* Offset of video RAM in first Zorro device */
+        zorro_id ramid;         /* Zorro ID of RAM device */
+        zorro_id ramid2;        /* Zorro ID of optional second RAM device */
+};
+
+static const struct zorrocl zcl_sd64 __devinitconst = {
+        .type           = BT_SD64,
+        .ramid          = ZORRO_PROD_HELFRICH_SD64_RAM,
+};
+
+static const struct zorrocl zcl_piccolo __devinitconst = {
+        .type           = BT_PICCOLO,
+        .ramid          = ZORRO_PROD_HELFRICH_PICCOLO_RAM,
+};
+
+static const struct zorrocl zcl_picasso __devinitconst = {
+        .type           = BT_PICASSO,
+        .ramid          = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_RAM,
+};
+
+static const struct zorrocl zcl_spectrum __devinitconst = {
+        .type           = BT_SPECTRUM,
+        .ramid          = ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_RAM,
+};
+
+static const struct zorrocl zcl_picasso4_z3 __devinitconst = {
+        .type           = BT_PICASSO4,
+        .regoffset      = 0x00600000,
+        .ramsize        = 4 * MB_,
+        .ramoffset      = 0x01000000,   /* 0x02000000 for 64 MiB boards */
+};
+
+static const struct zorrocl zcl_picasso4_z2 __devinitconst = {
+        .type           = BT_PICASSO4,
+        .regoffset      = 0x10000,
+        .ramid          = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_RAM1,
+        .ramid2         = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_RAM2,
+};
+
+
+static const struct zorro_device_id cirrusfb_zorro_table[] __devinitconst = {
         {
-                .id             = ZORRO_PROD_HELFRICH_SD64_RAM,
-                .driver_data    = BT_SD64,
+                .id             = ZORRO_PROD_HELFRICH_SD64_REG,
+                .driver_data    = (unsigned long)&zcl_sd64,
         }, {
-                .id             = ZORRO_PROD_HELFRICH_PICCOLO_RAM,
-                .driver_data    = BT_PICCOLO,
+                .id             = ZORRO_PROD_HELFRICH_PICCOLO_REG,
+                .driver_data    = (unsigned long)&zcl_piccolo,
         }, {
-                .id     = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_RAM,
-                .driver_data    = BT_PICASSO,
+                .id     = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_REG,
+                .driver_data    = (unsigned long)&zcl_picasso,
         }, {
-                .id             = ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_RAM,
-                .driver_data    = BT_SPECTRUM,
+                .id             = ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_REG,
+                .driver_data    = (unsigned long)&zcl_spectrum,
         }, {
                 .id             = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z3,
-                .driver_data    = BT_PICASSO4,
+                .driver_data    = (unsigned long)&zcl_picasso4_z3,
+        }, {
+                .id             = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_REG,
+                .driver_data    = (unsigned long)&zcl_picasso4_z2,
         },
         { 0 }
 };
 MODULE_DEVICE_TABLE(zorro, cirrusfb_zorro_table);
-
-static const struct {
-        zorro_id id2;
-        unsigned long size;
-} cirrusfb_zorro_table2[] = {
-        [BT_SD64] = {
-                .id2    = ZORRO_PROD_HELFRICH_SD64_REG,
-                .size   = 0x400000
-        },
-        [BT_PICCOLO] = {
-                .id2    = ZORRO_PROD_HELFRICH_PICCOLO_REG,
-                .size   = 0x200000
-        },
-        [BT_PICASSO] = {
-                .id2    = ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_REG,
-                .size   = 0x200000
-        },
-        [BT_SPECTRUM] = {
-                .id2    = ZORRO_PROD_GVP_EGS_28_24_SPECTRUM_REG,
-                .size   = 0x200000
-        },
-        [BT_PICASSO4] = {
-                .id2    = 0,
-                .size   = 0x400000
-        }
-};
 #endif /* CONFIG_ZORRO */
 
 #ifdef CIRRUSFB_DEBUG
@@ -1956,16 +1978,12 @@ static void cirrusfb_zorro_unmap(struct fb_info *info)
         struct cirrusfb_info *cinfo = info->par;
         struct zorro_dev *zdev = to_zorro_dev(info->device);
 
-        zorro_release_device(zdev);
-
-        if (cinfo->btype == BT_PICASSO4) {
-                cinfo->regbase -= 0x600000;
-                iounmap((void *)cinfo->regbase);
+        if (info->fix.smem_start > 16 * MB_)
                 iounmap(info->screen_base);
-        } else {
-                if (zorro_resource_start(zdev) > 0x01000000)
-                        iounmap(info->screen_base);
-        }
+        if (info->fix.mmio_start > 16 * MB_)
+                iounmap(cinfo->regbase);
+
+        zorro_release_device(zdev);
 }
 #endif /* CONFIG_ZORRO */
 
@@ -2222,115 +2240,116 @@ static struct pci_driver cirrusfb_pci_driver = {
 static int __devinit cirrusfb_zorro_register(struct zorro_dev *z,
                                              const struct zorro_device_id *ent)
 {
-        struct cirrusfb_info *cinfo;
         struct fb_info *info;
+        int error;
+        const struct zorrocl *zcl;
         enum cirrus_board btype;
-        struct zorro_dev *z2 = NULL;
-        unsigned long board_addr, board_size, size;
-        int ret;
-
-        btype = ent->driver_data;
-        if (cirrusfb_zorro_table2[btype].id2)
-                z2 = zorro_find_device(cirrusfb_zorro_table2[btype].id2, NULL);
-        size = cirrusfb_zorro_table2[btype].size;
+        unsigned long regbase, ramsize, rambase;
+        struct cirrusfb_info *cinfo;
 
         info = framebuffer_alloc(sizeof(struct cirrusfb_info), &z->dev);
         if (!info) {
                 printk(KERN_ERR "cirrusfb: could not allocate memory\n");
-                ret = -ENOMEM;
-                goto err_out;
+                return -ENOMEM;
+        }
+
+        zcl = (const struct zorrocl *)ent->driver_data;
+        btype = zcl->type;
+        regbase = zorro_resource_start(z) + zcl->regoffset;
+        ramsize = zcl->ramsize;
+        if (ramsize) {
+                rambase = zorro_resource_start(z) + zcl->ramoffset;
+                if (zorro_resource_len(z) == 64 * MB_) {
+                        /* Quirk for 64 MiB Picasso IV */
+                        rambase += zcl->ramoffset;
+                }
+        } else {
+                struct zorro_dev *ram = zorro_find_device(zcl->ramid, NULL);
+                if (!ram || !zorro_resource_len(ram)) {
+                        dev_err(info->device, "No video RAM found\n");
+                        error = -ENODEV;
+                        goto err_release_fb;
+                }
+                rambase = zorro_resource_start(ram);
+                ramsize = zorro_resource_len(ram);
+                if (zcl->ramid2 &&
+                    (ram = zorro_find_device(zcl->ramid2, NULL))) {
+                        if (zorro_resource_start(ram) != rambase + ramsize) {
+                                dev_warn(info->device,
+                                         "Skipping non-contiguous RAM at %pR\n",
+                                         &ram->resource);
+                        } else {
+                                ramsize += zorro_resource_len(ram);
+                        }
+                }
         }
 
-        dev_info(info->device, "%s board detected\n",
-                 cirrusfb_board_info[btype].name);
-
-        cinfo = info->par;
-        cinfo->btype = btype;
-
-        assert(z);
-        assert(btype != BT_NONE);
-
-        board_addr = zorro_resource_start(z);
-        board_size = zorro_resource_len(z);
-        info->screen_size = size;
+        dev_info(info->device,
+                 "%s board detected, REG at 0x%lx, %lu MiB RAM at 0x%lx\n",
+                 cirrusfb_board_info[btype].name, regbase, ramsize / MB_,
+                 rambase);
 
         if (!zorro_request_device(z, "cirrusfb")) {
-                dev_err(info->device, "cannot reserve region 0x%lx, abort\n",
-                        board_addr);
-                ret = -EBUSY;
+                dev_err(info->device, "Cannot reserve %pR\n", &z->resource);
+                error = -EBUSY;
                 goto err_release_fb;
         }
 
-        ret = -EIO;
-
-        if (btype == BT_PICASSO4) {
-                dev_info(info->device, " REG at $%lx\n", board_addr + 0x600000);
-
-                /* To be precise, for the P4 this is not the */
-                /* begin of the board, but the begin of RAM. */
-                /* for P4, map in its address space in 2 chunks (### TEST! ) */
-                /* (note the ugly hardcoded 16M number) */
-                cinfo->regbase = ioremap(board_addr, 16777216);
-                if (!cinfo->regbase)
-                        goto err_release_region;
-
-                dev_dbg(info->device, "Virtual address for board set to: $%p\n",
-                        cinfo->regbase);
-                cinfo->regbase += 0x600000;
-                info->fix.mmio_start = board_addr + 0x600000;
-
-                info->fix.smem_start = board_addr + 16777216;
-                info->screen_base = ioremap(info->fix.smem_start, 16777216);
-                if (!info->screen_base)
-                        goto err_unmap_regbase;
-        } else {
-                dev_info(info->device, " REG at $%lx\n",
-                         (unsigned long) z2->resource.start);
-
-                info->fix.smem_start = board_addr;
-                if (board_addr > 0x01000000)
-                        info->screen_base = ioremap(board_addr, board_size);
-                else
-                        info->screen_base = (caddr_t) ZTWO_VADDR(board_addr);
-                if (!info->screen_base)
-                        goto err_release_region;
+        cinfo = info->par;
+        cinfo->btype = btype;
 
-                /* set address for REG area of board */
-                cinfo->regbase = (caddr_t) ZTWO_VADDR(z2->resource.start);
-                info->fix.mmio_start = z2->resource.start;
+        info->fix.mmio_start = regbase;
+        cinfo->regbase = regbase > 16 * MB_ ? ioremap(regbase, 64 * 1024)
+                                            : (caddr_t)ZTWO_VADDR(regbase);
+        if (!cinfo->regbase) {
+                dev_err(info->device, "Cannot map registers\n");
+                error = -EIO;
+                goto err_release_dev;
+        }
 
-                dev_dbg(info->device, "Virtual address for board set to: $%p\n",
-                        cinfo->regbase);
+        info->fix.smem_start = rambase;
+        info->screen_size = ramsize;
+        info->screen_base = rambase > 16 * MB_ ? ioremap(rambase, ramsize)
+                                               : (caddr_t)ZTWO_VADDR(rambase);
+        if (!info->screen_base) {
+                dev_err(info->device, "Cannot map video RAM\n");
+                error = -EIO;
+                goto err_unmap_reg;
         }
+
         cinfo->unmap = cirrusfb_zorro_unmap;
 
         dev_info(info->device,
-                 "Cirrus Logic chipset on Zorro bus, RAM (%lu MB) at $%lx\n",
-                 board_size / MB_, board_addr);
-
-        zorro_set_drvdata(z, info);
+                 "Cirrus Logic chipset on Zorro bus, RAM (%lu MiB) at 0x%lx\n",
+                 ramsize / MB_, rambase);
 
         /* MCLK select etc. */
         if (cirrusfb_board_info[btype].init_sr1f)
                 vga_wseq(cinfo->regbase, CL_SEQR1F,
                          cirrusfb_board_info[btype].sr1f);
 
-        ret = cirrusfb_register(info);
-        if (!ret)
-                return 0;
+        error = cirrusfb_register(info);
+        if (error) {
+                dev_err(info->device, "Failed to register device, error %d\n",
+                        error);
+                goto err_unmap_ram;
+        }
 
-        if (btype == BT_PICASSO4 || board_addr > 0x01000000)
+        zorro_set_drvdata(z, info);
+        return 0;
+
+err_unmap_ram:
+        if (rambase > 16 * MB_)
                 iounmap(info->screen_base);
 
-err_unmap_regbase:
-        if (btype == BT_PICASSO4)
-                iounmap(cinfo->regbase - 0x600000);
-err_release_region:
-        release_region(board_addr, board_size);
+err_unmap_reg:
+        if (regbase > 16 * MB_)
+                iounmap(cinfo->regbase);
+err_release_dev:
+        zorro_release_device(z);
 err_release_fb:
         framebuffer_release(info);
-err_out:
-        return ret;
+        return error;
 }
 
 void __devexit cirrusfb_zorro_unregister(struct zorro_dev *z)
@@ -2338,6 +2357,7 @@ void __devexit cirrusfb_zorro_unregister(struct zorro_dev *z)
         struct fb_info *info = zorro_get_drvdata(z);
 
         cirrusfb_cleanup(info);
+        zorro_set_drvdata(z, NULL);
 }
 
 static struct zorro_driver cirrusfb_zorro_driver = {
diff --git a/drivers/video/display/Kconfig b/drivers/video/display/Kconfig
deleted file mode 100644
index f99af931d4f8..000000000000
--- a/drivers/video/display/Kconfig
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Display drivers configuration
-#
-
-menu "Display device support"
-
-config DISPLAY_SUPPORT
-        tristate "Display panel/monitor support"
-        ---help---
-          This framework adds support for low-level control of a display.
-          This includes support for power.
-
-          Enable this to be able to choose the drivers for controlling the
-          physical display panel/monitor on some platforms. This not only
-          covers LCD displays for PDAs but also other types of displays
-          such as CRT, TVout etc.
-
-          To have support for your specific display panel you will have to
-          select the proper drivers which depend on this option.
-
-comment "Display hardware drivers"
-        depends on DISPLAY_SUPPORT
-
-endmenu
diff --git a/drivers/video/display/Makefile b/drivers/video/display/Makefile
deleted file mode 100644
index c0ea832bf171..000000000000
--- a/drivers/video/display/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# Display drivers
-
-display-objs                            := display-sysfs.o
-
-obj-$(CONFIG_DISPLAY_SUPPORT)           += display.o
-
diff --git a/drivers/video/display/display-sysfs.c b/drivers/video/display/display-sysfs.c
deleted file mode 100644
index 0c647d7af0ee..000000000000
--- a/drivers/video/display/display-sysfs.c
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
- *  display-sysfs.c - Display output driver sysfs interface
- *
- *  Copyright (C) 2007 James Simmons <jsimmons@infradead.org>
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or (at
- *  your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- */
-#include <linux/module.h>
-#include <linux/display.h>
-#include <linux/ctype.h>
-#include <linux/idr.h>
-#include <linux/err.h>
-#include <linux/kdev_t.h>
-#include <linux/slab.h>
-
-static ssize_t display_show_name(struct device *dev,
-                                struct device_attribute *attr, char *buf)
-{
-        struct display_device *dsp = dev_get_drvdata(dev);
-        return snprintf(buf, PAGE_SIZE, "%s\n", dsp->name);
-}
-
-static ssize_t display_show_type(struct device *dev,
-                                struct device_attribute *attr, char *buf)
-{
-        struct display_device *dsp = dev_get_drvdata(dev);
-        return snprintf(buf, PAGE_SIZE, "%s\n", dsp->type);
-}
-
-static ssize_t display_show_contrast(struct device *dev,
-                                struct device_attribute *attr, char *buf)
-{
-        struct display_device *dsp = dev_get_drvdata(dev);
-        ssize_t rc = -ENXIO;
-
-        mutex_lock(&dsp->lock);
-        if (likely(dsp->driver) && dsp->driver->get_contrast)
-                rc = sprintf(buf, "%d\n", dsp->driver->get_contrast(dsp));
-        mutex_unlock(&dsp->lock);
-        return rc;
-}
-
-static ssize_t display_store_contrast(struct device *dev,
-                                        struct device_attribute *attr,
-                                        const char *buf, size_t count)
-{
-        struct display_device *dsp = dev_get_drvdata(dev);
-        ssize_t ret = -EINVAL, size;
-        int contrast;
-        char *endp;
-
-        contrast = simple_strtoul(buf, &endp, 0);
-        size = endp - buf;
-
-        if (isspace(*endp))
-                size++;
-
-        if (size != count)
-                return ret;
-
-        mutex_lock(&dsp->lock);
-        if (likely(dsp->driver && dsp->driver->set_contrast)) {
-                pr_debug("display: set contrast to %d\n", contrast);
-                dsp->driver->set_contrast(dsp, contrast);
-                ret = count;
-        }
-        mutex_unlock(&dsp->lock);
-        return ret;
-}
-
-static ssize_t display_show_max_contrast(struct device *dev,
-                                        struct device_attribute *attr,
-                                        char *buf)
-{
-        struct display_device *dsp = dev_get_drvdata(dev);
-        ssize_t rc = -ENXIO;
-
-        mutex_lock(&dsp->lock);
-        if (likely(dsp->driver))
-                rc = sprintf(buf, "%d\n", dsp->driver->max_contrast);
-        mutex_unlock(&dsp->lock);
-        return rc;
-}
-
-static struct device_attribute display_attrs[] = {
-        __ATTR(name, S_IRUGO, display_show_name, NULL),
-        __ATTR(type, S_IRUGO, display_show_type, NULL),
-        __ATTR(contrast, S_IRUGO | S_IWUSR, display_show_contrast, display_store_contrast),
-        __ATTR(max_contrast, S_IRUGO, display_show_max_contrast, NULL),
-};
-
-static int display_suspend(struct device *dev, pm_message_t state)
-{
-        struct display_device *dsp = dev_get_drvdata(dev);
-
-        mutex_lock(&dsp->lock);
-        if (likely(dsp->driver->suspend))
-                dsp->driver->suspend(dsp, state);
-        mutex_unlock(&dsp->lock);
-        return 0;
-};
-
-static int display_resume(struct device *dev)
-{
-        struct display_device *dsp = dev_get_drvdata(dev);
-
-        mutex_lock(&dsp->lock);
-        if (likely(dsp->driver->resume))
-                dsp->driver->resume(dsp);
-        mutex_unlock(&dsp->lock);
-        return 0;
-};
-
-static struct mutex allocated_dsp_lock;
-static DEFINE_IDR(allocated_dsp);
-static struct class *display_class;
-
-struct display_device *display_device_register(struct display_driver *driver,
-                                                struct device *parent, void *devdata)
-{
-        struct display_device *new_dev = NULL;
-        int ret = -EINVAL;
-
-        if (unlikely(!driver))
-                return ERR_PTR(ret);
-
-        mutex_lock(&allocated_dsp_lock);
-        ret = idr_pre_get(&allocated_dsp, GFP_KERNEL);
-        mutex_unlock(&allocated_dsp_lock);
-        if (!ret)
-                return ERR_PTR(ret);
-
-        new_dev = kzalloc(sizeof(struct display_device), GFP_KERNEL);
-        if (likely(new_dev) && unlikely(driver->probe(new_dev, devdata))) {
-                // Reserve the index for this display
-                mutex_lock(&allocated_dsp_lock);
-                ret = idr_get_new(&allocated_dsp, new_dev, &new_dev->idx);
-                mutex_unlock(&allocated_dsp_lock);
-
-                if (!ret) {
-                        new_dev->dev = device_create(display_class, parent,
-                                                     MKDEV(0, 0), new_dev,
-                                                     "display%d", new_dev->idx);
-                        if (!IS_ERR(new_dev->dev)) {
-                                new_dev->parent = parent;
-                                new_dev->driver = driver;
-                                mutex_init(&new_dev->lock);
-                                return new_dev;
-                        }
-                        mutex_lock(&allocated_dsp_lock);
-                        idr_remove(&allocated_dsp, new_dev->idx);
-                        mutex_unlock(&allocated_dsp_lock);
-                        ret = -EINVAL;
-                }
-        }
-        kfree(new_dev);
-        return ERR_PTR(ret);
-}
-EXPORT_SYMBOL(display_device_register);
-
-void display_device_unregister(struct display_device *ddev)
-{
-        if (!ddev)
-                return;
-        // Free device
-        mutex_lock(&ddev->lock);
-        device_unregister(ddev->dev);
-        mutex_unlock(&ddev->lock);
-        // Mark device index as available
-        mutex_lock(&allocated_dsp_lock);
-        idr_remove(&allocated_dsp, ddev->idx);
-        mutex_unlock(&allocated_dsp_lock);
-        kfree(ddev);
-}
-EXPORT_SYMBOL(display_device_unregister);
-
-static int __init display_class_init(void)
-{
-        display_class = class_create(THIS_MODULE, "display");
-        if (IS_ERR(display_class)) {
-                printk(KERN_ERR "Failed to create display class\n");
-                display_class = NULL;
-                return -EINVAL;
-        }
-        display_class->dev_attrs = display_attrs;
-        display_class->suspend = display_suspend;
-        display_class->resume = display_resume;
-        mutex_init(&allocated_dsp_lock);
-        return 0;
-}
-
-static void __exit display_class_exit(void)
-{
-        class_destroy(display_class);
-}
-
-module_init(display_class_init);
-module_exit(display_class_exit);
-
-MODULE_DESCRIPTION("Display Hardware handling");
-MODULE_AUTHOR("James Simmons <jsimmons@infradead.org>");
-MODULE_LICENSE("GPL");
-
diff --git a/drivers/video/s3c-fb.c b/drivers/video/s3c-fb.c
index 0753b1cfcb8b..12eaee0b29e6 100644
--- a/drivers/video/s3c-fb.c
+++ b/drivers/video/s3c-fb.c
@@ -621,7 +621,8 @@ static int s3c_fb_set_par(struct fb_info *info)
                 } else if (var->transp.length == 1)
                         data |= WINCON1_BPPMODE_25BPP_A1888
                                 | WINCON1_BLD_PIX;
-                else if (var->transp.length == 4)
+                else if ((var->transp.length == 4) ||
+                        (var->transp.length == 8))
                         data |= WINCON1_BPPMODE_28BPP_A4888
                                 | WINCON1_BLD_PIX | WINCON1_ALPHA_SEL;
                 else
diff --git a/include/linux/display.h b/include/linux/display.h
deleted file mode 100644
index 3bf70d639728..000000000000
--- a/include/linux/display.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- *  Copyright (C) 2006 James Simmons <jsimmons@infradead.org>
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or (at
- *  your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful, but
- *  WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- *  General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along
- *  with this program; if not, write to the Free Software Foundation, Inc.,
- *  59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- *
- * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- */
-
-#ifndef _LINUX_DISPLAY_H
-#define _LINUX_DISPLAY_H
-
-#include <linux/device.h>
-
-struct display_device;
-
-/* This structure defines all the properties of a Display. */
-struct display_driver {
-        int  (*set_contrast)(struct display_device *, unsigned int);
-        int  (*get_contrast)(struct display_device *);
-        void (*suspend)(struct display_device *, pm_message_t state);
-        void (*resume)(struct display_device *);
-        int  (*probe)(struct display_device *, void *);
-        int  (*remove)(struct display_device *);
-        int  max_contrast;
-};
-
-struct display_device {
-        struct module *owner;                   /* Owner module */
-        struct display_driver *driver;
-        struct device *parent;                  /* This is the parent */
-        struct device *dev;                     /* This is this display device */
-        struct mutex lock;
-        void *priv_data;
-        char type[16];
-        char *name;
-        int idx;
-};
-
-extern struct display_device *display_device_register(struct display_driver *driver,
-                                        struct device *dev, void *devdata);
-extern void display_device_unregister(struct display_device *dev);
-
-extern int probe_edid(struct display_device *dev, void *devdata);
-
-#define to_display_device(obj) container_of(obj, struct display_device, class_dev)
-
-#endif
diff --git a/include/linux/zorro_ids.h b/include/linux/zorro_ids.h
index 7e749088910d..74bc53bcfdcf 100644
--- a/include/linux/zorro_ids.h
+++ b/include/linux/zorro_ids.h
@@ -360,8 +360,8 @@
 #define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_RAM       ZORRO_ID(VILLAGE_TRONIC, 0x0B, 0)
 #define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_REG       ZORRO_ID(VILLAGE_TRONIC, 0x0C, 0)
 #define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_II_II_PLUS_SEGMENTED_MODE    ZORRO_ID(VILLAGE_TRONIC, 0x0D, 0)
-#define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_MEM1           ZORRO_ID(VILLAGE_TRONIC, 0x15, 0)
-#define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_MEM2           ZORRO_ID(VILLAGE_TRONIC, 0x16, 0)
+#define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_RAM1           ZORRO_ID(VILLAGE_TRONIC, 0x15, 0)
+#define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_RAM2           ZORRO_ID(VILLAGE_TRONIC, 0x16, 0)
 #define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z2_REG            ZORRO_ID(VILLAGE_TRONIC, 0x17, 0)
 #define  ZORRO_PROD_VILLAGE_TRONIC_PICASSO_IV_Z3                ZORRO_ID(VILLAGE_TRONIC, 0x18, 0)
 #define  ZORRO_PROD_VILLAGE_TRONIC_ARIADNE                      ZORRO_ID(VILLAGE_TRONIC, 0xC9, 0)