summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2015-08-30 21:19:58 -0700
committerRalf Baechle <ralf@linux-mips.org>2015-09-22 17:25:33 +0200
commitfc2ca674470bbfe11d72a20a3f19fd3dc43bfca0 (patch)
treebe0fae67da85ac608a7a02f3661f35e3dacd23e2 /arch/mips
parent1f93e4a96c9109378204c147b3eec0d0e8100fde (diff)
downloadlinux-stable-fc2ca674470bbfe11d72a20a3f19fd3dc43bfca0.tar.gz
linux-stable-fc2ca674470bbfe11d72a20a3f19fd3dc43bfca0.tar.bz2
linux-stable-fc2ca674470bbfe11d72a20a3f19fd3dc43bfca0.zip
MIPS: Fix console output for Fulong2e system
Commit 3adeb2566b9b ("MIPS: Loongson: Improve LEFI firmware interface") made the number of UARTs dynamic if LEFI_FIRMWARE_INTERFACE is configured. Unfortunately, it did not initialize the number of UARTs if LEFI_FIRMWARE_INTERFACE is not configured. As a result, the Fulong2e system has no console. Fixes: 3adeb2566b9b ("MIPS: Loongson: Improve LEFI firmware interface") Acked-by: Huacai Chen <chenhc@lemote.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Tested-by: Markos Chandras <markos.chandras@imgtec.com> Cc: linux-mips@linux-mips.org Cc: linux-kernel@vger.kernel.org Patchwork: https://patchwork.linux-mips.org/patch/11076/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/loongson64/common/env.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/mips/loongson64/common/env.c b/arch/mips/loongson64/common/env.c
index f6c44dd332e2..d6d07ad56180 100644
--- a/arch/mips/loongson64/common/env.c
+++ b/arch/mips/loongson64/common/env.c
@@ -64,6 +64,9 @@ void __init prom_init_env(void)
}
if (memsize == 0)
memsize = 256;
+
+ loongson_sysconf.nr_uarts = 1;
+
pr_info("memsize=%u, highmemsize=%u\n", memsize, highmemsize);
#else
struct boot_params *boot_p;