diff options
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/boards/dlink-dir-320/serial.c | 2 | ||||
| -rw-r--r-- | arch/mips/dts/tplink-mr3020.dts | 2 | ||||
| -rw-r--r-- | arch/mips/include/asm/io.h | 4 | ||||
| -rw-r--r-- | arch/mips/mach-ar231x/ar231x.c | 4 |
4 files changed, 9 insertions, 3 deletions
diff --git a/arch/mips/boards/dlink-dir-320/serial.c b/arch/mips/boards/dlink-dir-320/serial.c index bddb6838c9..eb873791c4 100644 --- a/arch/mips/boards/dlink-dir-320/serial.c +++ b/arch/mips/boards/dlink-dir-320/serial.c @@ -36,7 +36,7 @@ static int dir320_console_init(void) /* Register the serial port */ add_ns16550_device(DEVICE_ID_DYNAMIC, DEBUG_LL_UART_ADDR, 8, - IORESOURCE_MEM_8BIT, &serial_plat); + IORESOURCE_MEM | IORESOURCE_MEM_8BIT, &serial_plat); return 0; } diff --git a/arch/mips/dts/tplink-mr3020.dts b/arch/mips/dts/tplink-mr3020.dts index 7aeb740eed..41be352e5d 100644 --- a/arch/mips/dts/tplink-mr3020.dts +++ b/arch/mips/dts/tplink-mr3020.dts @@ -1,6 +1,6 @@ /dts-v1/; -#include <ar9331.dtsi> +#include "ar9331.dtsi" / { model = "TP-LINK MR3020"; diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h index 4100e1e52d..4832be6d09 100644 --- a/arch/mips/include/asm/io.h +++ b/arch/mips/include/asm/io.h @@ -14,6 +14,8 @@ #include <asm/types.h> #include <asm/byteorder.h> +#define IO_SPACE_LIMIT 0 + /*****************************************************************************/ /* * readX/writeX() are used to access memory mapped devices. On some @@ -76,4 +78,6 @@ static inline void __raw_writel(u32 b, volatile void __iomem *addr) #define out_be16(a, v) __raw_writew(__cpu_to_be16(v), a) #define out_be32(a, v) __raw_writel(__cpu_to_be32(v), a) +#include <asm-generic/io.h> + #endif /* __ASM_MIPS_IO_H */ diff --git a/arch/mips/mach-ar231x/ar231x.c b/arch/mips/mach-ar231x/ar231x.c index ca912bf0ef..f714a11e92 100644 --- a/arch/mips/mach-ar231x/ar231x.c +++ b/arch/mips/mach-ar231x/ar231x.c @@ -189,7 +189,9 @@ static int ar2312_console_init(void) /* Register the serial port */ serial_plat.clock = ar2312_sys_frequency(); add_ns16550_device(DEVICE_ID_DYNAMIC, KSEG1ADDR(AR2312_UART0), - 8 << AR2312_UART_SHIFT, IORESOURCE_MEM_8BIT, &serial_plat); + 8 << AR2312_UART_SHIFT, + IORESOURCE_MEM | IORESOURCE_MEM_8BIT, + &serial_plat); return 0; } console_initcall(ar2312_console_init); |