Skip to content

Commit

Permalink
[MIPS] C99-ify struct resource initialization.
Browse files Browse the repository at this point in the history 
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
Ralf Baechle committed Jun 19, 2006
1 parent cbb3069 commit 5e46c3a
Show file tree
Hide file tree
Showing 18 changed files with 395 additions and 150 deletions.
16 changes: 8 additions & 8 deletions arch/mips/au1000/common/pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,17 +40,17 @@

/* TBD */
static struct resource pci_io_resource = {
"pci IO space",
(u32)PCI_IO_START,
(u32)PCI_IO_END,
IORESOURCE_IO
.start = PCI_IO_START,
.end = PCI_IO_END,
.name = "PCI IO space",
.flags = IORESOURCE_IO
};

static struct resource pci_mem_resource = {
"pci memory space",
(u32)PCI_MEM_START,
(u32)PCI_MEM_END,
IORESOURCE_MEM
.start = PCI_MEM_START,
.end = PCI_MEM_END,
.name = "PCI memory space",
.flags = IORESOURCE_MEM
};

extern struct pci_ops au1x_pci_ops;
Expand Down
41 changes: 34 additions & 7 deletions arch/mips/cobalt/setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,19 +68,46 @@ static void __init cobalt_timer_setup(struct irqaction *irq)
extern struct pci_ops gt64111_pci_ops;

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 = {
"PCI I/O", 0x1000, 0xffff, IORESOURCE_IO
.start = 0x1000,
.end = 0xffff,
.name = "PCI I/O",
.flags = IORESOURCE_IO
};

static struct resource cobalt_io_resources[] = {
{ "dma1", 0x00, 0x1f, IORESOURCE_BUSY },
{ "timer", 0x40, 0x5f, IORESOURCE_BUSY },
{ "keyboard", 0x60, 0x6f, IORESOURCE_BUSY },
{ "dma page reg", 0x80, 0x8f, IORESOURCE_BUSY },
{ "dma2", 0xc0, 0xdf, IORESOURCE_BUSY },
{
.start = 0x00,
.end = 0x1f,
.name = "dma1",
.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))
Expand Down
37 changes: 31 additions & 6 deletions arch/mips/ddb5xxx/ddb5476/setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,17 +109,42 @@ static struct {
struct resource dma2;
} ddb5476_ioport = {
{
"dma1", 0x00, 0x1f, IORESOURCE_BUSY}, {
"timer", 0x40, 0x5f, IORESOURCE_BUSY}, {
"rtc", 0x70, 0x7f, IORESOURCE_BUSY}, {
"dma page reg", 0x80, 0x8f, IORESOURCE_BUSY}, {
"dma2", 0xc0, 0xdf, IORESOURCE_BUSY}
.start = 0x00,
.end = 0x1f,
.name = "dma1",
.flags = 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 {
struct resource nile4;
} 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
}
};


Expand Down
74 changes: 61 additions & 13 deletions arch/mips/ite-boards/generic/it8172_setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,29 @@ struct {
struct resource flash;
struct resource boot;
} it8172_resources = {
{ "RAM", 0, 0, IORESOURCE_MEM }, /* to be initted */
{ "PCI Mem", 0x10000000, 0x13FFFFFF, IORESOURCE_MEM },
{ "PCI I/O", 0x14000000, 0x17FFFFFF },
{ "Flash", 0x08000000, 0x0CFFFFFF },
{ "Boot ROM", 0x1FC00000, 0x1FFFFFFF }
{
.start = 0, /* to be initted */
.end = 0,
.name = "RAM",
.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
struct {
Expand All @@ -89,14 +107,44 @@ struct {
struct resource flash;
struct resource boot;
} it8172_resources = {
{ "RAM", 0, 0, IORESOURCE_MEM }, /* to be initted */
{ "PCI Mem0", 0x0C000000, 0x0FFFFFFF, IORESOURCE_MEM },
{ "PCI Mem1", 0x10000000, 0x13FFFFFF, IORESOURCE_MEM },
{ "PCI I/O", 0x14000000, 0x17FFFFFF },
{ "PCI Mem2", 0x1A000000, 0x1BFFFFFF, IORESOURCE_MEM },
{ "PCI Mem3", 0x1C000000, 0x1FBFFFFF, IORESOURCE_MEM },
{ "Flash", 0x08000000, 0x0CFFFFFF },
{ "Boot ROM", 0x1FC00000, 0x1FFFFFFF }
{
.start = 0, /* to be initted */
.end = 0,
.name = "RAM",
.flags = IORESOURCE_MEM
}, {
.start = 0x0C000000,
.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

Expand Down
59 changes: 48 additions & 11 deletions arch/mips/jmr3927/rbhma3100/setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,54 @@ struct {
struct resource sio0;
struct resource sio1;
} jmr3927_resources = {
{ "RAM0", 0, 0x01FFFFFF, IORESOURCE_MEM },
{ "RAM1", 0x02000000, 0x03FFFFFF, IORESOURCE_MEM },
{ "PCIMEM", 0x08000000, 0x07FFFFFF, IORESOURCE_MEM },
{ "IOB", 0x10000000, 0x13FFFFFF },
{ "IOC", 0x14000000, 0x14FFFFFF },
{ "PCIIO", 0x15000000, 0x15FFFFFF },
{ "JMY1394", 0x1D000000, 0x1D3FFFFF },
{ "ROM1", 0x1E000000, 0x1E3FFFFF },
{ "ROM0", 0x1FC00000, 0x1FFFFFFF },
{ "SIO0", 0xFFFEF300, 0xFFFEF3FF },
{ "SIO1", 0xFFFEF400, 0xFFFEF4FF },
{
.start = 0,
.end = 0x01FFFFFF,
.name = "RAM0",
.flags = IORESOURCE_MEM
}, {
.start = 0x02000000,
.end = 0x03FFFFFF,
.name = "RAM1",
.flags = IORESOURCE_MEM
}, {
.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 */
Expand Down
4 changes: 2 additions & 2 deletions arch/mips/kernel/i8259.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,11 +302,11 @@ static struct irqaction irq2 = {
};

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 = {
"pic2", 0xa0, 0xbf, IORESOURCE_BUSY
.name = "pic2", .start = 0xa0, .end = 0xbf, .flags = IORESOURCE_BUSY
};

/*
Expand Down
10 changes: 5 additions & 5 deletions arch/mips/mips-boards/malta/malta_setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,11 @@ extern void kgdb_config(void);
#endif

struct resource standard_io_resources[] = {
{ "dma1", 0x00, 0x1f, IORESOURCE_BUSY },
{ "timer", 0x40, 0x5f, IORESOURCE_BUSY },
{ "keyboard", 0x60, 0x6f, IORESOURCE_BUSY },
{ "dma page reg", 0x80, 0x8f, IORESOURCE_BUSY },
{ "dma2", 0xc0, 0xdf, IORESOURCE_BUSY },
{ .name = "dma1", .start = 0x00, .end = 0x1f, .flags = IORESOURCE_BUSY },
{ .name = "timer", .start = 0x40, .end = 0x5f, .flags = IORESOURCE_BUSY },
{ .name = "keyboard", .start = 0x60, .end = 0x6f, .flags = IORESOURCE_BUSY },
{ .name = "dma page reg", .start = 0x80, .end = 0x8f, .flags = IORESOURCE_BUSY },
{ .name = "dma2", .start = 0xc0, .end = 0xdf, .flags = IORESOURCE_BUSY },
};

#ifdef CONFIG_MTD
Expand Down
34 changes: 16 additions & 18 deletions arch/mips/pci/ops-it8172.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,30 +50,28 @@
static struct resource pci_mem_resource_1;

static struct resource pci_io_resource = {
"io pci IO space",
0x14018000,
0x17FFFFFF,
IORESOURCE_IO
.start = 0x14018000,
.end = 0x17FFFFFF,
.name = "io pci IO space",
.flags = IORESOURCE_IO
};

static struct resource pci_mem_resource_0 = {
"ext pci memory space 0/1",
0x10101000,
0x13FFFFFF,
IORESOURCE_MEM,
&pci_mem_resource_0,
NULL,
&pci_mem_resource_1
.start = 0x10101000,
.end = 0x13FFFFFF,
.name = "ext pci memory space 0/1",
.flags = IORESOURCE_MEM,
.parent = &pci_mem_resource_0,
.sibling = NULL,
.child = &pci_mem_resource_1
};

static struct resource pci_mem_resource_1 = {
"ext pci memory space 2/3",
0x1A000000,
0x1FBFFFFF,
IORESOURCE_MEM,
&pci_mem_resource_0,
NULL,
NULL
.start = 0x1A000000,
.end = 0x1FBFFFFF,
.name = "ext pci memory space 2/3",
.flags = IORESOURCE_MEM,
.parent = &pci_mem_resource_0
};

extern struct pci_ops it8172_pci_ops;
Expand Down
16 changes: 8 additions & 8 deletions arch/mips/pci/pci-ddb5074.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
#include <asm/ddb5xxx/ddb5xxx.h>

static struct resource extpci_io_resource = {
"pci IO space",
0x1000, /* leave some room for ISA bus */
DDB_PCI_IO_SIZE - 1,
IORESOURCE_IO
.start = 0x1000, /* leave some room for ISA bus */
.end = DDB_PCI_IO_SIZE - 1,
.name = "pci IO space",
.flags = IORESOURCE_IO
};

static struct resource extpci_mem_resource = {
"pci memory space",
DDB_PCI_MEM_BASE + 0x00100000, /* leave 1 MB for RTC */
DDB_PCI_MEM_BASE + DDB_PCI_MEM_SIZE - 1,
IORESOURCE_MEM
.start = DDB_PCI_MEM_BASE + 0x00100000, /* leave 1 MB for RTC */
.end = DDB_PCI_MEM_BASE + DDB_PCI_MEM_SIZE - 1,
.name = "pci memory space",
.flags = IORESOURCE_MEM
};

extern struct pci_ops ddb5476_ext_pci_ops;
Expand Down
Loading

0 comments on commit 5e46c3a

Please sign in to comment.