2 files changed, 8 insertions, 17 deletions

diff --git a/arch/sh/drivers/pci/ops-sh7785lcr.c b/arch/sh/drivers/pci/ops-sh7785lcr.c
index b3bd68702059..e8b7446a7c2b 100644
--- a/arch/sh/drivers/pci/ops-sh7785lcr.c
+++ b/arch/sh/drivers/pci/ops-sh7785lcr.c
@@ -48,13 +48,8 @@ EXPORT_SYMBOL(board_pci_channels);
 
 static struct sh4_pci_address_map sh7785_pci_map = {
         .window0        = {
-                .base   = SH7780_CS2_BASE_ADDR,
-                .size   = 0x04000000,
-        },
-
-        .window1        = {
-                .base   = SH7780_CS3_BASE_ADDR,
-                .size   = 0x04000000,
+                .base   = SH7780_CS0_BASE_ADDR,
+                .size   = 0x20000000,
         },
 
         .flags  = SH4_PCIC_NO_RESET,
diff --git a/arch/sh/drivers/pci/pci-sh7780.c b/arch/sh/drivers/pci/pci-sh7780.c
index 773d575a04b9..bae6a2cf047d 100644
--- a/arch/sh/drivers/pci/pci-sh7780.c
+++ b/arch/sh/drivers/pci/pci-sh7780.c
@@ -120,19 +120,15 @@ int __init sh7780_pcic_init(struct sh4_pci_address_map *map)
 
         /* Set IO and Mem windows to local address
          * Make PCI and local address the same for easy 1 to 1 mapping
-         * Window0 = map->window0.size @ non-cached area base = SDRAM
-         * Window1 = map->window1.size @ cached area base = SDRAM
          */
-        word = (CONFIG_MEMORY_SIZE - 0x00100000) | 0x00000001;
-        pci_write_reg(word, SH4_PCILSR0);
-        pci_write_reg(0x00000001, SH4_PCILSR1);
+        pci_write_reg(map->window0.size - 0xfffff, SH4_PCILSR0);
+        pci_write_reg(map->window1.size - 0xfffff, SH4_PCILSR1);
         /* Set the values on window 0 PCI config registers */
-        word = CONFIG_MEMORY_START | (CONFIG_MEMORY_SIZE - 0x01000000);
-        pci_write_reg(word, SH4_PCILAR0);
-        pci_write_reg(word, SH7780_PCIMBAR0);
+        pci_write_reg(map->window0.base, SH4_PCILAR0);
+        pci_write_reg(map->window0.base, SH7780_PCIMBAR0);
         /* Set the values on window 1 PCI config registers */
-        pci_write_reg(0x00000000, SH4_PCILAR1);
-        pci_write_reg(0x00000000, SH7780_PCIMBAR1);
+        pci_write_reg(map->window1.base, SH4_PCILAR1);
+        pci_write_reg(map->window1.base, SH7780_PCIMBAR1);
 
         /* Map IO space into PCI IO window
          * The IO window is 64K-PCIBIOS_MIN_IO in size