Merge branch 'agust@denx.de' of git://git.denx.de/u-boot-staging

[u-boot] / drivers / pci / pci_sh4.c

diff --git a/drivers/pci/pci_sh4.c b/drivers/pci/pci_sh4.c
index 1290c0a799eefbd680316562c1c83870d09d85c0..62915b6df98700ea5bfbda81c71611599c2d9159 100644 (file)
--- a/drivers/pci/pci_sh4.c
+++ b/drivers/pci/pci_sh4.c
@@ -4,7 +4,7 @@
  * (C) 2007,2008 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
  * (C) 2008 Yusuke Goda <goda.yusuke@renesas.com>
  *
- * u-boot/cpu/sh4/pci-sh4.c
+ * u-boot/arch/sh/cpu/sh4/pci-sh4.c
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -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,
@@ -74,3 +84,15 @@ int pci_sh4_init(struct pci_controller *hose)
        hose->last_busno = pci_hose_scan(hose);
        return 0;
 }
+
+int pci_skip_dev(struct pci_controller *hose, pci_dev_t dev)
+{
+       return 0;
+}
+
+#ifdef CONFIG_PCI_SCAN_SHOW
+int pci_print_dev(struct pci_controller *hose, pci_dev_t dev)
+{
+       return 1;
+}
+#endif /* CONFIG_PCI_SCAN_SHOW */