diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-03 18:46:37 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-12-03 18:46:37 -0500 |
| 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) | |||
| 40 | 40 | ||
| 41 | static struct resource sh7780_io_resource = { | 41 | static struct resource sh7780_io_resource = { |
| 42 | .name = "SH7780_IO", | 42 | .name = "SH7780_IO", |
| 43 | .start = 0x2000, | 43 | .start = SH7780_PCI_IO_BASE, |
| 44 | .end = 0x2000 + SH7780_PCI_IO_SIZE - 1, | 44 | .end = SH7780_PCI_IO_BASE + SH7780_PCI_IO_SIZE - 1, |
| 45 | .flags = IORESOURCE_IO | 45 | .flags = IORESOURCE_IO |
| 46 | }; | 46 | }; |
| 47 | 47 | ||
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) | |||
| 43 | 43 | ||
| 44 | static struct resource se7780_io_resource = { | 44 | static struct resource se7780_io_resource = { |
| 45 | .name = "SH7780_IO", | 45 | .name = "SH7780_IO", |
| 46 | .start = 0x2000, | 46 | .start = SH7780_PCI_IO_BASE, |
| 47 | .end = 0x2000 + SH7780_PCI_IO_SIZE - 1, | 47 | .end = SH7780_PCI_IO_BASE + SH7780_PCI_IO_SIZE - 1, |
| 48 | .flags = IORESOURCE_IO | 48 | .flags = IORESOURCE_IO |
| 49 | }; | 49 | }; |
| 50 | 50 | ||
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 @@ | |||
| 30 | #define SH7780_PCI_MEMORY_BASE 0xFD000000 /* Memory space base addr */ | 30 | #define SH7780_PCI_MEMORY_BASE 0xFD000000 /* Memory space base addr */ |
| 31 | #define SH7780_PCI_MEM_SIZE 0x01000000 /* Size of Memory window */ | 31 | #define SH7780_PCI_MEM_SIZE 0x01000000 /* Size of Memory window */ |
| 32 | 32 | ||
| 33 | #define SH7780_PCI_IO_BASE 0xFE400000 /* IO space base address */ | 33 | #define SH7780_PCI_IO_BASE 0xFE200000 /* IO space base address */ |
| 34 | #define SH7780_PCI_IO_SIZE 0x00400000 /* Size of IO window */ | 34 | #define SH7780_PCI_IO_SIZE 0x00400000 /* Size of IO window */ |
| 35 | 35 | ||
| 36 | #define SH7780_PCIREG_BASE 0xFE040000 /* PCI regs base address */ | 36 | #define SH7780_PCIREG_BASE 0xFE040000 /* PCI regs base address */ |