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.

diff --git a/arch/sh/drivers/pci/ops-r7780rp.c b/arch/sh/drivers/pci/ops-r7780rp.c
index f2216081ab85d5983bd8c5d4b4b282b362e6fc98..48fe4032ebea7b9cfeaef46864f5dc32f580f635 100644 (file)
--- 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 212674df5e1369c6cedc5fb58621fc9742987769..bbdb48c124a238ce4016279383906ac6aa1c55ed 100644 (file)
--- 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 00d12d0f8c1f682c7a730665ef0178e14da28c1d..1d069a859de27cd69f704161f63ac919eefe4b85 100644 (file)
--- 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 */