4 files changed, 34 insertions, 1 deletions

diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c
index 37cd547855b1..728bb8f39441 100644
--- a/arch/arm/mach-at91/at91sam9261_devices.c
+++ b/arch/arm/mach-at91/at91sam9261_devices.c
@@ -539,6 +539,17 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
         at91_set_B_periph(AT91_PIN_PB28, 0);    /* LCDD23 */
 #endif
 
+        if (ARRAY_SIZE(lcdc_resources) > 2) {
+                void __iomem *fb;
+                struct resource *fb_res = &lcdc_resources[2];
+                size_t fb_len = fb_res->end - fb_res->start + 1;
+
+                fb = ioremap_writecombine(fb_res->start, fb_len);
+                if (fb) {
+                        memset(fb, 0, fb_len);
+                        iounmap(fb, fb_len);
+                }
+        }
         lcdc_data = *data;
         platform_device_register(&at91_lcdc_device);
 }
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
index dbb9a5fc2090..054689804e77 100644
--- a/arch/arm/mach-at91/at91sam9rl_devices.c
+++ b/arch/arm/mach-at91/at91sam9rl_devices.c
@@ -381,6 +381,20 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
         at91_set_B_periph(AT91_PIN_PC24, 0);    /* LCDD22 */
         at91_set_B_periph(AT91_PIN_PC25, 0);    /* LCDD23 */
 
+#ifdef CONFIG_FB_INTSRAM
+        {
+                void __iomem *fb;
+                struct resource *fb_res = &lcdc_resources[2];
+                size_t fb_len = fb_res->end - fb_res->start + 1;
+
+                fb = ioremap_writecombine(fb_res->start, fb_len);
+                if (fb) {
+                        memset(fb, 0, fb_len);
+                        iounmap(fb, fb_len);
+                }
+        }
+#endif
+
         lcdc_data = *data;
         platform_device_register(&at91_lcdc_device);
 }
diff --git a/arch/avr32/kernel/setup.c b/arch/avr32/kernel/setup.c
index 2687b730e2d0..ce48c14f4349 100644
--- a/arch/avr32/kernel/setup.c
+++ b/arch/avr32/kernel/setup.c
@@ -274,6 +274,8 @@ static int __init early_parse_fbmem(char *p)
                         printk(KERN_WARNING
                                "Failed to allocate framebuffer memory\n");
                         fbmem_size = 0;
+                } else {
+                        memset(__va(fbmem_start), 0, fbmem_size);
                 }
         }
 
diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index fc65c02306dd..4d68b1b880d6 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -250,6 +250,8 @@ static int atmel_lcdfb_alloc_video_memory(struct atmel_lcdfb_info *sinfo)
                 return -ENOMEM;
         }
 
+        memset(info->screen_base, 0, info->fix.smem_len);
+
         return 0;
 }
 
@@ -634,7 +636,6 @@ static int __init atmel_lcdfb_init_fbinfo(struct atmel_lcdfb_info *sinfo)
         struct fb_info *info = sinfo->info;
         int ret = 0;
 
-        memset_io(info->screen_base, 0, info->fix.smem_len);
         info->var.activate |= FB_ACTIVATE_FORCE | FB_ACTIVATE_NOW;
 
         dev_info(info->device,
@@ -764,6 +765,11 @@ static int __init atmel_lcdfb_probe(struct platform_device *pdev)
                 info->screen_base = ioremap(info->fix.smem_start, info->fix.smem_len);
                 if (!info->screen_base)
                         goto release_intmem;
+
+                /*
+                 * Don't clear the framebuffer -- someone may have set
+                 * up a splash image.
+                 */
         } else {
                 /* alocate memory buffer */
                 ret = atmel_lcdfb_alloc_video_memory(sinfo);