aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-05-26 10:10:15 -0400
committerPaul Mundt <lethal@linux-sh.org>2009-05-26 10:10:15 -0400
commitd076d2bd0d9379314df5f2ab8b9c83f617c70923 (patch)
treebb58864850160561c8187c891f7fb07661100b5f /arch/sh
parentf9e2b97dc2cf832ccceea2a2e6eccc4bc9af72cf (diff)
sh: pci-sh7751: Initialize io_map_base in controller definition.
As there is only a single controller and remapping has no impact for the address range in question, just initialize it directly in the controller definition. This fixes up boot time warnings about not having the field initialized. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/drivers/pci/pci-sh7751.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/sh/drivers/pci/pci-sh7751.c b/arch/sh/drivers/pci/pci-sh7751.c
index c4fa0bb13976..70c1999a0ec4 100644
--- a/arch/sh/drivers/pci/pci-sh7751.c
+++ b/arch/sh/drivers/pci/pci-sh7751.c
@@ -52,7 +52,7 @@ static struct resource sh7751_io_resource = {
52}; 52};
53 53
54static struct resource sh7751_mem_resource = { 54static struct resource sh7751_mem_resource = {
55 .name = "SH7785_mem", 55 .name = "SH7751_mem",
56 .start = SH7751_PCI_MEMORY_BASE, 56 .start = SH7751_PCI_MEMORY_BASE,
57 .end = SH7751_PCI_MEMORY_BASE + SH7751_PCI_MEM_SIZE - 1, 57 .end = SH7751_PCI_MEMORY_BASE + SH7751_PCI_MEM_SIZE - 1,
58 .flags = IORESOURCE_MEM 58 .flags = IORESOURCE_MEM
@@ -64,6 +64,7 @@ static struct pci_channel sh7751_pci_controller = {
64 .mem_offset = 0x00000000, 64 .mem_offset = 0x00000000,
65 .io_resource = &sh7751_io_resource, 65 .io_resource = &sh7751_io_resource,
66 .io_offset = 0x00000000, 66 .io_offset = 0x00000000,
67 .io_map_base = SH7751_PCI_IO_BASE,
67}; 68};
68 69
69static struct sh4_pci_address_map sh7751_pci_map = { 70static struct sh4_pci_address_map sh7751_pci_map = {
@@ -179,8 +180,6 @@ static int __init sh7751_pci_init(void)
179 word = SH4_PCICR_PREFIX | SH4_PCICR_CFIN | SH4_PCICR_ARBM; 180 word = SH4_PCICR_PREFIX | SH4_PCICR_CFIN | SH4_PCICR_ARBM;
180 pci_write_reg(chan, word, SH4_PCICR); 181 pci_write_reg(chan, word, SH4_PCICR);
181 182
182 __set_io_port_base(SH7751_PCI_IO_BASE);
183
184 register_pci_controller(chan); 183 register_pci_controller(chan);
185 184
186 return 0; 185 return 0;