From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Date: Wed, 4 Mar 2015 14:41:27 +0000 (+0100)
Subject: ARM: at91: debug: fix non MMU debug
X-Git-Tag: android-x86-4.4-r3~157^2~1^2~8
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5a5a6451acbc197339783fd1ee06fd877ace4bbf;p=android-x86%2Fkernel.git

ARM: at91: debug: fix non MMU debug

Linux may be used without MMU on atmel SoCs, fix debug in this configuration.

Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---

diff --git a/arch/arm/include/debug/at91.S b/arch/arm/include/debug/at91.S
index 80a6501b4d50..c3c45e628e33 100644
--- a/arch/arm/include/debug/at91.S
+++ b/arch/arm/include/debug/at91.S
@@ -18,8 +18,11 @@
 #define AT91_DBGU 0xfc00c000 /* SAMA5D4_BASE_USART3 */
 #endif
 
-/* Keep in sync with mach-at91/include/mach/hardware.h */
+#ifdef CONFIG_MMU
 #define AT91_IO_P2V(x) ((x) - 0x01000000)
+#else
+#define AT91_IO_P2V(x) (x)
+#endif
 
 #define AT91_DBGU_SR		(0x14)	/* Status Register */
 #define AT91_DBGU_THR		(0x1c)	/* Transmitter Holding Register */