Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aae7fb87 authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parent 39890072

arch/sparc/include/asm/ebus_64.h

+0 −31
Original line number Diff line number Diff line
@@ -48,37 +48,6 @@ struct linux_ebus { 
};

#define to_ebus(d) container_of(d, struct linux_ebus, ofdev.dev)



struct ebus_dma_info {

	spinlock_t	lock;

	void __iomem	*regs;



	unsigned int	flags;

#define EBUS_DMA_FLAG_USE_EBDMA_HANDLER		0x00000001

#define EBUS_DMA_FLAG_TCI_DISABLE		0x00000002



	/* These are only valid is EBUS_DMA_FLAG_USE_EBDMA_HANDLER is

	 * set.

	 */

	void (*callback)(struct ebus_dma_info *p, int event, void *cookie);

	void *client_cookie;

	unsigned int	irq;

#define EBUS_DMA_EVENT_ERROR	1

#define EBUS_DMA_EVENT_DMA	2

#define EBUS_DMA_EVENT_DEVICE	4



	unsigned char	name[64];

};



extern int ebus_dma_register(struct ebus_dma_info *p);

extern int ebus_dma_irq_enable(struct ebus_dma_info *p, int on);

extern void ebus_dma_unregister(struct ebus_dma_info *p);

extern int ebus_dma_request(struct ebus_dma_info *p, dma_addr_t bus_addr,

			    size_t len);

extern void ebus_dma_prepare(struct ebus_dma_info *p, int write);

extern unsigned int ebus_dma_residue(struct ebus_dma_info *p);

extern unsigned int ebus_dma_addr(struct ebus_dma_info *p);

extern void ebus_dma_enable(struct ebus_dma_info *p, int on);



extern struct linux_ebus		*ebus_chain;



extern void ebus_init(void);

arch/sparc/include/asm/ebus_dma.h

0 → 100644
+35 −0
Original line number Diff line number Diff line 
#ifndef __ASM_SPARC_EBUS_DMA_H

#define __ASM_SPARC_EBUS_DMA_H



struct ebus_dma_info {

	spinlock_t	lock;

	void __iomem	*regs;



	unsigned int	flags;

#define EBUS_DMA_FLAG_USE_EBDMA_HANDLER		0x00000001

#define EBUS_DMA_FLAG_TCI_DISABLE		0x00000002



	/* These are only valid is EBUS_DMA_FLAG_USE_EBDMA_HANDLER is

	 * set.

	 */

	void (*callback)(struct ebus_dma_info *p, int event, void *cookie);

	void *client_cookie;

	unsigned int	irq;

#define EBUS_DMA_EVENT_ERROR	1

#define EBUS_DMA_EVENT_DMA	2

#define EBUS_DMA_EVENT_DEVICE	4



	unsigned char	name[64];

};



extern int ebus_dma_register(struct ebus_dma_info *p);

extern int ebus_dma_irq_enable(struct ebus_dma_info *p, int on);

extern void ebus_dma_unregister(struct ebus_dma_info *p);

extern int ebus_dma_request(struct ebus_dma_info *p, dma_addr_t bus_addr,

			    size_t len);

extern void ebus_dma_prepare(struct ebus_dma_info *p, int write);

extern unsigned int ebus_dma_residue(struct ebus_dma_info *p);

extern unsigned int ebus_dma_addr(struct ebus_dma_info *p);

extern void ebus_dma_enable(struct ebus_dma_info *p, int on);



#endif /* __ASM_SPARC_EBUS_DMA_H */

arch/sparc/include/asm/floppy_64.h

+1 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ static int sun_fd_eject(int drive) 


#ifdef CONFIG_PCI

#include <asm/ebus.h>

#include <asm/ebus_dma.h>

#include <asm/ns87303.h>



static struct ebus_dma_info sun_pci_fd_ebus_dma;

arch/sparc/include/asm/parport.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


#include <linux/of_device.h>



#include <asm/ebus.h>

#include <asm/ebus_dma.h>

#include <asm/ns87303.h>

#include <asm/prom.h>

arch/sparc64/kernel/ebus.c

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <asm/system.h>

#include <asm/page.h>

#include <asm/ebus.h>

#include <asm/ebus_dma.h>

#include <asm/oplib.h>

#include <asm/prom.h>

#include <asm/irq.h>