Hello.

Santosh Shilimkar wrote:

On OMAP4430 the UART3 base address is different than that on OMAP3.
Because of this existing code needs additional #ifdef'ry to accommodate
that code. Hence this patch separates it. Also UART3 base address is
fixed for OMAP4430 in this patch.

Signed-off-by: Santosh Shilimkar <santosh.shilim...@ti.com>
[...]
diff --git a/arch/arm/mach-omap2/include/mach/debug-macro.S 
b/arch/arm/mach-omap2/include/mach/debug-macro.S
index e9f255d..b2b4b29 100644
--- a/arch/arm/mach-omap2/include/mach/debug-macro.S
+++ b/arch/arm/mach-omap2/include/mach/debug-macro.S
@@ -25,7 +25,7 @@
                add     \rx, \rx, #0x00004000   @ UART 3
 #endif
-#elif defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
+#elif CONFIG_ARCH_OMAP3

Why you've dropped defined()? This doesn't seem right as it should cause error when CONFIG_ARCH_OMAP3=n...

                moveq   \rx, #0x48000000        @ physical base address
                movne   \rx, #0xfa000000        @ virtual base
                orr     \rx, \rx, #0x0006a000
@@ -36,6 +36,17 @@
                add     \rx, \rx, #0x00fb0000   @ UART 3
                add     \rx, \rx, #0x00006000
 #endif
+#elif CONFIG_ARCH_OMAP4

  Same comment here...

WBR, Sergei


--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to