Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi...

[cascardo/linux.git] / arch / arm / mach-pxa / pxa3xx.c

diff --git a/arch/arm/mach-pxa/pxa3xx.c b/arch/arm/mach-pxa/pxa3xx.c
index a1c4c88..3c9184d 100644 (file)
--- a/arch/arm/mach-pxa/pxa3xx.c
+++ b/arch/arm/mach-pxa/pxa3xx.c
@@ -68,7 +68,6 @@ static unsigned long wakeup_src;
  */
 static void pxa3xx_cpu_standby(unsigned int pwrmode)
 {
-       extern const char pm_enter_standby_start[], pm_enter_standby_end[];
        void (*fn)(unsigned int) = (void __force *)(sram + 0x8000);
 
        memcpy_toio(sram + 0x8000, pm_enter_standby_start,
@@ -103,11 +102,10 @@ static void pxa3xx_cpu_pm_suspend(void)
 #ifndef CONFIG_IWMMXT
        u64 acc0;
 
-       asm volatile("mra %Q0, %R0, acc0" : "=r" (acc0));
+       asm volatile(".arch_extension xscale\n\t"
+                    "mra %Q0, %R0, acc0" : "=r" (acc0));
 #endif
 
-       extern int pxa3xx_finish_suspend(unsigned long);
-
        /* resuming from D2 requires the HSIO2/BOOT/TPM clocks enabled */
        CKENA |= (1 << CKEN_BOOT) | (1 << CKEN_TPM);
        CKENB |= 1 << (CKEN_HSIO2 & 0x1f);
@@ -133,7 +131,8 @@ static void pxa3xx_cpu_pm_suspend(void)
        AD3ER = 0;
 
 #ifndef CONFIG_IWMMXT
-       asm volatile("mar acc0, %Q0, %R0" : "=r" (acc0));
+       asm volatile(".arch_extension xscale\n\t"
+                    "mar acc0, %Q0, %R0" : "=r" (acc0));
 #endif
 }
 
@@ -450,7 +449,7 @@ static int __init pxa3xx_init(void)
                if (of_have_populated_dt())
                        return 0;
 
-               pxa2xx_set_dmac_info(32);
+               pxa2xx_set_dmac_info(32, 100);
                ret = platform_add_devices(devices, ARRAY_SIZE(devices));
                if (ret)
                        return ret;