diff options
Diffstat (limited to 'include/asm-powerpc/prom.h')
-rw-r--r-- | include/asm-powerpc/prom.h | 34 |
1 files changed, 10 insertions, 24 deletions
diff --git a/include/asm-powerpc/prom.h b/include/asm-powerpc/prom.h index ec400f608e16..6845af93ba91 100644 --- a/include/asm-powerpc/prom.h +++ b/include/asm-powerpc/prom.h | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <linux/platform_device.h> | 20 | #include <linux/platform_device.h> |
21 | #include <asm/irq.h> | 21 | #include <asm/irq.h> |
22 | #include <asm/atomic.h> | 22 | #include <asm/atomic.h> |
23 | #include <asm/io.h> | ||
24 | 23 | ||
25 | /* Definitions used by the flattened device tree */ | 24 | /* Definitions used by the flattened device tree */ |
26 | #define OF_DT_HEADER 0xd00dfeed /* marker */ | 25 | #define OF_DT_HEADER 0xd00dfeed /* marker */ |
@@ -334,30 +333,17 @@ extern int of_irq_map_one(struct device_node *device, int index, | |||
334 | struct pci_dev; | 333 | struct pci_dev; |
335 | extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq); | 334 | extern int of_irq_map_pci(struct pci_dev *pdev, struct of_irq *out_irq); |
336 | 335 | ||
337 | static inline int of_irq_to_resource(struct device_node *dev, int index, struct resource *r) | 336 | extern int of_irq_to_resource(struct device_node *dev, int index, |
338 | { | 337 | struct resource *r); |
339 | int irq = irq_of_parse_and_map(dev, index); | ||
340 | |||
341 | /* Only dereference the resource if both the | ||
342 | * resource and the irq are valid. */ | ||
343 | if (r && irq != NO_IRQ) { | ||
344 | r->start = r->end = irq; | ||
345 | r->flags = IORESOURCE_IRQ; | ||
346 | } | ||
347 | |||
348 | return irq; | ||
349 | } | ||
350 | |||
351 | static inline void __iomem *of_iomap(struct device_node *np, int index) | ||
352 | { | ||
353 | struct resource res; | ||
354 | |||
355 | if (of_address_to_resource(np, index, &res)) | ||
356 | return NULL; | ||
357 | |||
358 | return ioremap(res.start, 1 + res.end - res.start); | ||
359 | } | ||
360 | 338 | ||
339 | /** | ||
340 | * of_iomap - Maps the memory mapped IO for a given device_node | ||
341 | * @device: the device whose io range will be mapped | ||
342 | * @index: index of the io range | ||
343 | * | ||
344 | * Returns a pointer to the mapped memory | ||
345 | */ | ||
346 | extern void __iomem *of_iomap(struct device_node *device, int index); | ||
361 | 347 | ||
362 | #endif /* __KERNEL__ */ | 348 | #endif /* __KERNEL__ */ |
363 | #endif /* _POWERPC_PROM_H */ | 349 | #endif /* _POWERPC_PROM_H */ |