diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2006-06-04 18:14:05 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2006-06-19 12:39:20 -0400 |
commit | 5e46c3aefe60d1398488410a0c39b4cd87738614 (patch) | |
tree | 982f9820e63cee8aacc4a6132f124d1cef4fe901 /arch/mips/philips/pnx8550 | |
parent | cbb306962ec4b30e03423137e22d605281a8f598 (diff) |
[MIPS] C99-ify struct resource initialization.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/philips/pnx8550')
-rw-r--r-- | arch/mips/philips/pnx8550/common/pci.c | 16 | ||||
-rw-r--r-- | arch/mips/philips/pnx8550/common/setup.c | 25 |
2 files changed, 29 insertions, 12 deletions
diff --git a/arch/mips/philips/pnx8550/common/pci.c b/arch/mips/philips/pnx8550/common/pci.c index baa6905f649f..eee4f3dfc410 100644 --- a/arch/mips/philips/pnx8550/common/pci.c +++ b/arch/mips/philips/pnx8550/common/pci.c | |||
@@ -27,17 +27,17 @@ | |||
27 | #include <nand.h> | 27 | #include <nand.h> |
28 | 28 | ||
29 | static struct resource pci_io_resource = { | 29 | static struct resource pci_io_resource = { |
30 | "pci IO space", | 30 | .start = PNX8550_PCIIO + 0x1000, /* reserve regacy I/O space */ |
31 | (u32)(PNX8550_PCIIO + 0x1000), /* reserve regacy I/O space */ | 31 | .end = PNX8550_PCIIO + PNX8550_PCIIO_SIZE, |
32 | (u32)(PNX8550_PCIIO + PNX8550_PCIIO_SIZE), | 32 | .name = "pci IO space", |
33 | IORESOURCE_IO | 33 | .flags = IORESOURCE_IO |
34 | }; | 34 | }; |
35 | 35 | ||
36 | static struct resource pci_mem_resource = { | 36 | static struct resource pci_mem_resource = { |
37 | "pci memory space", | 37 | .start = PNX8550_PCIMEM, |
38 | (u32)(PNX8550_PCIMEM), | 38 | .end = PNX8550_PCIMEM + PNX8550_PCIMEM_SIZE - 1, |
39 | (u32)(PNX8550_PCIMEM + PNX8550_PCIMEM_SIZE - 1), | 39 | .name = "pci memory space", |
40 | IORESOURCE_MEM | 40 | .flags = IORESOURCE_MEM |
41 | }; | 41 | }; |
42 | 42 | ||
43 | extern struct pci_ops pnx8550_pci_ops; | 43 | extern struct pci_ops pnx8550_pci_ops; |
diff --git a/arch/mips/philips/pnx8550/common/setup.c b/arch/mips/philips/pnx8550/common/setup.c index 0d8a77619391..2b199f338080 100644 --- a/arch/mips/philips/pnx8550/common/setup.c +++ b/arch/mips/philips/pnx8550/common/setup.c | |||
@@ -58,10 +58,27 @@ extern void prom_printf(char *fmt, ...); | |||
58 | extern char *prom_getcmdline(void); | 58 | extern char *prom_getcmdline(void); |
59 | 59 | ||
60 | struct resource standard_io_resources[] = { | 60 | struct resource standard_io_resources[] = { |
61 | {"dma1", 0x00, 0x1f, IORESOURCE_BUSY}, | 61 | { |
62 | {"timer", 0x40, 0x5f, IORESOURCE_BUSY}, | 62 | .start = .0x00, |
63 | {"dma page reg", 0x80, 0x8f, IORESOURCE_BUSY}, | 63 | .end = 0x1f, |
64 | {"dma2", 0xc0, 0xdf, IORESOURCE_BUSY}, | 64 | .name = "dma1", |
65 | .flags = IORESOURCE_BUSY | ||
66 | }, { | ||
67 | .start = 0x40, | ||
68 | .end = 0x5f, | ||
69 | .name = "timer", | ||
70 | .flags = IORESOURCE_BUSY | ||
71 | }, { | ||
72 | .start = 0x80, | ||
73 | .end = 0x8f, | ||
74 | .name = "dma page reg", | ||
75 | .flags = IORESOURCE_BUSY | ||
76 | }, { | ||
77 | .start = 0xc0, | ||
78 | .end = 0xdf, | ||
79 | .name = "dma2", | ||
80 | .flags = IORESOURCE_BUSY | ||
81 | }, | ||
65 | }; | 82 | }; |
66 | 83 | ||
67 | #define STANDARD_IO_RESOURCES (sizeof(standard_io_resources)/sizeof(struct resource)) | 84 | #define STANDARD_IO_RESOURCES (sizeof(standard_io_resources)/sizeof(struct resource)) |