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

Commit d33fcc30 authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman
Browse files

staging: brcm80211: moved sbdma.h into brcmsmac/bcmdma.h 



Code cleanup. Removed fullmac dependencies on this file.

Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 745c9e6e

drivers/staging/brcm80211/brcmfmac/dhd_sdio.c

+0 −1
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ typedef struct { 


#endif				/* DHD_DEBUG */

#include <chipcommon.h>

#include <sbdma.h>



#include <sdio.h>

#include <sbsdio.h>

drivers/staging/brcm80211/brcmfmac/sbsdpcmdev.h

+1 −56
Original line number Diff line number Diff line
@@ -24,55 +24,6 @@ 
#define	PAD		_XSTR(__LINE__)

#endif				/* PAD */



/* dma registers per channel(xmt or rcv) */

typedef volatile struct {

	u32 control;		/* enable, et al */

	u32 addr;		/* descriptor ring base address (4K aligned) */

	u32 ptr;		/* last descriptor posted to chip */

	u32 status;		/* current active descriptor, et al */

} dma32regs_t;



typedef volatile struct {

	dma32regs_t xmt;	/* dma tx channel */

	dma32regs_t rcv;	/* dma rx channel */

} dma32regp_t;



typedef volatile struct {

	dma64regs_t xmt;	/* dma tx */

	u32 PAD[2];

	dma64regs_t rcv;	/* dma rx */

	u32 PAD[2];

} dma64p_t;





typedef volatile struct {	/* diag access */

	u32 fifoaddr;	/* diag address */

	u32 fifodatalow;	/* low 32bits of data */

	u32 fifodatahigh;	/* high 32bits of data */

	u32 pad;		/* reserved */

} dma64diag_t;



/* dma64 sdiod corerev >= 1 */

typedef volatile struct {

	dma64p_t dma64regs[2];

	dma64diag_t dmafifo;	/* DMA Diagnostic Regs, 0x280-0x28c */

	u32 PAD[92];

} sdiodma64_t;



/* dma32 sdiod corerev == 0 */

typedef volatile struct {

	dma32regp_t dma32regs[2];	/* dma tx & rx, 0x200-0x23c */

	dma32diag_t dmafifo;	/* DMA Diagnostic Regs, 0x240-0x24c */

	u32 PAD[108];

} sdiodma32_t;



/* dma32 regs for pcmcia core */

typedef volatile struct {

	dma32regp_t dmaregs;	/* DMA Regs, 0x200-0x21c, rev8 */

	dma32diag_t dmafifo;	/* DMA Diagnostic Regs, 0x220-0x22c */

	u32 PAD[116];

} pcmdma32_t;



/* core registers */

typedef volatile struct {

	u32 corecontrol;	/* CoreControl, 0x000, rev8 */
@@ -133,13 +84,7 @@ typedef volatile struct { 
	u32 PAD[40];

	u32 clockctlstatus;	/* ClockCtlStatus, 0x1e0, rev8 */

	u32 PAD[7];



	/* DMA engines */

	volatile union {

		pcmdma32_t pcm32;

		sdiodma32_t sdiod32;

		sdiodma64_t sdiod64;

	} dma;

	u32 PAD[128];		/* DMA engines */



	/* SDIO/PCMCIA CIS region */

	char cis[512];		/* 512 byte CIS, 0x400-0x5ff, rev6 */

drivers/staging/brcm80211/brcmsmac/bcmdma.h

+29 −0
Original line number Diff line number Diff line
@@ -17,11 +17,40 @@ 
#ifndef	_bcmdma_h_

#define	_bcmdma_h_



#include "wlc_types.h"		/* forward structure declarations */



#ifndef _dma_pub_

#define _dma_pub_

struct dma_pub;

#endif				/* _dma_pub_ */



/* DMA structure:

 *  support two DMA engines: 32 bits address or 64 bit addressing

 *  basic DMA register set is per channel(transmit or receive)

 *  a pair of channels is defined for convenience

 */



/* 32 bits addressing */



typedef volatile struct {	/* diag access */

	u32 fifoaddr;	/* diag address */

	u32 fifodatalow;	/* low 32bits of data */

	u32 fifodatahigh;	/* high 32bits of data */

	u32 pad;		/* reserved */

} dma32diag_t;



/* 64 bits addressing */



/* dma registers per channel(xmt or rcv) */

typedef volatile struct {

	u32 control;		/* enable, et al */

	u32 ptr;		/* last descriptor posted to chip */

	u32 addrlow;		/* descriptor ring base address low 32-bits (8K aligned) */

	u32 addrhigh;	/* descriptor ring base address bits 63:32 (8K aligned) */

	u32 status0;		/* current descriptor, xmt state */

	u32 status1;		/* active descriptor, xmt error */

} dma64regs_t;



/* map/unmap direction */

#define	DMA_TX	1		/* TX direction for DMA */

#define	DMA_RX	2		/* RX direction for DMA */

drivers/staging/brcm80211/brcmsmac/dma.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <aiutils.h>



#include "wlc_types.h"

#include <sbdma.h>

#include "bcmdma.h"

#include <bcmdma.h>



#if defined(__mips__)

drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <bcmnvram.h>

#include <chipcommon.h>

#include <bcmdevs.h>

#include <sbdma.h>

#include "bcmdma.h"



#include <wlc_types.h>

#include <wlc_phy_int.h>