[SPARC64]: Probe PCI bus using OF device tree.

Almost entirely taken from the 64-bit PowerPC PCI code.

This allowed to eliminate a ton of cruft from the sparc64
PCI layer.

Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 17 insertions, 24 deletions

diff --git a/include/asm-sparc64/device.h b/include/asm-sparc64/device.h
index d8f9872b0e2..d5a4559b955 100644
--- a/include/asm-sparc64/device.h
+++ b/include/asm-sparc64/device.h
@@ -3,5 +3,21 @@
  *
  * This file is released under the GPLv2
  */
-#include <asm-generic/device.h>
+#ifndef _ASM_SPARC64_DEVICE_H
+#define _ASM_SPARC64_DEVICE_H
 
+struct device_node;
+struct of_device;
+
+struct dev_archdata {
+        void                    *iommu;
+        void                    *stc;
+        void                    *host_controller;
+
+        struct device_node      *prom_node;
+        struct of_device        *op;
+
+        unsigned int            msi_num;
+};
+
+#endif /* _ASM_SPARC64_DEVICE_H */
diff --git a/include/asm-sparc64/pbm.h b/include/asm-sparc64/pbm.h
index 7a246d8a182..88974d685a3 100644
--- a/include/asm-sparc64/pbm.h
+++ b/include/asm-sparc64/pbm.h
@@ -244,27 +244,4 @@ struct pci_controller_info {
         unsigned int                    pci_last_busno;
 };
 
-/* PCI devices which are not bridges have this placed in their pci_dev
- * sysdata member.  This makes OBP aware PCI device drivers easier to
- * code.
- */
-struct pcidev_cookie {
-        struct pci_pbm_info             *pbm;
-        struct device_node              *prom_node;
-        struct of_device                *op;
-        struct linux_prom_pci_registers prom_regs[PROMREG_MAX];
-        int num_prom_regs;
-        struct linux_prom_pci_registers prom_assignments[PROMREG_MAX];
-        int num_prom_assignments;
-#ifdef CONFIG_PCI_MSI
-        unsigned int                    msi_num;
-#endif
-};
-
-/* Currently these are the same across all PCI controllers
- * we support.  Someday they may not be...
- */
-#define PCI_IRQ_IGN     0x000007c0      /* Interrupt Group Number */
-#define PCI_IRQ_INO     0x0000003f      /* Interrupt Number */
-
 #endif /* !(__SPARC64_PBM_H) */