[MIPS] Fix IP32 breakage
- suppress master aborts during config read - set io_map_base - only fixup end of iomem resource to avoid failing request_resource in serial driver - killed useless setting of crime_int bit, which caused wrong interrupts - use physcial address for serial port platform device and let 8250 driver do the ioremap Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:

committed by
Ralf Baechle

parent
9cfacb790f
commit
c990081bf8
@@ -13,21 +13,22 @@
|
||||
#include <asm/ip32/mace.h>
|
||||
#include <asm/ip32/ip32_ints.h>
|
||||
|
||||
/*
|
||||
* .iobase isn't a constant (in the sense of C) so we fill it in at runtime.
|
||||
*/
|
||||
#define MACE_PORT(int) \
|
||||
#define MACEISA_SERIAL1_OFFS offsetof(struct sgi_mace, isa.serial1)
|
||||
#define MACEISA_SERIAL2_OFFS offsetof(struct sgi_mace, isa.serial2)
|
||||
|
||||
#define MACE_PORT(offset,_irq) \
|
||||
{ \
|
||||
.irq = int, \
|
||||
.mapbase = MACE_BASE + offset, \
|
||||
.irq = _irq, \
|
||||
.uartclk = 1843200, \
|
||||
.iotype = UPIO_MEM, \
|
||||
.flags = UPF_SKIP_TEST, \
|
||||
.flags = UPF_SKIP_TEST|UPF_IOREMAP, \
|
||||
.regshift = 8, \
|
||||
}
|
||||
|
||||
static struct plat_serial8250_port uart8250_data[] = {
|
||||
MACE_PORT(MACEISA_SERIAL1_IRQ),
|
||||
MACE_PORT(MACEISA_SERIAL2_IRQ),
|
||||
MACE_PORT(MACEISA_SERIAL1_OFFS, MACEISA_SERIAL1_IRQ),
|
||||
MACE_PORT(MACEISA_SERIAL2_OFFS, MACEISA_SERIAL2_IRQ),
|
||||
{ },
|
||||
};
|
||||
|
||||
@@ -41,9 +42,6 @@ static struct platform_device uart8250_device = {
|
||||
|
||||
static int __init uart8250_init(void)
|
||||
{
|
||||
uart8250_data[0].membase = (void __iomem *) &mace->isa.serial1;
|
||||
uart8250_data[1].membase = (void __iomem *) &mace->isa.serial2;
|
||||
|
||||
return platform_device_register(&uart8250_device);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user