Merge master.kernel.org:/home/rmk/linux-2.6-arm

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] 4561/1: i.MX/MX1 GPIO parenthes omission and input setup fix
  [ARM] 4557/1: Fix PXA irq gpio initialization
  [ARM] 4551/1: s3c24xx: fix wrong virtual address offsets
  [ARM] 4552/1: i.MX/MX1 GPIO output setup fix
  [ARM] 4553/1: ARM at91: define FIQ_START
  [ARM] 4554/1: replace consistent_sync() with flush_ioremap_region()
  ARM: OMAP: Enable serial idling and wakeup features
  ARM: OMAP2: Force APLLs always active
  ARM: OMAP: H3 workqueue fixes
  ARM: OMAP: OSK led fixes
  ARM: OMAP: fix OMAP1 dmtimer build warning
  ARM: OMAP: Fix 32k timer unsupported one-shot mode

4 files changed, 17 insertions, 6 deletions

diff --git a/include/asm-arm/arch-at91/irqs.h b/include/asm-arm/arch-at91/irqs.h
index 1127a3b5e928..70b1216dce5d 100644
--- a/include/asm-arm/arch-at91/irqs.h
+++ b/include/asm-arm/arch-at91/irqs.h
@@ -42,4 +42,7 @@
  */
 #define NR_IRQS         (NR_AIC_IRQS + (5 * 32))
 
+/* FIQ is AIC source 0. */
+#define FIQ_START AT91_ID_FIQ
+
 #endif
diff --git a/include/asm-arm/arch-omap/irda.h b/include/asm-arm/arch-omap/irda.h
index 345a649ec838..96bb12fab438 100644
--- a/include/asm-arm/arch-omap/irda.h
+++ b/include/asm-arm/arch-omap/irda.h
@@ -31,6 +31,7 @@ struct omap_irda_config {
         unsigned long src_start;
         int tx_trigger;
         int rx_trigger;
+        int mode;
 };
 
 #endif
diff --git a/include/asm-arm/cacheflush.h b/include/asm-arm/cacheflush.h
index d1294a46c70c..6c1c968b2987 100644
--- a/include/asm-arm/cacheflush.h
+++ b/include/asm-arm/cacheflush.h
@@ -426,6 +426,13 @@ static inline void flush_anon_page(struct vm_area_struct *vma,
  */
 #define flush_icache_page(vma,page)     do { } while (0)
 
+static inline void flush_ioremap_region(unsigned long phys, void __iomem *virt,
+        unsigned offset, size_t size)
+{
+        const void *start = (void __force *)virt + offset;
+        dmac_inv_range(start, start + size);
+}
+
 #define __cacheid_present(val)                  (val != read_cpuid(CPUID_ID))
 #define __cacheid_type_v7(val)                  ((val & (7 << 29)) == (4 << 29))
 
diff --git a/include/asm-arm/plat-s3c/map.h b/include/asm-arm/plat-s3c/map.h
index 95a82b0e84a1..b84289d32a54 100644
--- a/include/asm-arm/plat-s3c/map.h
+++ b/include/asm-arm/plat-s3c/map.h
@@ -30,11 +30,11 @@
 #define S3C_ADDR(x)     (S3C_ADDR_BASE + (x))
 #endif
 
-#define S3C_VA_IRQ      S3C_ADDR(0x000000000)   /* irq controller(s) */
-#define S3C_VA_SYS      S3C_ADDR(0x001000000)   /* system control */
-#define S3C_VA_MEM      S3C_ADDR(0x002000000)   /* system control */
-#define S3C_VA_TIMER    S3C_ADDR(0x003000000)   /* timer block */
-#define S3C_VA_WATCHDOG S3C_ADDR(0x004000000)   /* watchdog */
-#define S3C_VA_UART     S3C_ADDR(0x010000000)   /* UART */
+#define S3C_VA_IRQ      S3C_ADDR(0x00000000)    /* irq controller(s) */
+#define S3C_VA_SYS      S3C_ADDR(0x00100000)    /* system control */
+#define S3C_VA_MEM      S3C_ADDR(0x00200000)    /* system control */
+#define S3C_VA_TIMER    S3C_ADDR(0x00300000)    /* timer block */
+#define S3C_VA_WATCHDOG S3C_ADDR(0x00400000)    /* watchdog */
+#define S3C_VA_UART     S3C_ADDR(0x01000000)    /* UART */
 
 #endif /* __ASM_PLAT_MAP_H */