Merge branch 'for-2.6.36' into for-2.6.37

Fairly simple conflicts, the most serious ones are the i.MX ones which I
suspect now need another rename.

Conflicts:
	arch/arm/mach-mx2/clock_imx27.c
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-omap2/board-rx51-peripherals.c
	arch/arm/mach-omap2/board-zoom2.c
	sound/soc/fsl/mpc5200_dma.c
	sound/soc/fsl/mpc5200_dma.h
	sound/soc/fsl/mpc8610_hpcd.c
	sound/soc/pxa/spitz.c

5 files changed, 64 insertions, 9 deletions

diff --git a/arch/arm/mach-omap2/include/mach/board-sdp.h b/arch/arm/mach-omap2/include/mach/board-flash.h
index 465169c0908a..b2242ae2bb6f 100644
--- a/arch/arm/mach-omap2/include/mach/board-sdp.h
+++ b/arch/arm/mach-omap2/include/mach/board-flash.h
@@ -12,10 +12,17 @@
  */
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
+#include <plat/gpmc.h>
+
+#define PDC_NOR         1
+#define PDC_NAND        2
+#define PDC_ONENAND     3
+#define DBG_MPDB        4
 
 struct flash_partitions {
         struct mtd_partition *parts;
         int nr_parts;
 };
 
-extern void sdp_flash_init(struct flash_partitions []);
+extern void board_flash_init(struct flash_partitions [],
+                                char chip_sel[][GPMC_CS_NUM]);
diff --git a/arch/arm/mach-omap2/include/mach/board-zoom.h b/arch/arm/mach-omap2/include/mach/board-zoom.h
index b6a010fc8bda..80591fda8f8f 100644
--- a/arch/arm/mach-omap2/include/mach/board-zoom.h
+++ b/arch/arm/mach-omap2/include/mach/board-zoom.h
@@ -1,6 +1,12 @@
 /*
  * Defines for zoom boards
  */
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+
+#define ZOOM_NAND_CS    0
+
+extern void __init board_nand_init(struct mtd_partition *, u8 nr_parts, u8 cs);
 extern int __init zoom_debugboard_init(void);
 extern void __init zoom_peripherals_init(void);
 
diff --git a/arch/arm/mach-omap2/include/mach/debug-macro.S b/arch/arm/mach-omap2/include/mach/debug-macro.S
index 35b24409a0c8..09331bbbda52 100644
--- a/arch/arm/mach-omap2/include/mach/debug-macro.S
+++ b/arch/arm/mach-omap2/include/mach/debug-macro.S
@@ -36,7 +36,7 @@ omap_uart_lsr:	.word	0
                 /* Use omap_uart_phys/virt if already configured */
 10:             mrc     p15, 0, \rx, c1, c0
                 tst     \rx, #1                 @ MMU enabled?
-                ldreq   \rx, =omap_uart_phys    @ physical base address
+                ldreq   \rx, =__virt_to_phys(omap_uart_phys)    @ physical base address
                 ldrne   \rx, =omap_uart_virt    @ virtual base address
                 ldr     \rx, [\rx, #0]
                 cmp     \rx, #0                 @ is port configured?
@@ -89,26 +89,36 @@ omap_uart_lsr:	.word	0
 44:             mov     \rx, #UART_OFFSET(OMAP4_UART4_BASE)
                 b       98f
 95:             ldr     \rx, =ZOOM_UART_BASE
-                ldr     \tmp, =omap_uart_phys
+                mrc     p15, 0, \tmp, c1, c0
+                tst     \tmp, #1                @ MMU enabled?
+                ldreq   \tmp, =__virt_to_phys(omap_uart_phys)
+                ldrne   \tmp, =omap_uart_phys
                 str     \rx, [\tmp, #0]
                 ldr     \rx, =ZOOM_UART_VIRT
-                ldr     \tmp, =omap_uart_virt
+                ldreq   \tmp, =__virt_to_phys(omap_uart_virt)
+                ldrne   \tmp, =omap_uart_virt
                 str     \rx, [\tmp, #0]
                 mov     \rx, #(UART_LSR << ZOOM_PORT_SHIFT)
-                ldr     \tmp, =omap_uart_lsr
+                ldreq   \tmp, =__virt_to_phys(omap_uart_lsr)
+                ldrne   \tmp, =omap_uart_lsr
                 str     \rx, [\tmp, #0]
                 b       10b
 
                 /* Store both phys and virt address for the uart */
 98:             add     \rx, \rx, #0x48000000   @ phys base
-                ldr     \tmp, =omap_uart_phys
+                mrc     p15, 0, \tmp, c1, c0
+                tst     \tmp, #1                @ MMU enabled?
+                ldreq   \tmp, =__virt_to_phys(omap_uart_phys)
+                ldrne   \tmp, =omap_uart_phys
                 str     \rx, [\tmp, #0]
                 sub     \rx, \rx, #0x48000000   @ phys base
                 add     \rx, \rx, #0xfa000000   @ virt base
-                ldr     \tmp, =omap_uart_virt
+                ldreq   \tmp, =__virt_to_phys(omap_uart_virt)
+                ldrne   \tmp, =omap_uart_virt
                 str     \rx, [\tmp, #0]
                 mov     \rx, #(UART_LSR << OMAP_PORT_SHIFT)
-                ldr     \tmp, =omap_uart_lsr
+                ldreq   \tmp, =__virt_to_phys(omap_uart_lsr)
+                ldrne   \tmp, =omap_uart_lsr
                 str     \rx, [\tmp, #0]
 
                 b       10b
@@ -120,7 +130,10 @@ omap_uart_lsr:	.word	0
                 .endm
 
                 .macro  busyuart,rd,rx
-1001:           ldr     \rd, =omap_uart_lsr
+1001:           mrc     p15, 0, \rd, c1, c0
+                tst     \rd, #1         @ MMU enabled?
+                ldreq   \rd, =__virt_to_phys(omap_uart_lsr)
+                ldrne   \rd, =omap_uart_lsr
                 ldr     \rd, [\rd, #0]
                 ldrb    \rd, [\rx, \rd]
                 and     \rd, \rd, #(UART_LSR_TEMT | UART_LSR_THRE)
diff --git a/arch/arm/mach-omap2/include/mach/id.h b/arch/arm/mach-omap2/include/mach/id.h
new file mode 100644
index 000000000000..02ed3aa56f1e
--- /dev/null
+++ b/arch/arm/mach-omap2/include/mach/id.h
@@ -0,0 +1,22 @@
+/*
+ * OMAP2 CPU identification code
+ *
+ * Copyright (C) 2010 Kan-Ru Chen <kanru@0xlab.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#ifndef OMAP2_ARCH_ID_H
+#define OMAP2_ARCH_ID_H
+
+struct omap_die_id {
+        u32 id_0;
+        u32 id_1;
+        u32 id_2;
+        u32 id_3;
+};
+
+void omap_get_die_id(struct omap_die_id *odi);
+
+#endif
diff --git a/arch/arm/mach-omap2/include/mach/omap4-common.h b/arch/arm/mach-omap2/include/mach/omap4-common.h
index 423af3a6dd31..2744dfee1ff4 100644
--- a/arch/arm/mach-omap2/include/mach/omap4-common.h
+++ b/arch/arm/mach-omap2/include/mach/omap4-common.h
@@ -13,6 +13,13 @@
 #ifndef OMAP_ARCH_OMAP4_COMMON_H
 #define OMAP_ARCH_OMAP4_COMMON_H
 
+/*
+ * wfi used in low power code. Directly opcode is used instead
+ * of instruction to avoid mulit-omap build break
+ */
+#define do_wfi()                        \
+                __asm__ __volatile__ (".word    0xe320f003" : : : "memory")
+
 #ifdef CONFIG_CACHE_L2X0
 extern void __iomem *l2cache_base;
 #endif