---

yaml --- r: 77515 b: refs/heads/master c: 038ee08 h: refs/heads/master i: 77513: 583bc02 77511: 8347f89 v: v3
git-mirror · Jan 26, 2008 · 2da99a4 · 2da99a4
1 parent 2461753
commit 2da99a4
Show file tree

Hide file tree

Showing 5 changed files with 577 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 585cf17561d3174a745bec49c422c1a621c95fc4
+refs/heads/master: 038ee0832ee1b1e2bd2be4599cd535ea9aaaf658
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -336,6 +336,7 @@ config ARCH_MXC
 config ARCH_ORION
 	bool "Marvell Orion"
 	depends on MMU
+	select PCI
 	help
 	  Support for Marvell Orion System on Chip family.
 

diff --git a/trunk/arch/arm/mach-orion/Makefile b/trunk/arch/arm/mach-orion/Makefile
@@ -1 +1 @@
-obj-y  += common.o
+obj-y  += common.o pci.o
diff --git a/trunk/arch/arm/mach-orion/common.h b/trunk/arch/arm/mach-orion/common.h
@@ -6,4 +6,21 @@
  */
 void __init orion_map_io(void);
 
+/*
+ * Shared code used internally by other Orion core functions.
+ * (/mach-orion/pci.c)
+ */
+
+struct pci_sys_data;
+struct pci_bus;
+
+void orion_pcie_id(u32 *dev, u32 *rev);
+u32 orion_pcie_local_bus_nr(void);
+u32 orion_pci_local_bus_nr(void);
+u32 orion_pci_local_dev_nr(void);
+int orion_pci_sys_setup(int nr, struct pci_sys_data *sys);
+struct pci_bus *orion_pci_sys_scan_bus(int nr, struct pci_sys_data *sys);
+int orion_pci_hw_rd_conf(u32 bus, u32 dev, u32 func, u32 where, u32 size, u32 *val);
+int orion_pci_hw_wr_conf(u32 bus, u32 dev, u32 func, u32 where, u32 size, u32 val);
+
 #endif /* __ARCH_ORION_COMMON_H__ */