tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

sparc: Move EBUS DMA interfaces into seperate header file.

These have no dependencies on the EBUS probing layer, the clients
setup the registers and all of those details. The EBUS DMA layer
just programs and manages the DMA controller found in EBUS.

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

David S. Miller aae7fb87 39890072

+39 -32
-31
arch/sparc/include/asm/ebus_64.h
··· 48 48 }; 49 49 #define to_ebus(d) container_of(d, struct linux_ebus, ofdev.dev) 50 50 51 - struct ebus_dma_info { 52 - spinlock_t lock; 53 - void __iomem *regs; 54 - 55 - unsigned int flags; 56 - #define EBUS_DMA_FLAG_USE_EBDMA_HANDLER 0x00000001 57 - #define EBUS_DMA_FLAG_TCI_DISABLE 0x00000002 58 - 59 - /* These are only valid is EBUS_DMA_FLAG_USE_EBDMA_HANDLER is 60 - * set. 61 - */ 62 - void (*callback)(struct ebus_dma_info *p, int event, void *cookie); 63 - void *client_cookie; 64 - unsigned int irq; 65 - #define EBUS_DMA_EVENT_ERROR 1 66 - #define EBUS_DMA_EVENT_DMA 2 67 - #define EBUS_DMA_EVENT_DEVICE 4 68 - 69 - unsigned char name[64]; 70 - }; 71 - 72 - extern int ebus_dma_register(struct ebus_dma_info *p); 73 - extern int ebus_dma_irq_enable(struct ebus_dma_info *p, int on); 74 - extern void ebus_dma_unregister(struct ebus_dma_info *p); 75 - extern int ebus_dma_request(struct ebus_dma_info *p, dma_addr_t bus_addr, 76 - size_t len); 77 - extern void ebus_dma_prepare(struct ebus_dma_info *p, int write); 78 - extern unsigned int ebus_dma_residue(struct ebus_dma_info *p); 79 - extern unsigned int ebus_dma_addr(struct ebus_dma_info *p); 80 - extern void ebus_dma_enable(struct ebus_dma_info *p, int on); 81 - 82 51 extern struct linux_ebus *ebus_chain; 83 52 84 53 extern void ebus_init(void);
+35
arch/sparc/include/asm/ebus_dma.h
··· 1 + #ifndef __ASM_SPARC_EBUS_DMA_H 2 + #define __ASM_SPARC_EBUS_DMA_H 3 + 4 + struct ebus_dma_info { 5 + spinlock_t lock; 6 + void __iomem *regs; 7 + 8 + unsigned int flags; 9 + #define EBUS_DMA_FLAG_USE_EBDMA_HANDLER 0x00000001 10 + #define EBUS_DMA_FLAG_TCI_DISABLE 0x00000002 11 + 12 + /* These are only valid is EBUS_DMA_FLAG_USE_EBDMA_HANDLER is 13 + * set. 14 + */ 15 + void (*callback)(struct ebus_dma_info *p, int event, void *cookie); 16 + void *client_cookie; 17 + unsigned int irq; 18 + #define EBUS_DMA_EVENT_ERROR 1 19 + #define EBUS_DMA_EVENT_DMA 2 20 + #define EBUS_DMA_EVENT_DEVICE 4 21 + 22 + unsigned char name[64]; 23 + }; 24 + 25 + extern int ebus_dma_register(struct ebus_dma_info *p); 26 + extern int ebus_dma_irq_enable(struct ebus_dma_info *p, int on); 27 + extern void ebus_dma_unregister(struct ebus_dma_info *p); 28 + extern int ebus_dma_request(struct ebus_dma_info *p, dma_addr_t bus_addr, 29 + size_t len); 30 + extern void ebus_dma_prepare(struct ebus_dma_info *p, int write); 31 + extern unsigned int ebus_dma_residue(struct ebus_dma_info *p); 32 + extern unsigned int ebus_dma_addr(struct ebus_dma_info *p); 33 + extern void ebus_dma_enable(struct ebus_dma_info *p, int on); 34 + 35 + #endif /* __ASM_SPARC_EBUS_DMA_H */
+1
arch/sparc/include/asm/floppy_64.h
··· 294 294 295 295 #ifdef CONFIG_PCI 296 296 #include <asm/ebus.h> 297 + #include <asm/ebus_dma.h> 297 298 #include <asm/ns87303.h> 298 299 299 300 static struct ebus_dma_info sun_pci_fd_ebus_dma;
+1 -1
arch/sparc/include/asm/parport.h
··· 8 8 9 9 #include <linux/of_device.h> 10 10 11 - #include <asm/ebus.h> 11 + #include <asm/ebus_dma.h> 12 12 #include <asm/ns87303.h> 13 13 #include <asm/prom.h> 14 14
+1
arch/sparc64/kernel/ebus.c
··· 19 19 #include <asm/system.h> 20 20 #include <asm/page.h> 21 21 #include <asm/ebus.h> 22 + #include <asm/ebus_dma.h> 22 23 #include <asm/oplib.h> 23 24 #include <asm/prom.h> 24 25 #include <asm/irq.h>
+1
sound/sparc/cs4231.c
··· 36 36 #define EBUS_SUPPORT 37 37 #include <linux/pci.h> 38 38 #include <asm/ebus.h> 39 + #include <asm/ebus_dma.h> 39 40 #endif 40 41 41 42 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX; /* Index 0-MAX */