summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mvebu
diff options
context:
space:
mode:
authorMichel Stam <m.stam@fugro.nl>2014-04-07 12:01:22 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-04-09 19:31:42 +0200
commit9f556d4b6fc71d548e5c984c416f4f1b7d599d2f (patch)
tree96adeb2f953a59e7353f441023e17f4d09c7e9cb /arch/arm/mach-mvebu
parent940237285ebbdbfb4b341eb248fd77e9546df61e (diff)
downloadbarebox-9f556d4b6fc71d548e5c984c416f4f1b7d599d2f.tar.gz
barebox-9f556d4b6fc71d548e5c984c416f4f1b7d599d2f.tar.xz
x86: ns16550: Rework driver to allow for x86 I/O space
The current implementation fakes a memory-mapped I/O device at 0x3f8 and 0x2f8, then uses platform read/write functions to do the actual reading and writing. These platform functions only exist for the x86 platform; better to move the I/O routines into the driver and have the driver request I/O ports using request_ioport_region. Signed-off-by: Michel Stam <michel@reverze.net> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mvebu')
-rw-r--r--arch/arm/mach-mvebu/armada-370-xp.c3
-rw-r--r--arch/arm/mach-mvebu/kirkwood.c3
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index 776b4c09b8..209be0b603 100644
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -60,7 +60,8 @@ static int armada_370_xp_add_uart(void)
uart_plat.clock = clk_get_rate(tclk);
if (!add_ns16550_device(DEVICE_ID_DYNAMIC,
(unsigned int)CONSOLE_UART_BASE, 32,
- IORESOURCE_MEM_32BIT, &uart_plat))
+ IORESOURCE_MEM | IORESOURCE_MEM_32BIT,
+ &uart_plat))
return -ENODEV;
return 0;
}
diff --git a/arch/arm/mach-mvebu/kirkwood.c b/arch/arm/mach-mvebu/kirkwood.c
index 1284220dcf..c79d13002a 100644
--- a/arch/arm/mach-mvebu/kirkwood.c
+++ b/arch/arm/mach-mvebu/kirkwood.c
@@ -58,7 +58,8 @@ static int kirkwood_add_uart(void)
uart_plat.clock = clk_get_rate(tclk);
if (!add_ns16550_device(DEVICE_ID_DYNAMIC,
(unsigned int)CONSOLE_UART_BASE, 32,
- IORESOURCE_MEM_32BIT, &uart_plat))
+ IORESOURCE_MEM | IORESOURCE_MEM_32BIT,
+ &uart_plat))
return -ENODEV;
return 0;
}