Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...

[firefly-linux-kernel-4.4.55.git] / arch / mips / alchemy / board-xxs1500.c

diff --git a/arch/mips/alchemy/board-xxs1500.c b/arch/mips/alchemy/board-xxs1500.c
index 3fb814be0e91043b494f7e225f780ae39e44e6c7..0fc53e08a894c94671d2b77d3af963b4ef4bef7f 100644 (file)
--- a/arch/mips/alchemy/board-xxs1500.c
+++ b/arch/mips/alchemy/board-xxs1500.c
@@ -87,9 +87,9 @@ void __init board_setup(void)
        alchemy_gpio2_enable();
 
        /* Set multiple use pins (UART3/GPIO) to UART (it's used as UART too) */
-       pin_func  = au_readl(SYS_PINFUNC) & ~SYS_PF_UR3;
+       pin_func  = alchemy_rdsys(AU1000_SYS_PINFUNC) & ~SYS_PF_UR3;
        pin_func |= SYS_PF_UR3;
-       au_writel(pin_func, SYS_PINFUNC);
+       alchemy_wrsys(pin_func, AU1000_SYS_PINFUNC);
 
        /* Enable UART */
        alchemy_uart_enable(AU1000_UART3_PHYS_ADDR);