fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / include / asm-sparc64 / sbus.h

diff --git a/include/asm-sparc64/sbus.h b/include/asm-sparc64/sbus.h
index 2d669b1..7efd49d 100644 (file)
--- a/include/asm-sparc64/sbus.h
+++ b/include/asm-sparc64/sbus.h
@@ -7,9 +7,12 @@
 #ifndef _SPARC64_SBUS_H
 #define _SPARC64_SBUS_H
 
+#include <linux/dma-mapping.h>
 #include <linux/ioport.h>
 
 #include <asm/oplib.h>
+#include <asm/prom.h>
+#include <asm/of_device.h>
 #include <asm/iommu.h>
 #include <asm/scatterlist.h>
 
@@ -41,18 +44,19 @@ struct sbus_bus;
 
 /* Linux SBUS device tables */
 struct sbus_dev {
-       struct sbus_bus *bus;   /* Our toplevel parent SBUS     */
-       struct sbus_dev *next;  /* Chain of siblings            */
-       struct sbus_dev *child; /* Chain of children            */
-       struct sbus_dev *parent;/* Parent device if not toplevel*/
-       int prom_node;          /* OBP node of this device      */
-       char prom_name[64];     /* OBP device name property     */
-       int slot;               /* SBUS slot number             */
+       struct of_device        ofdev;
+       struct sbus_bus         *bus;
+       struct sbus_dev         *next;
+       struct sbus_dev         *child;
+       struct sbus_dev         *parent;
+       int prom_node;  
+       char prom_name[64];
+       int slot;
 
        struct resource resource[PROMREG_MAX];
 
        struct linux_prom_registers reg_addrs[PROMREG_MAX];
-       int num_registers, ranges_applied;
+       int num_registers;
 
        struct linux_prom_ranges device_ranges[PROMREG_MAX];
        int num_device_ranges;
@@ -60,9 +64,11 @@ struct sbus_dev {
        unsigned int irqs[4];
        int num_irqs;
 };
+#define to_sbus_device(d) container_of(d, struct sbus_dev, ofdev.dev)
 
 /* This struct describes the SBus(s) found on this machine. */
 struct sbus_bus {
+       struct of_device        ofdev;
        void                    *iommu;         /* Opaque IOMMU cookie  */
        struct sbus_dev         *devices;       /* Tree of SBUS devices */
        struct sbus_bus         *next;          /* Next SBUS in system  */
@@ -74,8 +80,8 @@ struct sbus_bus {
        int num_sbus_ranges;
 
        int portid;
-       void *starfire_cookie;
 };
+#define to_sbus(d) container_of(d, struct sbus_bus, ofdev.dev)
 
 extern struct sbus_bus *sbus_root;
 
@@ -94,15 +100,16 @@ extern struct sbus_bus *sbus_root;
 #define sbus_can_dma_64bit(sdev)       (1)
 #define sbus_can_burst64(sdev)         (1)
 extern void sbus_set_sbus64(struct sbus_dev *, int);
+extern void sbus_fill_device_irq(struct sbus_dev *);
 
 /* These yield IOMMU mappings in consistent mode. */
 extern void *sbus_alloc_consistent(struct sbus_dev *, size_t, dma_addr_t *dma_addrp);
 extern void sbus_free_consistent(struct sbus_dev *, size_t, void *, dma_addr_t);
 
-#define SBUS_DMA_BIDIRECTIONAL 0
-#define SBUS_DMA_TODEVICE      1
-#define SBUS_DMA_FROMDEVICE    2
-#define        SBUS_DMA_NONE           3
+#define SBUS_DMA_BIDIRECTIONAL DMA_BIDIRECTIONAL
+#define SBUS_DMA_TODEVICE      DMA_TO_DEVICE
+#define SBUS_DMA_FROMDEVICE    DMA_FROM_DEVICE
+#define        SBUS_DMA_NONE           DMA_NONE
 
 /* All the rest use streaming mode mappings. */
 extern dma_addr_t sbus_map_single(struct sbus_dev *, void *, size_t, int);
@@ -118,4 +125,10 @@ extern void sbus_dma_sync_sg_for_cpu(struct sbus_dev *, struct scatterlist *, in
 #define sbus_dma_sync_sg sbus_dma_sync_sg_for_cpu
 extern void sbus_dma_sync_sg_for_device(struct sbus_dev *, struct scatterlist *, int, int);
 
+extern void sbus_arch_bus_ranges_init(struct device_node *, struct sbus_bus *);
+extern void sbus_setup_iommu(struct sbus_bus *, struct device_node *);
+extern void sbus_setup_arch_props(struct sbus_bus *, struct device_node *);
+extern int sbus_arch_preinit(void);
+extern void sbus_arch_postinit(void);
+
 #endif /* !(_SPARC64_SBUS_H) */