2 files changed, 25 insertions, 0 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);
 }