summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2009-03-15 22:15:13 +0100
committerWolfgang Denk <wd@denx.de>2009-03-15 22:15:13 +0100
commite05825324a8a7679b87db550a0d7ade06c890494 (patch)
treed55e616216d4609eeb3ae629aaa6aacbfcb5fd94 /drivers
parent45f93d4e3c0d2a083131d1c579908bfeb3011bb1 (diff)
parent94a353611b93ac4cb4434a5f7e98aa0902da919e (diff)
downloadu-boot-imx-e05825324a8a7679b87db550a0d7ade06c890494.zip
u-boot-imx-e05825324a8a7679b87db550a0d7ade06c890494.tar.gz
u-boot-imx-e05825324a8a7679b87db550a0d7ade06c890494.tar.bz2
Merge branch 'master' of git://git.denx.de/u-boot-sh
Diffstat (limited to 'drivers')
-rw-r--r--drivers/pci/pci_sh4.c10
-rw-r--r--drivers/pci/pci_sh7780.c6
2 files changed, 13 insertions, 3 deletions
diff --git a/drivers/pci/pci_sh4.c b/drivers/pci/pci_sh4.c
index 057b6dd..c7963ed 100644
--- a/drivers/pci/pci_sh4.c
+++ b/drivers/pci/pci_sh4.c
@@ -54,6 +54,16 @@ int pci_sh4_init(struct pci_controller *hose)
PCI_REGION_IO);
hose->region_count++;
+#if defined(CONFIG_PCI_SYS_BUS)
+ /* PCI System Memory space */
+ pci_set_region(hose->regions + 2,
+ CONFIG_PCI_SYS_BUS,
+ CONFIG_PCI_SYS_PHYS,
+ CONFIG_PCI_SYS_SIZE,
+ PCI_REGION_MEM | PCI_REGION_SYS_MEMORY);
+ hose->region_count++;
+#endif
+
udelay(1000);
pci_set_ops(hose,
diff --git a/drivers/pci/pci_sh7780.c b/drivers/pci/pci_sh7780.c
index 7555d96..bc06f49 100644
--- a/drivers/pci/pci_sh7780.c
+++ b/drivers/pci/pci_sh7780.c
@@ -85,11 +85,11 @@ int pci_sh7780_init(struct pci_controller *hose)
p4_out(SH7780_PCICR_PREFIX, SH7780_PCICR);
p4_outw(0x0047, SH7780_PCICMD);
- p4_out(0x07F00001, SH7780_PCILSR0);
- p4_out(0x08000000, SH7780_PCILAR0);
+ p4_out(CONFIG_SH7780_PCI_LSR, SH7780_PCILSR0);
+ p4_out(CONFIG_SH7780_PCI_LAR, SH7780_PCILAR0);
p4_out(0x00000000, SH7780_PCILSR1);
p4_out(0, SH7780_PCILAR1);
- p4_out(0x08000000, SH7780_PCIMBAR0);
+ p4_out(CONFIG_SH7780_PCI_BAR, SH7780_PCIMBAR0);
p4_out(0x00000000, SH7780_PCIMBAR1);
p4_out(0xFD000000, SH7780_PCIMBR0);