Merge branch 'for_linus' of git://github.com/at91linux/linux-2.6-at91

* 'for_linus' of git://github.com/at91linux/linux-2.6-at91:
  AT91: rtc: enable built-in RTC in Kconfig for at91sam9g45 family
  at91/atmel-mci: inclusion of sd/mmc driver in at91sam9g45 chip and board
  AT91: pm: make sure that r0 is 0 when dealing with cache operations
  AT91: pm: use plain cpu_do_idle() for "wait for interrupt"
  AT91: reset: extend alternate reset procedure to several chips
  AT91: reset routine cleanup, remove not needed icache flush
  AT91: trivial: align comment of at91sam9g20_reset with one more tab
  AT91: Fix AT91SAM9G20 reset as per the errata in the data sheet
  AT91: add board support for Pcontrol_G20

1 files changed, 11 insertions, 4 deletions

diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 615668986480..dafbacc25eb1 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -258,16 +258,23 @@ static int at91_pm_enter(suspend_state_t state)
                          * NOTE: the Wait-for-Interrupt instruction needs to be
                          * in icache so no SDRAM accesses are needed until the
                          * wakeup IRQ occurs and self-refresh is terminated.
+                         * For ARM 926 based chips, this requirement is weaker
+                         * as at91sam9 can access a RAM in self-refresh mode.
                          */
-                        asm("b 1f; .align 5; 1:");
-                        asm("mcr p15, 0, r0, c7, c10, 4");      /* drain write buffer */
+                        asm volatile (  "mov r0, #0\n\t"
+                                        "b 1f\n\t"
+                                        ".align 5\n\t"
+                                        "1: mcr p15, 0, r0, c7, c10, 4\n\t"
+                                        : /* no output */
+                                        : /* no input */
+                                        : "r0");
                         saved_lpr = sdram_selfrefresh_enable();
-                        asm("mcr p15, 0, r0, c7, c0, 4");       /* wait for interrupt */
+                        wait_for_interrupt_enable();
                         sdram_selfrefresh_disable(saved_lpr);
                         break;
 
                 case PM_SUSPEND_ON:
-                        asm("mcr p15, 0, r0, c7, c0, 4");       /* wait for interrupt */
+                        cpu_do_idle();
                         break;
 
                 default: