diff options
| author |   Paul Mundt <lethal@linux-sh.org> | 2009-05-26 23:10:15 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-05-26 23:10:15 +0900 |
| commit | d076d2bd0d9379314df5f2ab8b9c83f617c70923 (patch) | |
| tree | bb58864850160561c8187c891f7fb07661100b5f /arch/sh/drivers/pci | |
| parent | sh: Add a KBUILD_DEFCONFIG for sh64. (diff) | |
| download | linux-dev-d076d2bd0d9379314df5f2ab8b9c83f617c70923.tar.xz linux-dev-d076d2bd0d9379314df5f2ab8b9c83f617c70923.zip | |
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/drivers/pci')
| -rw-r--r-- | arch/sh/drivers/pci/pci-sh7751.c | 5 |
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 = { }; static struct resource sh7751_mem_resource = { - .name = "SH7785_mem", + .name = "SH7751_mem", .start = SH7751_PCI_MEMORY_BASE, .end = SH7751_PCI_MEMORY_BASE + SH7751_PCI_MEM_SIZE - 1, .flags = IORESOURCE_MEM @@ -64,6 +64,7 @@ static struct pci_channel sh7751_pci_controller = { .mem_offset = 0x00000000, .io_resource = &sh7751_io_resource, .io_offset = 0x00000000, + .io_map_base = SH7751_PCI_IO_BASE, }; static struct sh4_pci_address_map sh7751_pci_map = { @@ -179,8 +180,6 @@ static int __init sh7751_pci_init(void) word = SH4_PCICR_PREFIX | SH4_PCICR_CFIN | SH4_PCICR_ARBM; pci_write_reg(chan, word, SH4_PCICR); - __set_io_port_base(SH7751_PCI_IO_BASE); - register_pci_controller(chan); return 0; |