6 files changed, 11 insertions, 7 deletions

diff --git a/include/asm-arm/arch-pxa/entry-macro.S b/include/asm-arm/arch-pxa/entry-macro.S
index b7e730851461..c145bb01bc8f 100644
--- a/include/asm-arm/arch-pxa/entry-macro.S
+++ b/include/asm-arm/arch-pxa/entry-macro.S
@@ -35,7 +35,7 @@
 1004:
                 mrc     p6, 0, \irqstat, c6, c0, 0      @ ICIP2
                 mrc     p6, 0, \irqnr, c7, c0, 0        @ ICMR2
-                ands    \irqstat, \irqstat, \irqnr
+                ands    \irqnr, \irqstat, \irqnr
                 beq     1003f
                 rsb     \irqstat, \irqnr, #0
                 and     \irqstat, \irqstat, \irqnr
diff --git a/include/asm-arm/arch-pxa/pxa-regs.h b/include/asm-arm/arch-pxa/pxa-regs.h
index ac175b4d10cb..2357a73340d4 100644
--- a/include/asm-arm/arch-pxa/pxa-regs.h
+++ b/include/asm-arm/arch-pxa/pxa-regs.h
@@ -520,6 +520,9 @@
 #define MCCR_FSRIE      (1 << 1)        /* FIFO Service Request Interrupt Enable */
 
 #define GCR             __REG(0x4050000C)  /* Global Control Register */
+#ifdef CONFIG_PXA3xx
+#define GCR_CLKBPB      (1 << 31)       /* Internal clock enable */
+#endif
 #define GCR_nDMAEN      (1 << 24)       /* non DMA Enable */
 #define GCR_CDONE_IE    (1 << 19)       /* Command Done Interrupt Enable */
 #define GCR_SDONE_IE    (1 << 18)       /* Status Done Interrupt Enable */
diff --git a/include/asm-arm/arch-pxa/regs-ssp.h b/include/asm-arm/arch-pxa/regs-ssp.h
index 991cb688db75..0255328c3c18 100644
--- a/include/asm-arm/arch-pxa/regs-ssp.h
+++ b/include/asm-arm/arch-pxa/regs-ssp.h
@@ -85,6 +85,7 @@
 #define SSCR1_RSRE              (1 << 20)       /* Receive Service Request Enable */
 #define SSCR1_TINTE             (1 << 19)       /* Receiver Time-out Interrupt enable */
 #define SSCR1_PINTE             (1 << 18)       /* Peripheral Trailing Byte Interupt Enable */
+#define SSCR1_IFS               (1 << 16)       /* Invert Frame Signal */
 #define SSCR1_STRF              (1 << 15)       /* Select FIFO or EFWR */
 #define SSCR1_EFWR              (1 << 14)       /* Enable FIFO Write/Read */
 
diff --git a/include/asm-arm/kexec.h b/include/asm-arm/kexec.h
index 1ee17b6951d0..47fe34d692da 100644
--- a/include/asm-arm/kexec.h
+++ b/include/asm-arm/kexec.h
@@ -8,7 +8,7 @@
 /* Maximum address we can reach in physical address mode */
 #define KEXEC_DESTINATION_MEMORY_LIMIT (-1UL)
 /* Maximum address we can use for the control code buffer */
-#define KEXEC_CONTROL_MEMORY_LIMIT TASK_SIZE
+#define KEXEC_CONTROL_MEMORY_LIMIT (-1UL)
 
 #define KEXEC_CONTROL_CODE_SIZE 4096
 
diff --git a/include/asm-arm/mach/arch.h b/include/asm-arm/mach/arch.h
index c59fad18e73b..bcc8aed7c9a9 100644
--- a/include/asm-arm/mach/arch.h
+++ b/include/asm-arm/mach/arch.h
@@ -17,7 +17,7 @@ struct sys_timer;
 struct machine_desc {
         /*
          * Note! The first four elements are used
-         * by assembler code in head-armv.S
+         * by assembler code in head.S, head-common.S
          */
         unsigned int            nr;             /* architecture number  */
         unsigned int            phys_io;        /* start of physical io */
diff --git a/include/asm-arm/unaligned.h b/include/asm-arm/unaligned.h
index 8431f6eed5c6..5db03cf3b905 100644
--- a/include/asm-arm/unaligned.h
+++ b/include/asm-arm/unaligned.h
@@ -40,16 +40,16 @@ extern int __bug_unaligned_x(const void *ptr);
  */
 
 #define __get_unaligned_2_le(__p)                                       \
-        (__p[0] | __p[1] << 8)
+        (unsigned int)(__p[0] | __p[1] << 8)
 
 #define __get_unaligned_2_be(__p)                                       \
-        (__p[0] << 8 | __p[1])
+        (unsigned int)(__p[0] << 8 | __p[1])
 
 #define __get_unaligned_4_le(__p)                                       \
-        (__p[0] | __p[1] << 8 | __p[2] << 16 | __p[3] << 24)
+        (unsigned int)(__p[0] | __p[1] << 8 | __p[2] << 16 | __p[3] << 24)
 
 #define __get_unaligned_4_be(__p)                                       \
-        (__p[0] << 24 | __p[1] << 16 | __p[2] << 8 | __p[3])
+        (unsigned int)(__p[0] << 24 | __p[1] << 16 | __p[2] << 8 | __p[3])
 
 #define __get_unaligned_8_le(__p)                                       \
         ((unsigned long long)__get_unaligned_4_le((__p+4)) << 32 |      \