projects / GitHub / LineageOS / G12 / android_kernel_amlogic_linux-4.9.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1b0c509)
ARM: unify MMU/!MMU addruart calls
authorStefan Agner <stefan@agner.ch>
Tue, 19 May 2015 22:03:50 +0000 (00:03 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 20 May 2015 21:09:51 +0000 (23:09 +0200)
Remove the needless differences between MMU/!MMU addruart calls.
This allows to use the same addruart macro on SoC level. Useful
for SoC consisting of multiple CPUs with and without MMU such as
Freescale Vybrid.

Signed-off-by: Stefan Agner <stefan@agner.ch>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/include/debug/efm32.S patch | blob | blame | history
arch/arm/kernel/debug.S patch | blob | blame | history

diff --git a/arch/arm/include/debug/efm32.S b/arch/arm/include/debug/efm32.S
index 2265a199280ca2e40dab1e22d87bb02f7fb66e54..660fa1e4b77beb87bd47b4fc8c4f8fa31d19eaa5 100644 (file)
--- a/arch/arm/include/debug/efm32.S
+++ b/arch/arm/include/debug/efm32.S
@@ -16,7 +16,7 @@
 
 #define        UARTn_TXDATA            0x0034
 
-               .macro  addruart, rx, tmp
+               .macro  addruart, rx, tmp, tmp2
                ldr     \rx, =(CONFIG_DEBUG_UART_PHYS)
 
                /*
diff --git a/arch/arm/kernel/debug.S b/arch/arm/kernel/debug.S
index 78c91b5f97d4943e896b4d566f71d491f9e17b22..ea9646cc2a0ed7eba2fa4f7f7638c0802642edcc 100644 (file)
--- a/arch/arm/kernel/debug.S
+++ b/arch/arm/kernel/debug.S
@@ -35,7 +35,7 @@
 
 #else /* !CONFIG_MMU */
                .macro  addruart_current, rx, tmp1, tmp2
-               addruart        \rx, \tmp1
+               addruart        \rx, \tmp1, \tmp2
                .endm
 
 #endif /* CONFIG_MMU */