From 1553dc3e7f502d09e060c9149297caa0931d6dea Mon Sep 17 00:00:00 2001 From: Yoshihiro Shimoda Date: Tue, 10 Mar 2009 15:51:49 +0900 Subject: [PATCH] --- yaml --- r: 133315 b: refs/heads/master c: 8ffe31334262108be343d92e81649f9dc3efe826 h: refs/heads/master i: 133313: d3c64c2edd9755edeb81971fe67d682aba020302 133311: 128e0f68607b99df6d4e4e79cf29368727d078a2 v: v3 --- [refs] | 2 +- trunk/arch/sh/drivers/pci/pci-sh7780.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 5bd768b9a0d4..b7ad04b4c8c0 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: df4d4f1a47ed6080c7b4010149126bd1013dc3f1 +refs/heads/master: 8ffe31334262108be343d92e81649f9dc3efe826 diff --git a/trunk/arch/sh/drivers/pci/pci-sh7780.c b/trunk/arch/sh/drivers/pci/pci-sh7780.c index 078dc44d6b08..773d575a04b9 100644 --- a/trunk/arch/sh/drivers/pci/pci-sh7780.c +++ b/trunk/arch/sh/drivers/pci/pci-sh7780.c @@ -127,8 +127,8 @@ int __init sh7780_pcic_init(struct sh4_pci_address_map *map) pci_write_reg(word, SH4_PCILSR0); pci_write_reg(0x00000001, SH4_PCILSR1); /* Set the values on window 0 PCI config registers */ - word = (CONFIG_MEMORY_SIZE > 0x08000000) ? 0x10000000 : 0x08000000; - pci_write_reg(word | 0xa0000000, SH4_PCILAR0); + word = CONFIG_MEMORY_START | (CONFIG_MEMORY_SIZE - 0x01000000); + pci_write_reg(word, SH4_PCILAR0); pci_write_reg(word, SH7780_PCIMBAR0); /* Set the values on window 1 PCI config registers */ pci_write_reg(0x00000000, SH4_PCILAR1);