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

* 'omap-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: (143 commits)
  omap: mailbox: reorganize headers
  omap: mailbox: standarize on 'omap-mailbox'
  omap: mailbox: only compile for configured archs
  omap: mailbox: simplify omap_mbox_register()
  omap: mailbox: reorganize registering
  omap: mailbox: add IRQ names
  omap: mailbox: remove unecessary fields
  omap: mailbox: don't export unecessary symbols
  omap: mailbox: update omap1 probing
  omap: mailbox: use correct config for omap1
  omap: mailbox: 2420 should be detected at run-time
  omap: mailbox: reorganize structures
  omap: mailbox: trivial cleanups
  omap mailbox: Set a device in logical mbox instance for traceability
  omap: mailbox: convert block api to kfifo
  omap: mailbox: remove (un)likely macros from cold paths
  omap: mailbox cleanup: split MODULE_AUTHOR line
  omap: mailbox: convert rwlocks to spinlock
  Mailbox: disable mailbox interrupt when request queue
  Mailbox: new mutext lock for h/w mailbox configuration
  ...

1 files changed, 7 insertions, 3 deletions

diff --git a/arch/arm/mach-omap1/include/mach/debug-macro.S b/arch/arm/mach-omap1/include/mach/debug-macro.S
index e8a8cf36b7f0..671408eb4ab4 100644
--- a/arch/arm/mach-omap1/include/mach/debug-macro.S
+++ b/arch/arm/mach-omap1/include/mach/debug-macro.S
@@ -33,7 +33,7 @@ omap_uart_virt:	.word	0x0
                 /* Use omap_uart_phys/virt if already configured */
 9:              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
                 ldr     \rx, [\rx, #0]
                 cmp     \rx, #0                 @ is port configured?
@@ -68,11 +68,15 @@ omap_uart_virt:	.word	0x0
 
                 /* Store both phys and virt address for the uart */
 98:             add     \rx, \rx, #0xff000000   @ 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, #0xff000000   @ phys base
                 add     \rx, \rx, #0xfe000000   @ virt base
-                ldr     \tmp, =omap_uart_virt
+                ldreq   \tmp, =__virt_to_phys(omap_uart_virt)
+                ldrne   \tmp, =omap_uart_virt
                 str     \rx, [\tmp, #0]
                 b       9b
 99: