diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-03 15:46:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-03 15:46:37 -0800 |
| commit | c5ef91eee5015cc968996fb0d2974cbc41e4eccd (patch) | |
| tree | 9c8648ab4e6326e56e3fcbc6811baf998c963b5a | |
| parent | a6733f2e146a5f4884bc23023bf56f3a2698b547 (diff) | |
| parent | b0d98dc504c3f29cc4647fff87a5061be5f0f3d7 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.24
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6.24:
sh: Support PCI IO access of SH7780 base boards.
sh: Fix PCI IO space base address of SH7780.
| -rw-r--r-- | arch/sh/drivers/pci/ops-r7780rp.c | 4 | ||||
| -rw-r--r-- | arch/sh/drivers/pci/ops-se7780.c | 4 | ||||
| -rw-r--r-- | arch/sh/drivers/pci/pci-sh7780.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/sh/drivers/pci/ops-r7780rp.c b/arch/sh/drivers/pci/ops-r7780rp.c index f2216081ab85..48fe4032ebea 100644 --- a/arch/sh/drivers/pci/ops-r7780rp.c +++ b/arch/sh/drivers/pci/ops-r7780rp.c @@ -40,8 +40,8 @@ int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin) static struct resource sh7780_io_resource = { .name = "SH7780_IO", - .start = 0x2000, - .end = 0x2000 + SH7780_PCI_IO_SIZE - 1, + .start = SH7780_PCI_IO_BASE, + .end = SH7780_PCI_IO_BASE + SH7780_PCI_IO_SIZE - 1, .flags = IORESOURCE_IO }; diff --git a/arch/sh/drivers/pci/ops-se7780.c b/arch/sh/drivers/pci/ops-se7780.c index 212674df5e13..bbdb48c124a2 100644 --- a/arch/sh/drivers/pci/ops-se7780.c +++ b/arch/sh/drivers/pci/ops-se7780.c @@ -43,8 +43,8 @@ int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin) static struct resource se7780_io_resource = { .name = "SH7780_IO", - .start = 0x2000, - .end = 0x2000 + SH7780_PCI_IO_SIZE - 1, + .start = SH7780_PCI_IO_BASE, + .end = SH7780_PCI_IO_BASE + SH7780_PCI_IO_SIZE - 1, .flags = IORESOURCE_IO }; diff --git a/arch/sh/drivers/pci/pci-sh7780.h b/arch/sh/drivers/pci/pci-sh7780.h index 00d12d0f8c1f..1d069a859de2 100644 --- a/arch/sh/drivers/pci/pci-sh7780.h +++ b/arch/sh/drivers/pci/pci-sh7780.h @@ -30,7 +30,7 @@ #define SH7780_PCI_MEMORY_BASE 0xFD000000 /* Memory space base addr */ #define SH7780_PCI_MEM_SIZE 0x01000000 /* Size of Memory window */ -#define SH7780_PCI_IO_BASE 0xFE400000 /* IO space base address */ +#define SH7780_PCI_IO_BASE 0xFE200000 /* IO space base address */ #define SH7780_PCI_IO_SIZE 0x00400000 /* Size of IO window */ #define SH7780_PCIREG_BASE 0xFE040000 /* PCI regs base address */ |