Skip to content
/ linux Public

Commit 103e9d1

Browse files
FlyGoatSasha Levin
authored andcommitted
MIPS: rb532: Fix MMIO UART resource registration
[ Upstream commit e93bb4b ] Since commit 6e690d5 ("serial: 8250: fix return error code in serial8250_request_std_resource()"), registering an 8250 MMIO port without mapbase no longer works, as the resource range is derived from mapbase/mapsize. Populate mapbase and mapsize accordingly. Also drop ugly membase KSEG1 pointer and set UPF_IOREMAP instead, letting the 8250 core perform the ioremap. Fixes: 6e690d5 ("serial: 8250: fix return error code in serial8250_request_std_resource()") Cc: stable@vger.kernel.org Reported-by: Waldemar Brodkorb <wbx@openadk.org> Link: https://lore.kernel.org/linux-mips/aX-d0ShTplHKZT33@waldemar-brodkorb.de/ Signed-off-by: Jiaxun Yang <jiaxun.yang@flygoat.com> Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 953953a commit 103e9d1

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

arch/mips/rb532/devices.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,11 +212,12 @@ static struct platform_device rb532_wdt = {
212212
static struct plat_serial8250_port rb532_uart_res[] = {
213213
{
214214
.type = PORT_16550A,
215-
.membase = (char *)KSEG1ADDR(REGBASE + UART0BASE),
215+
.mapbase = REGBASE + UART0BASE,
216+
.mapsize = 0x1000,
216217
.irq = UART0_IRQ,
217218
.regshift = 2,
218219
.iotype = UPIO_MEM,
219-
.flags = UPF_BOOT_AUTOCONF,
220+
.flags = UPF_BOOT_AUTOCONF | UPF_IOREMAP,
220221
},
221222
{
222223
.flags = 0,

0 commit comments

Comments
 (0)