3 files changed, 31 insertions, 4 deletions

diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index 813b6844cdf6..0c6e02f80a31 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -813,7 +813,7 @@ static struct resource pio4_resource[] = {
 DEFINE_DEV(pio, 4);
 DEV_CLK(mck, pio4, pba, 14);
 
-void __init at32_add_system_devices(void)
+static int __init system_device_init(void)
 {
         platform_device_register(&at32_pm0_device);
         platform_device_register(&at32_intc0_device);
@@ -832,7 +832,10 @@ void __init at32_add_system_devices(void)
         platform_device_register(&pio2_device);
         platform_device_register(&pio3_device);
         platform_device_register(&pio4_device);
+
+        return 0;
 }
+core_initcall(system_device_init);
 
 /* --------------------------------------------------------------------
  *  PSIF
@@ -1091,7 +1094,9 @@ at32_add_device_eth(unsigned int id, struct eth_platform_data *data)
                         pin_mask |= (1 << 11);  /* RXD2 */
                         pin_mask |= (1 << 12);  /* RXD3 */
                         pin_mask |= (1 << 14);  /* RXCK */
+#ifndef CONFIG_BOARD_MIMC200
                         pin_mask |= (1 << 18);  /* SPD  */
+#endif
                 }
 
                 select_peripheral(PIOC, pin_mask, PERIPH_A, 0);
@@ -1112,8 +1117,10 @@ at32_add_device_eth(unsigned int id, struct eth_platform_data *data)
                 pin_mask |= (1 << 3);   /* MDC  */
                 pin_mask |= (1 << 2);   /* MDIO */
 
+#ifndef CONFIG_BOARD_MIMC200
                 if (!data->is_rmii)
                         pin_mask |= (1 << 15);  /* SPD  */
+#endif
 
                 select_peripheral(PIOD, pin_mask, PERIPH_B, 0);
 
@@ -1470,7 +1477,7 @@ at32_add_device_lcdc(unsigned int id, struct atmel_lcdfb_info *data,
                         pin_mask = ATMEL_LCDC_PRI_24BIT | ATMEL_LCDC_PRI_CONTROL;
 
                 /* LCDC on port C */
-                portc_mask = (pin_mask & 0xfff80000) >> 19;
+                portc_mask = pin_mask & 0xfff80000;
                 select_peripheral(PIOC, portc_mask, PERIPH_A, 0);
 
                 /* LCDC on port D */
diff --git a/arch/avr32/mach-at32ap/cpufreq.c b/arch/avr32/mach-at32ap/cpufreq.c
index d84efe4984ab..024c586e936c 100644
--- a/arch/avr32/mach-at32ap/cpufreq.c
+++ b/arch/avr32/mach-at32ap/cpufreq.c
@@ -40,6 +40,9 @@ static unsigned int at32_get_speed(unsigned int cpu)
         return (unsigned int)((clk_get_rate(cpuclk) + 500) / 1000);
 }
 
+static unsigned int     ref_freq;
+static unsigned long    loops_per_jiffy_ref;
+
 static int at32_set_target(struct cpufreq_policy *policy,
                           unsigned int target_freq,
                           unsigned int relation)
@@ -61,8 +64,19 @@ static int at32_set_target(struct cpufreq_policy *policy,
         freqs.cpu = 0;
         freqs.flags = 0;
 
+        if (!ref_freq) {
+                ref_freq = freqs.old;
+                loops_per_jiffy_ref = boot_cpu_data.loops_per_jiffy;
+        }
+
         cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+        if (freqs.old < freqs.new)
+                boot_cpu_data.loops_per_jiffy = cpufreq_scale(
+                                loops_per_jiffy_ref, ref_freq, freqs.new);
         clk_set_rate(cpuclk, freq);
+        if (freqs.new < freqs.old)
+                boot_cpu_data.loops_per_jiffy = cpufreq_scale(
+                                loops_per_jiffy_ref, ref_freq, freqs.new);
         cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
 
         pr_debug("cpufreq: set frequency %lu Hz\n", freq);
diff --git a/arch/avr32/mach-at32ap/include/mach/board.h b/arch/avr32/mach-at32ap/include/mach/board.h
index c48386d66bc3..aafaf7a78886 100644
--- a/arch/avr32/mach-at32ap/include/mach/board.h
+++ b/arch/avr32/mach-at32ap/include/mach/board.h
@@ -14,8 +14,14 @@
  */
 extern unsigned long at32_board_osc_rates[];
   
-/* Add basic devices: system manager, interrupt controller, portmuxes, etc. */
-void at32_add_system_devices(void);
+/*
+ * This used to add essential system devices, but this is now done
+ * automatically. Please don't use it in new board code.
+ */
+static inline void __deprecated at32_add_system_devices(void)
+{
+
+}
 
 #define ATMEL_MAX_UART  4
 extern struct platform_device *atmel_default_console_device;