summaryrefslogtreecommitdiff
path: root/arch/mips/boot/compressed/uart-16550.c
diff options
context:
space:
mode:
authorHuacai Chen <chenhc@lemote.com>2015-04-21 05:00:35 +0300
committerRalf Baechle <ralf@linux-mips.org>2015-06-21 22:53:59 +0300
commit30ad29bb48881ee11f5daf30c6fc50292ae08c57 (patch)
treed899b18a17e6269123ff2795f2e6d832523f1fb9 /arch/mips/boot/compressed/uart-16550.c
parentabcc82b19fa9b4f41e02f28715005851b580163d (diff)
downloadlinux-30ad29bb48881ee11f5daf30c6fc50292ae08c57.tar.xz
MIPS: Loongson: Naming style cleanup and rework
Currently, code of Loongson-2/3 is under loongson directory and code of Loongson-1 is under loongson1 directory. Besides, there are Kconfig options such as MACH_LOONGSON and MACH_LOONGSON1. This naming style is very ugly and confusing. Since Loongson-2/3 are both 64-bit general- purpose CPU while Loongson-1 is 32-bit SoC, we rename both file names and Kconfig symbols from loongson/loongson1 to loongson64/loongson32. [ralf@linux-mips.org: Resolve a number of simple conflicts.] Signed-off-by: Huacai Chen <chenhc@lemote.com> Cc: Steven J. Hill <Steven.Hill@imgtec.com> Cc: linux-mips@linux-mips.org Cc: Fuxin Zhang <zhangfx@lemote.com> Cc: Zhangjin Wu <wuzhangjin@gmail.com> Cc: Kelvin Cheung <keguang.zhang@gmail.com> Patchwork: https://patchwork.linux-mips.org/patch/9790/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/boot/compressed/uart-16550.c')
-rw-r--r--arch/mips/boot/compressed/uart-16550.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/boot/compressed/uart-16550.c b/arch/mips/boot/compressed/uart-16550.c
index 237494b7a21a..408799a839b4 100644
--- a/arch/mips/boot/compressed/uart-16550.c
+++ b/arch/mips/boot/compressed/uart-16550.c
@@ -7,7 +7,7 @@
#include <asm/addrspace.h>
-#if defined(CONFIG_MACH_LOONGSON) || defined(CONFIG_MIPS_MALTA)
+#if defined(CONFIG_MACH_LOONGSON64) || defined(CONFIG_MIPS_MALTA)
#define UART_BASE 0x1fd003f8
#define PORT(offset) (CKSEG1ADDR(UART_BASE) + (offset))
#endif