3 files changed, 19 insertions, 24 deletions

diff --git a/arch/arm/mach-at91/at91sam9261_devices.c b/arch/arm/mach-at91/at91sam9261_devices.c
index 6b9e423ec474..247e8e7cebea 100644
--- a/arch/arm/mach-at91/at91sam9261_devices.c
+++ b/arch/arm/mach-at91/at91sam9261_devices.c
@@ -544,10 +544,10 @@ void __init at91_add_device_lcdc(struct atmel_lcdfb_info *data)
                 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);
+                fb = ioremap(fb_res->start, fb_len);
                 if (fb) {
                         memset(fb, 0, fb_len);
-                        iounmap(fb, fb_len);
+                        iounmap(fb);
                 }
         }
         lcdc_data = *data;
diff --git a/arch/arm/mach-at91/at91sam9rl_devices.c b/arch/arm/mach-at91/at91sam9rl_devices.c
index b21f33393269..9945cd25d0ab 100644
--- a/arch/arm/mach-at91/at91sam9rl_devices.c
+++ b/arch/arm/mach-at91/at91sam9rl_devices.c
@@ -332,13 +332,6 @@ static struct resource lcdc_resources[] = {
                 .end    = AT91SAM9RL_ID_LCDC,
                 .flags  = IORESOURCE_IRQ,
         },
-#if defined(CONFIG_FB_INTSRAM)
-        [2] = {
-                .start  = AT91SAM9RL_SRAM_BASE,
-                .end    = AT91SAM9RL_SRAM_BASE + AT91SAM9RL_SRAM_SIZE - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-#endif
 };
 
 static struct platform_device at91_lcdc_device = {
@@ -381,20 +374,6 @@ 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/arm/mach-at91/at91x40.c b/arch/arm/mach-at91/at91x40.c
index 1de121fc55f4..f44647738ee4 100644
--- a/arch/arm/mach-at91/at91x40.c
+++ b/arch/arm/mach-at91/at91x40.c
@@ -16,16 +16,32 @@
 #include <asm/mach/arch.h>
 #include <asm/arch/at91x40.h>
 #include <asm/arch/at91_st.h>
+#include <asm/arch/timex.h>
 #include "generic.h"
 
 /*
- * This is used in the gpio code, stub locally.
+ * Export the clock functions for the AT91X40. Some external code common
+ * to all AT91 family parts relys on this, like the gpio and serial support.
  */
 int clk_enable(struct clk *clk)
 {
         return 0;
 }
 
+void clk_disable(struct clk *clk)
+{
+}
+
+unsigned long clk_get_rate(struct clk *clk)
+{
+        return AT91X40_MASTER_CLOCK;
+}
+
+struct clk *clk_get(struct device *dev, const char *id)
+{
+        return NULL;
+}
+
 void __init at91x40_initialize(unsigned long main_clock)
 {
         at91_extern_irq = (1 << AT91X40_ID_IRQ0) | (1 << AT91X40_ID_IRQ1)