Skip to content

L
linux-davinci-2.6.23
Commit 5e46c3ae authored by Ralf Baechle's avatar Ralf Baechle
Browse files
Options

[MIPS] C99-ify struct resource initialization. 

Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent cbb30696
Hide whitespace changes
Inline Side-by-side
Showing with 395 additions and 150 deletions
arch/mips/au1000/common/pci.c
View file @ 5e46c3ae
...@@ -40,17 +40,17 @@ ...@@ -40,17 +40,17 @@
/* TBD */ /* TBD */
static struct resource pci_io_resource = { static struct resource pci_io_resource = {
"pci IO space", .start = PCI_IO_START,
(u32)PCI_IO_START, .end = PCI_IO_END,
(u32)PCI_IO_END, .name = "PCI IO space",
IORESOURCE_IO .flags = IORESOURCE_IO
}; };
static struct resource pci_mem_resource = { static struct resource pci_mem_resource = {
"pci memory space", .start = PCI_MEM_START,
(u32)PCI_MEM_START, .end = PCI_MEM_END,
(u32)PCI_MEM_END, .name = "PCI memory space",
IORESOURCE_MEM .flags = IORESOURCE_MEM
}; };
extern struct pci_ops au1x_pci_ops; extern struct pci_ops au1x_pci_ops;
......
arch/mips/cobalt/setup.c
View file @ 5e46c3ae
...@@ -68,19 +68,46 @@ static void __init cobalt_timer_setup(struct irqaction *irq) ...@@ -68,19 +68,46 @@ static void __init cobalt_timer_setup(struct irqaction *irq)
extern struct pci_ops gt64111_pci_ops; extern struct pci_ops gt64111_pci_ops;
static struct resource cobalt_mem_resource = { static struct resource cobalt_mem_resource = {
"PCI memory", GT64111_MEM_BASE, GT64111_MEM_END, IORESOURCE_MEM .start = GT64111_MEM_BASE,
.end = GT64111_MEM_END,
.name = "PCI memory",
.flags = IORESOURCE_MEM
}; };
static struct resource cobalt_io_resource = { static struct resource cobalt_io_resource = {
"PCI I/O", 0x1000, 0xffff, IORESOURCE_IO .start = 0x1000,
.end = 0xffff,
.name = "PCI I/O",
.flags = IORESOURCE_IO
}; };
static struct resource cobalt_io_resources[] = { static struct resource cobalt_io_resources[] = {
{ "dma1", 0x00, 0x1f, IORESOURCE_BUSY }, {
{ "timer", 0x40, 0x5f, IORESOURCE_BUSY }, .start = 0x00,
{ "keyboard", 0x60, 0x6f, IORESOURCE_BUSY }, .end = 0x1f,
{ "dma page reg", 0x80, 0x8f, IORESOURCE_BUSY }, .name = "dma1",
{ "dma2", 0xc0, 0xdf, IORESOURCE_BUSY }, .flags = IORESOURCE_BUSY
}, {
.start = 0x40,
.end = 0x5f,
.name = "timer",
.flags = IORESOURCE_BUSY
}, {
.start = 0x60,
.end = 0x6f,
.name = "keyboard",
.flags = IORESOURCE_BUSY
}, {
.start = 0x80,
.end = 0x8f,
.name = "dma page reg",
.flags = IORESOURCE_BUSY
}, {
.start = 0xc0,
.end = 0xdf,
.name = "dma2",
.flags = IORESOURCE_BUSY
},
}; };
#define COBALT_IO_RESOURCES (sizeof(cobalt_io_resources)/sizeof(struct resource)) #define COBALT_IO_RESOURCES (sizeof(cobalt_io_resources)/sizeof(struct resource))
......
arch/mips/ddb5xxx/ddb5476/setup.c
View file @ 5e46c3ae
...@@ -109,17 +109,42 @@ static struct { ...@@ -109,17 +109,42 @@ static struct {
struct resource dma2; struct resource dma2;
} ddb5476_ioport = { } ddb5476_ioport = {
{ {
"dma1", 0x00, 0x1f, IORESOURCE_BUSY}, { .start = 0x00,
"timer", 0x40, 0x5f, IORESOURCE_BUSY}, { .end = 0x1f,
"rtc", 0x70, 0x7f, IORESOURCE_BUSY}, { .name = "dma1",
"dma page reg", 0x80, 0x8f, IORESOURCE_BUSY}, { .flags = IORESOURCE_BUSY
"dma2", 0xc0, 0xdf, IORESOURCE_BUSY} }, {
.start = 0x40,
.end = 0x5f,
.name = "timer",
.flags = IORESOURCE_BUSY
}, {
.start = 0x70,
.end = 0x7f,
.name = "rtc",
.flags = IORESOURCE_BUSY
}, {
.start = 0x80,
.end = 0x8f,
.name = "dma page reg",
.flags = IORESOURCE_BUSY
}, {
.start = 0xc0,
.end = 0xdf,
.name = "dma2",
.flags = IORESOURCE_BUSY
}
}; };
static struct { static struct {
struct resource nile4; struct resource nile4;
} ddb5476_iomem = { } ddb5476_iomem = {
{ "Nile 4", DDB_BASE, DDB_BASE + DDB_SIZE - 1, IORESOURCE_BUSY} {
.start = DDB_BASE,
.end = DDB_BASE + DDB_SIZE - 1,
.name = "Nile 4",
.flags = IORESOURCE_BUSY
}
}; };
......
arch/mips/ite-boards/generic/it8172_setup.c
View file @ 5e46c3ae
...@@ -72,11 +72,29 @@ struct { ...@@ -72,11 +72,29 @@ struct {
struct resource flash; struct resource flash;
struct resource boot; struct resource boot;
} it8172_resources = { } it8172_resources = {
{ "RAM", 0, 0, IORESOURCE_MEM }, /* to be initted */ {
{ "PCI Mem", 0x10000000, 0x13FFFFFF, IORESOURCE_MEM }, .start = 0, /* to be initted */
{ "PCI I/O", 0x14000000, 0x17FFFFFF }, .end = 0,
{ "Flash", 0x08000000, 0x0CFFFFFF }, .name = "RAM",
{ "Boot ROM", 0x1FC00000, 0x1FFFFFFF } .flags = IORESOURCE_MEM
}, {
.start = 0x10000000,
.end = 0x13FFFFFF,
.name = "PCI Mem",
.flags = IORESOURCE_MEM
}, {
.start = 0x14000000,
.end = 0x17FFFFFF
.name = "PCI I/O",
}, {
.start = 0x08000000,
.end = 0x0CFFFFFF
.name = "Flash",
}, {
.start = 0x1FC00000,
.end = 0x1FFFFFFF
.name = "Boot ROM",
}
}; };
#else #else
struct { struct {
...@@ -89,14 +107,44 @@ struct { ...@@ -89,14 +107,44 @@ struct {
struct resource flash; struct resource flash;
struct resource boot; struct resource boot;
} it8172_resources = { } it8172_resources = {
{ "RAM", 0, 0, IORESOURCE_MEM }, /* to be initted */ {
{ "PCI Mem0", 0x0C000000, 0x0FFFFFFF, IORESOURCE_MEM }, .start = 0, /* to be initted */
{ "PCI Mem1", 0x10000000, 0x13FFFFFF, IORESOURCE_MEM }, .end = 0,
{ "PCI I/O", 0x14000000, 0x17FFFFFF }, .name = "RAM",
{ "PCI Mem2", 0x1A000000, 0x1BFFFFFF, IORESOURCE_MEM }, .flags = IORESOURCE_MEM
{ "PCI Mem3", 0x1C000000, 0x1FBFFFFF, IORESOURCE_MEM }, }, {
{ "Flash", 0x08000000, 0x0CFFFFFF }, .start = 0x0C000000,
{ "Boot ROM", 0x1FC00000, 0x1FFFFFFF } .end = 0x0FFFFFFF,
.name = "PCI Mem0",
.flags = IORESOURCE_MEM
}, {
.start = 0x10000000,
.end = 0x13FFFFFF,
.name = "PCI Mem1",
.flags = IORESOURCE_MEM
}, {
.start = 0x14000000,
.end = 0x17FFFFFF
.name = "PCI I/O",
}, {
.start = 0x1A000000,
.end = 0x1BFFFFFF,
.name = "PCI Mem2",
.flags = IORESOURCE_MEM
}, {
.start = 0x1C000000,
.end = 0x1FBFFFFF,
.name = "PCI Mem3",
.flags = IORESOURCE_MEM
}, {
.start = 0x08000000,
.end = 0x0CFFFFFF
.name = "Flash",
}, {
.start = 0x1FC00000,
.end = 0x1FFFFFFF
.name = "Boot ROM",
}
}; };
#endif #endif
......
arch/mips/jmr3927/rbhma3100/setup.c
View file @ 5e46c3ae
...@@ -82,17 +82,54 @@ struct { ...@@ -82,17 +82,54 @@ struct {
struct resource sio0; struct resource sio0;
struct resource sio1; struct resource sio1;
} jmr3927_resources = { } jmr3927_resources = {
{ "RAM0", 0, 0x01FFFFFF, IORESOURCE_MEM }, {
{ "RAM1", 0x02000000, 0x03FFFFFF, IORESOURCE_MEM }, .start = 0,
{ "PCIMEM", 0x08000000, 0x07FFFFFF, IORESOURCE_MEM }, .end = 0x01FFFFFF,
{ "IOB", 0x10000000, 0x13FFFFFF }, .name = "RAM0",
{ "IOC", 0x14000000, 0x14FFFFFF }, .flags = IORESOURCE_MEM
{ "PCIIO", 0x15000000, 0x15FFFFFF }, }, {
{ "JMY1394", 0x1D000000, 0x1D3FFFFF }, .start = 0x02000000,
{ "ROM1", 0x1E000000, 0x1E3FFFFF }, .end = 0x03FFFFFF,
{ "ROM0", 0x1FC00000, 0x1FFFFFFF }, .name = "RAM1",
{ "SIO0", 0xFFFEF300, 0xFFFEF3FF }, .flags = IORESOURCE_MEM
{ "SIO1", 0xFFFEF400, 0xFFFEF4FF }, }, {
.start = 0x08000000,
.end = 0x07FFFFFF,
.name = "PCIMEM",
.flags = IORESOURCE_MEM
}, {
.start = 0x10000000,
.end = 0x13FFFFFF,
.name = "IOB"
}, {
.start = 0x14000000,
.end = 0x14FFFFFF,
.name = "IOC"
}, {
.start = 0x15000000,
.end = 0x15FFFFFF,
.name = "PCIIO"
}, {
.start = 0x1D000000,
.end = 0x1D3FFFFF,
.name = "JMY1394"
}, {
.start = 0x1E000000,
.end = 0x1E3FFFFF,
.name = "ROM1"
}, {
.start = 0x1FC00000,
.end = 0x1FFFFFFF,
.name = "ROM0"
}, {
.start = 0xFFFEF300,
.end = 0xFFFEF3FF,
.name = "SIO0"
}, {
.start = 0xFFFEF400,
.end = 0xFFFEF4FF,
.name = "SIO1"
},
}; };
/* don't enable - see errata */ /* don't enable - see errata */
......
arch/mips/kernel/i8259.c
View file @ 5e46c3ae
...@@ -302,11 +302,11 @@ static struct irqaction irq2 = { ...@@ -302,11 +302,11 @@ static struct irqaction irq2 = {
}; };
static struct resource pic1_io_resource = { static struct resource pic1_io_resource = {
"pic1", 0x20, 0x3f, IORESOURCE_BUSY .name = "pic1", .start = 0x20, .end = 0x3f, .flags = IORESOURCE_BUSY
}; };
static struct resource pic2_io_resource = { static struct resource pic2_io_resource = {
"pic2", 0xa0, 0xbf, IORESOURCE_BUSY .name = "pic2", .start = 0xa0, .end = 0xbf, .flags = IORESOURCE_BUSY
}; };
/* /*
......
arch/mips/mips-boards/malta/malta_setup.c
View file @ 5e46c3ae
...@@ -53,11 +53,11 @@ extern void kgdb_config(void); ...@@ -53,11 +53,11 @@ extern void kgdb_config(void);
#endif #endif
struct resource standard_io_resources[] = { struct resource standard_io_resources[] = {
{ "dma1", 0x00, 0x1f, IORESOURCE_BUSY }, { .name = "dma1", .start = 0x00, .end = 0x1f, .flags = IORESOURCE_BUSY },
{ "timer", 0x40, 0x5f, IORESOURCE_BUSY }, { .name = "timer", .start = 0x40, .end = 0x5f, .flags = IORESOURCE_BUSY },
{ "keyboard", 0x60, 0x6f, IORESOURCE_BUSY }, { .name = "keyboard", .start = 0x60, .end = 0x6f, .flags = IORESOURCE_BUSY },
{ "dma page reg", 0x80, 0x8f, IORESOURCE_BUSY }, { .name = "dma page reg", .start = 0x80, .end = 0x8f, .flags = IORESOURCE_BUSY },
{ "dma2", 0xc0, 0xdf, IORESOURCE_BUSY }, { .name = "dma2", .start = 0xc0, .end = 0xdf, .flags = IORESOURCE_BUSY },
}; };
#ifdef CONFIG_MTD #ifdef CONFIG_MTD
......
arch/mips/pci/ops-it8172.c
View file @ 5e46c3ae
...@@ -50,30 +50,28 @@ ...@@ -50,30 +50,28 @@
static struct resource pci_mem_resource_1; static struct resource pci_mem_resource_1;
static struct resource pci_io_resource = { static struct resource pci_io_resource = {
"io pci IO space", .start = 0x14018000,
0x14018000, .end = 0x17FFFFFF,
0x17FFFFFF, .name = "io pci IO space",
IORESOURCE_IO .flags = IORESOURCE_IO
}; };
static struct resource pci_mem_resource_0 = { static struct resource pci_mem_resource_0 = {
"ext pci memory space 0/1", .start = 0x10101000,
0x10101000, .end = 0x13FFFFFF,
0x13FFFFFF, .name = "ext pci memory space 0/1",
IORESOURCE_MEM, .flags = IORESOURCE_MEM,
&pci_mem_resource_0, .parent = &pci_mem_resource_0,
NULL, .sibling = NULL,
&pci_mem_resource_1 .child = &pci_mem_resource_1
}; };
static struct resource pci_mem_resource_1 = { static struct resource pci_mem_resource_1 = {
"ext pci memory space 2/3", .start = 0x1A000000,
0x1A000000, .end = 0x1FBFFFFF,
0x1FBFFFFF, .name = "ext pci memory space 2/3",
IORESOURCE_MEM, .flags = IORESOURCE_MEM,
&pci_mem_resource_0, .parent = &pci_mem_resource_0
NULL,
NULL
}; };
extern struct pci_ops it8172_pci_ops; extern struct pci_ops it8172_pci_ops;
......
arch/mips/pci/pci-ddb5074.c
View file @ 5e46c3ae
...@@ -8,17 +8,17 @@ ...@@ -8,17 +8,17 @@
#include <asm/ddb5xxx/ddb5xxx.h> #include <asm/ddb5xxx/ddb5xxx.h>
static struct resource extpci_io_resource = { static struct resource extpci_io_resource = {
"pci IO space", .start = 0x1000, /* leave some room for ISA bus */
0x1000, /* leave some room for ISA bus */ .end = DDB_PCI_IO_SIZE - 1,
DDB_PCI_IO_SIZE - 1, .name = "pci IO space",
IORESOURCE_IO .flags = IORESOURCE_IO
}; };
static struct resource extpci_mem_resource = { static struct resource extpci_mem_resource = {
"pci memory space", .start = DDB_PCI_MEM_BASE + 0x00100000, /* leave 1 MB for RTC */
DDB_PCI_MEM_BASE + 0x00100000, /* leave 1 MB for RTC */ .end = DDB_PCI_MEM_BASE + DDB_PCI_MEM_SIZE - 1,
DDB_PCI_MEM_BASE + DDB_PCI_MEM_SIZE - 1, .name = "pci memory space",
IORESOURCE_MEM .flags = IORESOURCE_MEM
}; };
extern struct pci_ops ddb5476_ext_pci_ops; extern struct pci_ops ddb5476_ext_pci_ops;
......
arch/mips/pci/pci-ddb5476.c
View file @ 5e46c3ae
...@@ -8,17 +8,17 @@ ...@@ -8,17 +8,17 @@
#include <asm/ddb5xxx/ddb5xxx.h> #include <asm/ddb5xxx/ddb5xxx.h>
static struct resource extpci_io_resource = { static struct resource extpci_io_resource = {
"pci IO space", .start = 0x1000, /* leave some room for ISA bus */
0x1000, /* leave some room for ISA bus */ .end = DDB_PCI_IO_SIZE - 1,
DDB_PCI_IO_SIZE - 1, .name = "pci IO space",
IORESOURCE_IO .flags = IORESOURCE_IO
}; };
static struct resource extpci_mem_resource = { static struct resource extpci_mem_resource = {
"pci memory space", .start = DDB_PCI_MEM_BASE + 0x00100000, /* leave 1 MB for RTC */
DDB_PCI_MEM_BASE + 0x00100000, /* leave 1 MB for RTC */ .end = DDB_PCI_MEM_BASE + DDB_PCI_MEM_SIZE - 1,
DDB_PCI_MEM_BASE + DDB_PCI_MEM_SIZE - 1, .name = "pci memory space",
IORESOURCE_MEM .flags = IORESOURCE_MEM
}; };
extern struct pci_ops ddb5476_ext_pci_ops; extern struct pci_ops ddb5476_ext_pci_ops;
......
arch/mips/pci/pci-ddb5477.c
View file @ 5e46c3ae
...@@ -22,31 +22,31 @@ ...@@ -22,31 +22,31 @@
#include <asm/ddb5xxx/ddb5xxx.h> #include <asm/ddb5xxx/ddb5xxx.h>
static struct resource extpci_io_resource = { static struct resource extpci_io_resource = {
"ext pci IO space", .start = DDB_PCI0_IO_BASE - DDB_PCI_IO_BASE + 0x4000,
DDB_PCI0_IO_BASE - DDB_PCI_IO_BASE + 0x4000, .end = DDB_PCI0_IO_BASE - DDB_PCI_IO_BASE + DDB_PCI0_IO_SIZE - 1,
DDB_PCI0_IO_BASE - DDB_PCI_IO_BASE + DDB_PCI0_IO_SIZE - 1, .name = "ext pci IO space",
IORESOURCE_IO .flags = IORESOURCE_IO
}; };
static struct resource extpci_mem_resource = { static struct resource extpci_mem_resource = {
"ext pci memory space", .start = DDB_PCI0_MEM_BASE + 0x100000,
DDB_PCI0_MEM_BASE + 0x100000, .end = DDB_PCI0_MEM_BASE + DDB_PCI0_MEM_SIZE - 1,
DDB_PCI0_MEM_BASE + DDB_PCI0_MEM_SIZE - 1, .name = "ext pci memory space",
IORESOURCE_MEM .flags = IORESOURCE_MEM
}; };
static struct resource iopci_io_resource = { static struct resource iopci_io_resource = {
"io pci IO space", .start = DDB_PCI1_IO_BASE - DDB_PCI_IO_BASE,
DDB_PCI1_IO_BASE - DDB_PCI_IO_BASE, .end = DDB_PCI1_IO_BASE - DDB_PCI_IO_BASE + DDB_PCI1_IO_SIZE - 1,
DDB_PCI1_IO_BASE - DDB_PCI_IO_BASE + DDB_PCI1_IO_SIZE - 1, .name = "io pci IO space",
IORESOURCE_IO .flags = IORESOURCE_IO
}; };
static struct resource iopci_mem_resource = { static struct resource iopci_mem_resource = {
"ext pci memory space", .start = DDB_PCI1_MEM_BASE,
DDB_PCI1_MEM_BASE, .end = DDB_PCI1_MEM_BASE + DDB_PCI1_MEM_SIZE - 1,
DDB_PCI1_MEM_BASE + DDB_PCI1_MEM_SIZE - 1, .name = "ext pci memory space",
IORESOURCE_MEM .flags = IORESOURCE_MEM
}; };
extern struct pci_ops ddb5477_ext_pci_ops; extern struct pci_ops ddb5477_ext_pci_ops;
......
arch/mips/pci/pci-jmr3927.c
View file @ 5e46c3ae
...@@ -35,17 +35,17 @@ ...@@ -35,17 +35,17 @@
#include <asm/debug.h> #include <asm/debug.h>
struct resource pci_io_resource = { struct resource pci_io_resource = {
"IO MEM", .name = "IO MEM",
0x1000, /* reserve regacy I/O space */ .start = 0x1000, /* reserve regacy I/O space */
0x1000 + JMR3927_PCIIO_SIZE - 1, .end = 0x1000 + JMR3927_PCIIO_SIZE - 1,
IORESOURCE_IO .flags = IORESOURCE_IO
}; };
struct resource pci_mem_resource = { struct resource pci_mem_resource = {
"PCI MEM", .name = "PCI MEM",
JMR3927_PCIMEM, .start = JMR3927_PCIMEM,
JMR3927_PCIMEM + JMR3927_PCIMEM_SIZE - 1, .end = JMR3927_PCIMEM + JMR3927_PCIMEM_SIZE - 1,
IORESOURCE_MEM .flags = IORESOURCE_MEM
}; };
extern struct pci_ops jmr3927_pci_ops; extern struct pci_ops jmr3927_pci_ops;
......
arch/mips/pci/pci-ocelot.c
View file @ 5e46c3ae
...@@ -71,13 +71,13 @@ static inline void pci0WriteConfigReg(unsigned int offset, unsigned int data) ...@@ -71,13 +71,13 @@ static inline void pci0WriteConfigReg(unsigned int offset, unsigned int data)
} }
static struct resource ocelot_mem_resource = { static struct resource ocelot_mem_resource = {
iomem_resource.start = GT_PCI_MEM_BASE; start = GT_PCI_MEM_BASE;
iomem_resource.end = GT_PCI_MEM_BASE + GT_PCI_MEM_BASE - 1; end = GT_PCI_MEM_BASE + GT_PCI_MEM_BASE - 1;
}; };
static struct resource ocelot_io_resource = { static struct resource ocelot_io_resource = {
ioport_resource.start = GT_PCI_IO_BASE; start = GT_PCI_IO_BASE;
ioport_resource.end = GT_PCI_IO_BASE + GT_PCI_IO_SIZE - 1; end = GT_PCI_IO_BASE + GT_PCI_IO_SIZE - 1;
}; };
static struct pci_controller ocelot_pci_controller = { static struct pci_controller ocelot_pci_controller = {
......
arch/mips/pci/pci-yosemite.c
View file @ 5e46c3ae
...@@ -14,7 +14,10 @@ ...@@ -14,7 +14,10 @@
extern struct pci_ops titan_pci_ops; extern struct pci_ops titan_pci_ops;
static struct resource py_mem_resource = { static struct resource py_mem_resource = {
"Titan PCI MEM", 0xe0000000UL, 0xe3ffffffUL, IORESOURCE_MEM .start = 0xe0000000UL,
.end = 0xe3ffffffUL,
.name = "Titan PCI MEM",
.flags = IORESOURCE_MEM
}; };
/* /*
...@@ -26,7 +29,10 @@ static struct resource py_mem_resource = { ...@@ -26,7 +29,10 @@ static struct resource py_mem_resource = {
#define TITAN_IO_BASE 0xe8000000UL #define TITAN_IO_BASE 0xe8000000UL
static struct resource py_io_resource = { static struct resource py_io_resource = {
"Titan IO MEM", 0x00001000UL, TITAN_IO_SIZE - 1, IORESOURCE_IO, .start = 0x00001000UL,
.end = TITAN_IO_SIZE - 1,
.name = "Titan IO MEM",
.flags = IORESOURCE_IO,
}; };
static struct pci_controller py_controller = { static struct pci_controller py_controller = {
......
arch/mips/philips/pnx8550/common/pci.c
View file @ 5e46c3ae
...@@ -27,17 +27,17 @@ ...@@ -27,17 +27,17 @@
#include <nand.h> #include <nand.h>
static struct resource pci_io_resource = { static struct resource pci_io_resource = {
"pci IO space", .start = PNX8550_PCIIO + 0x1000, /* reserve regacy I/O space */
(u32)(PNX8550_PCIIO + 0x1000), /* reserve regacy I/O space */ .end = PNX8550_PCIIO + PNX8550_PCIIO_SIZE,
(u32)(PNX8550_PCIIO + PNX8550_PCIIO_SIZE), .name = "pci IO space",
IORESOURCE_IO .flags = IORESOURCE_IO
}; };
static struct resource pci_mem_resource = { static struct resource pci_mem_resource = {
"pci memory space", .start = PNX8550_PCIMEM,
(u32)(PNX8550_PCIMEM), .end = PNX8550_PCIMEM + PNX8550_PCIMEM_SIZE - 1,
(u32)(PNX8550_PCIMEM + PNX8550_PCIMEM_SIZE - 1), .name = "pci memory space",
IORESOURCE_MEM .flags = IORESOURCE_MEM
}; };
extern struct pci_ops pnx8550_pci_ops; extern struct pci_ops pnx8550_pci_ops;
......
arch/mips/philips/pnx8550/common/setup.c
View file @ 5e46c3ae
...@@ -58,10 +58,27 @@ extern void prom_printf(char *fmt, ...); ...@@ -58,10 +58,27 @@ extern void prom_printf(char *fmt, ...);
extern char *prom_getcmdline(void); extern char *prom_getcmdline(void);
struct resource standard_io_resources[] = { struct resource standard_io_resources[] = {
{"dma1", 0x00, 0x1f, IORESOURCE_BUSY}, {
{"timer", 0x40, 0x5f, IORESOURCE_BUSY}, .start = .0x00,
{"dma page reg", 0x80, 0x8f, IORESOURCE_BUSY}, .end = 0x1f,
{"dma2", 0xc0, 0xdf, IORESOURCE_BUSY}, .name = "dma1",
.flags = IORESOURCE_BUSY
}, {
.start = 0x40,
.end = 0x5f,
.name = "timer",
.flags = IORESOURCE_BUSY
}, {
.start = 0x80,
.end = 0x8f,
.name = "dma page reg",
.flags = IORESOURCE_BUSY
}, {
.start = 0xc0,
.end = 0xdf,
.name = "dma2",
.flags = IORESOURCE_BUSY
},
}; };
#define STANDARD_IO_RESOURCES (sizeof(standard_io_resources)/sizeof(struct resource)) #define STANDARD_IO_RESOURCES (sizeof(standard_io_resources)/sizeof(struct resource))
......
arch/mips/sni/setup.c
View file @ 5e46c3ae
...@@ -92,20 +92,51 @@ static void __init sni_display_setup(void) ...@@ -92,20 +92,51 @@ static void __init sni_display_setup(void)
} }
static struct resource sni_io_resource = { static struct resource sni_io_resource = {
"PCIMT IO MEM", 0x00001000UL, 0x03bfffffUL, IORESOURCE_IO, .start = 0x00001000UL,
.end = 0x03bfffffUL,
.name = "PCIMT IO MEM",
.flags = IORESOURCE_IO,
}; };
static struct resource pcimt_io_resources[] = { static struct resource pcimt_io_resources[] = {
{ "dma1", 0x00, 0x1f, IORESOURCE_BUSY }, {
{ "timer", 0x40, 0x5f, IORESOURCE_BUSY }, .start = 0x00,
{ "keyboard", 0x60, 0x6f, IORESOURCE_BUSY }, .end = 0x1f,
{ "dma page reg", 0x80, 0x8f, IORESOURCE_BUSY }, .name = "dma1",
{ "dma2", 0xc0, 0xdf, IORESOURCE_BUSY }, .flags = IORESOURCE_BUSY
{ "PCI config data", 0xcfc, 0xcff, IORESOURCE_BUSY } }, {
.start = 0x40,
.end = 0x5f,
.name = "timer",
.flags = IORESOURCE_BUSY
}, {
.start = 0x60,
.end = 0x6f,
.name = "keyboard",
.flags = IORESOURCE_BUSY
}, {
.start = 0x80,
.end = 0x8f,
.name = "dma page reg",
.flags = IORESOURCE_BUSY
}, {
.start = 0xc0,
.end = 0xdf,
.name = "dma2",
.flags = IORESOURCE_BUSY
}, {
.start = 0xcfc,
.end = 0xcff,
.name = "PCI config data",
.flags = IORESOURCE_BUSY
}
}; };
static struct resource sni_mem_resource = { static struct resource sni_mem_resource = {
"PCIMT PCI MEM", 0x10000000UL, 0xffffffffUL, IORESOURCE_MEM .start = 0x10000000UL,
.end = 0xffffffffUL,
.name = "PCIMT PCI MEM",
.flags = IORESOURCE_MEM
}; };
/* /*
...@@ -122,19 +153,72 @@ static struct resource sni_mem_resource = { ...@@ -122,19 +153,72 @@ static struct resource sni_mem_resource = {
* 0xa0000000 - 0xffffffff (1.5GB) PCI/EISA Bus Memory * 0xa0000000 - 0xffffffff (1.5GB) PCI/EISA Bus Memory
*/ */
static struct resource pcimt_mem_resources[] = { static struct resource pcimt_mem_resources[] = {
{ "Video RAM area", 0x100a0000, 0x100bffff, IORESOURCE_BUSY }, {
{ "ISA Reserved", 0x100c0000, 0x100fffff, IORESOURCE_BUSY }, .start = 0x100a0000,
{ "PCI IO", 0x14000000, 0x17bfffff, IORESOURCE_BUSY }, .end = 0x100bffff,
{ "Cache Replacement Area", 0x17c00000, 0x17ffffff, IORESOURCE_BUSY}, .name = "Video RAM area",
{ "PCI INT Acknowledge", 0x1a000000, 0x1a000003, IORESOURCE_BUSY }, .flags = IORESOURCE_BUSY
{ "Boot PROM", 0x1fc00000, 0x1fc7ffff, IORESOURCE_BUSY}, }, {
{ "Diag PROM", 0x1fc80000, 0x1fcfffff, IORESOURCE_BUSY}, .start = 0x100c0000,
{ "X-Bus", 0x1fd00000, 0x1fdfffff, IORESOURCE_BUSY}, .end = 0x100fffff,
{ "BIOS map", 0x1fe00000, 0x1fefffff, IORESOURCE_BUSY}, .name = "ISA Reserved",
{ "NVRAM / EEPROM", 0x1ff00000, 0x1ff7ffff, IORESOURCE_BUSY}, .flags = IORESOURCE_BUSY
{ "ASIC PCI", 0x1fff0000, 0x1fffefff, IORESOURCE_BUSY}, }, {
{ "MP Agent", 0x1ffff000, 0x1fffffff, IORESOURCE_BUSY}, .start = 0x14000000,
{ "Main Memory", 0x20000000, 0x9fffffff, IORESOURCE_BUSY} .end = 0x17bfffff,
.name = "PCI IO",
.flags = IORESOURCE_BUSY
}, {
.start = 0x17c00000,
.end = 0x17ffffff,
.name = "Cache Replacement Area",
.flags = IORESOURCE_BUSY
}, {
.start = 0x1a000000,
.end = 0x1a000003,
.name = "PCI INT Acknowledge",
.flags = IORESOURCE_BUSY
}, {
.start = 0x1fc00000,
.end = 0x1fc7ffff,
.name = "Boot PROM",
.flags = IORESOURCE_BUSY
}, {
.start = 0x1fc80000,
.end = 0x1fcfffff,
.name = "Diag PROM",
.flags = IORESOURCE_BUSY
}, {
.start = 0x1fd00000,
.end = 0x1fdfffff,
.name = "X-Bus",
.flags = IORESOURCE_BUSY
}, {
.start = 0x1fe00000,
.end = 0x1fefffff,
.name = "BIOS map",
.flags = IORESOURCE_BUSY
}, {
.start = 0x1ff00000,
.end = 0x1ff7ffff,
.name = "NVRAM / EEPROM",
.flags = IORESOURCE_BUSY
}, {
.start = 0x1fff0000,
.end = 0x1fffefff,
.name = "ASIC PCI",
.flags = IORESOURCE_BUSY
}, {
.start = 0x1ffff000,
.end = 0x1fffffff,
.name = "MP Agent",
.flags = IORESOURCE_BUSY
}, {
.start = 0x20000000,
.end = 0x9fffffff,
.name = "Main Memory",
.flags = IORESOURCE_BUSY
}
}; };
static void __init sni_resource_init(void) static void __init sni_resource_init(void)
......
arch/mips/tx4938/toshiba_rbtx4938/setup.c
View file @ 5e46c3ae
...@@ -664,7 +664,10 @@ static struct resource rbtx4938_fpga_resource; ...@@ -664,7 +664,10 @@ static struct resource rbtx4938_fpga_resource;
static char pcode_str[8]; static char pcode_str[8];
static struct resource tx4938_reg_resource = { static struct resource tx4938_reg_resource = {
pcode_str, TX4938_REG_BASE, TX4938_REG_BASE+TX4938_REG_SIZE, IORESOURCE_MEM .start = TX4938_REG_BASE,
.end = TX4938_REG_BASE + TX4938_REG_SIZE,
.name = pcode_str,
.flags = IORESOURCE_MEM
}; };
void __init tx4938_board_setup(void) void __init tx4938_board_setup(void)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment