summaryrefslogtreecommitdiff
path: root/arch/mips
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2018-01-24 12:02:09 +0800
committerAlex Shi <alex.shi@linaro.org>2018-01-24 12:02:09 +0800
commit4f0ca2b2718d297c88b1c303f2d414327c537636 (patch)
tree4b0a5fb992257e4441ca49576bef59e543678454 /arch/mips
parent4729f0eeb703afefcb7c5030f05ca35c44146394 (diff)
parent79584a4221253611a4d033087f373b046350df9f (diff)
Merge tag 'v4.9.78' into linux-linaro-lsk-v4.9
This is the 4.9.78 stable release
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/ar7/platform.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/ar7/platform.c b/arch/mips/ar7/platform.c
index 3446b6fb3acb..9da4e2292fc7 100644
--- a/arch/mips/ar7/platform.c
+++ b/arch/mips/ar7/platform.c
@@ -576,7 +576,7 @@ static int __init ar7_register_uarts(void)
uart_port.type = PORT_AR7;
uart_port.uartclk = clk_get_rate(bus_clk) / 2;
uart_port.iotype = UPIO_MEM32;
- uart_port.flags = UPF_FIXED_TYPE;
+ uart_port.flags = UPF_FIXED_TYPE | UPF_BOOT_AUTOCONF;
uart_port.regshift = 2;
uart_port.line = 0;