aboutsummaryrefslogtreecommitdiffstats
path: root/arch/microblaze/include/asm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/microblaze/include/asm')
-rw-r--r--arch/microblaze/include/asm/pci-bridge.h14
-rw-r--r--arch/microblaze/include/asm/prom.h15
2 files changed, 7 insertions, 22 deletions
diff --git a/arch/microblaze/include/asm/pci-bridge.h b/arch/microblaze/include/asm/pci-bridge.h
index 746df91e5796..728f8d6a59a4 100644
--- a/arch/microblaze/include/asm/pci-bridge.h
+++ b/arch/microblaze/include/asm/pci-bridge.h
@@ -105,19 +105,19 @@ struct pci_controller {
105}; 105};
106 106
107#ifdef CONFIG_PCI 107#ifdef CONFIG_PCI
108static inline struct pci_controller *pci_bus_to_host(const struct pci_bus *bus) 108static inline struct device_node *pci_device_to_OF_node(struct pci_dev *dev)
109{ 109{
110 return bus->sysdata; 110 return dev->dev.of_node;
111} 111}
112 112
113static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus) 113static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus)
114{ 114{
115 struct pci_controller *host; 115 return bus->dev.of_node;
116}
116 117
117 if (bus->self) 118static inline struct pci_controller *pci_bus_to_host(const struct pci_bus *bus)
118 return pci_device_to_OF_node(bus->self); 119{
119 host = pci_bus_to_host(bus); 120 return bus->sysdata;
120 return host ? host->dn : NULL;
121} 121}
122 122
123static inline int isa_vaddr_is_ioport(void __iomem *address) 123static inline int isa_vaddr_is_ioport(void __iomem *address)
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h
index d0890d36ef61..9bd01ecb00d6 100644
--- a/arch/microblaze/include/asm/prom.h
+++ b/arch/microblaze/include/asm/prom.h
@@ -29,21 +29,6 @@
29extern int early_uartlite_console(void); 29extern int early_uartlite_console(void);
30extern int early_uart16550_console(void); 30extern int early_uart16550_console(void);
31 31
32#ifdef CONFIG_PCI
33/*
34 * PCI <-> OF matching functions
35 * (XXX should these be here?)
36 */
37struct pci_bus;
38struct pci_dev;
39extern int pci_device_from_OF_node(struct device_node *node,
40 u8 *bus, u8 *devfn);
41extern struct device_node *pci_busdev_to_OF_node(struct pci_bus *bus,
42 int devfn);
43extern struct device_node *pci_device_to_OF_node(struct pci_dev *dev);
44extern void pci_create_OF_bus_map(void);
45#endif
46
47/* 32/*
48 * OF address retreival & translation 33 * OF address retreival & translation
49 */ 34 */