net: wireless: bcm4329: Remove obsolete files
authorDmitry Shmidt <dimitrysh@google.com>
Mon, 13 Aug 2012 20:59:22 +0000 (13:59 -0700)
committerDmitry Shmidt <dimitrysh@google.com>
Mon, 13 Aug 2012 21:03:29 +0000 (14:03 -0700)
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
drivers/net/wireless/bcm4329/include/bcmspibrcm.h [deleted file]
drivers/net/wireless/bcm4329/include/spid.h [deleted file]

diff --git a/drivers/net/wireless/bcm4329/include/bcmspibrcm.h b/drivers/net/wireless/bcm4329/include/bcmspibrcm.h
deleted file mode 100644 (file)
index 9dce878..0000000
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * SD-SPI Protocol Conversion - BCMSDH->gSPI Translation Layer
- *
- * Copyright (C) 2010, Broadcom Corporation
- * All Rights Reserved.
- * 
- * This is UNPUBLISHED PROPRIETARY SOURCE CODE of Broadcom Corporation;
- * the contents of this file may not be disclosed to third parties, copied
- * or duplicated in any form, in whole or in part, without the prior
- * written permission of Broadcom Corporation.
- *
- * $Id: bcmspibrcm.h,v 1.4.4.1.4.3.6.1 2008/09/27 17:03:25 Exp $
- */
-
-/* global msglevel for debug messages - bitvals come from sdiovar.h */
-
-#define sd_err(x)
-#define sd_trace(x)
-#define sd_info(x)
-#define sd_debug(x)
-#define sd_data(x)
-#define sd_ctrl(x)
-
-#define sd_log(x)
-
-#define SDIOH_ASSERT(exp) \
-       do { if (!(exp)) \
-               printf("!!!ASSERT fail: file %s lines %d", __FILE__, __LINE__); \
-       } while (0)
-
-#define BLOCK_SIZE_F1          64
-#define BLOCK_SIZE_F2          2048
-#define BLOCK_SIZE_F3          2048
-
-/* internal return code */
-#define SUCCESS        0
-#undef ERROR
-#define ERROR  1
-#define ERROR_UF       2
-#define ERROR_OF       3
-
-/* private bus modes */
-#define SDIOH_MODE_SPI         0
-
-#define USE_BLOCKMODE          0x2     /* Block mode can be single block or multi */
-#define USE_MULTIBLOCK         0x4
-
-struct sdioh_info {
-       uint            cfg_bar;                /* pci cfg address for bar */
-       uint32          caps;                   /* cached value of capabilities reg */
-       void            *bar0;                  /* BAR0 for PCI Device */
-       osl_t           *osh;                   /* osh handler */
-       void            *controller;    /* Pointer to SPI Controller's private data struct */
-
-       uint            lockcount;              /* nest count of spi_lock() calls */
-       bool            client_intr_enabled;    /* interrupt connnected flag */
-       bool            intr_handler_valid;     /* client driver interrupt handler valid */
-       sdioh_cb_fn_t   intr_handler;           /* registered interrupt handler */
-       void            *intr_handler_arg;      /* argument to call interrupt handler */
-       bool            initialized;            /* card initialized */
-       uint32          target_dev;             /* Target device ID */
-       uint32          intmask;                /* Current active interrupts */
-       void            *sdos_info;             /* Pointer to per-OS private data */
-
-       uint32          controller_type;        /* Host controller type */
-       uint8           version;                /* Host Controller Spec Compliance Version */
-       uint            irq;                    /* Client irq */
-       uint32          intrcount;              /* Client interrupts */
-       uint32          local_intrcount;        /* Controller interrupts */
-       bool            host_init_done;         /* Controller initted */
-       bool            card_init_done;         /* Client SDIO interface initted */
-       bool            polled_mode;            /* polling for command completion */
-
-       bool            sd_use_dma;             /* DMA on CMD53 */
-       bool            sd_blockmode;           /* sd_blockmode == FALSE => 64 Byte Cmd 53s. */
-                                               /*  Must be on for sd_multiblock to be effective */
-       bool            use_client_ints;        /* If this is false, make sure to restore */
-                                               /*  polling hack in wl_linux.c:wl_timer() */
-       int             adapter_slot;           /* Maybe dealing with multiple slots/controllers */
-       int             sd_mode;                /* SD1/SD4/SPI */
-       int             client_block_size[SPI_MAX_IOFUNCS];             /* Blocksize */
-       uint32          data_xfer_count;        /* Current transfer */
-       uint16          card_rca;               /* Current Address */
-       uint8           num_funcs;              /* Supported funcs on client */
-       uint32          card_dstatus;           /* 32bit device status */
-       uint32          com_cis_ptr;
-       uint32          func_cis_ptr[SPI_MAX_IOFUNCS];
-       void            *dma_buf;
-       ulong           dma_phys;
-       int             r_cnt;                  /* rx count */
-       int             t_cnt;                  /* tx_count */
-       uint32          wordlen;                        /* host processor 16/32bits */
-       uint32          prev_fun;
-       uint32          chip;
-       uint32          chiprev;
-       bool            resp_delay_all;
-       bool            dwordmode;
-
-       struct spierrstats_t spierrstats;
-};
-
-/************************************************************
- * Internal interfaces: per-port references into bcmspibrcm.c
- */
-
-/* Global message bits */
-extern uint sd_msglevel;
-
-/**************************************************************
- * Internal interfaces: bcmspibrcm.c references to per-port code
- */
-
-/* Interrupt (de)registration routines */
-extern int spi_register_irq(sdioh_info_t *sd, uint irq);
-extern void spi_free_irq(uint irq, sdioh_info_t *sd);
-
-/* OS-specific interrupt wrappers (atomic interrupt enable/disable) */
-extern void spi_lock(sdioh_info_t *sd);
-extern void spi_unlock(sdioh_info_t *sd);
-
-/* Allocate/init/free per-OS private data */
-extern int spi_osinit(sdioh_info_t *sd);
-extern void spi_osfree(sdioh_info_t *sd);
-
-#define SPI_RW_FLAG_M                  BITFIELD_MASK(1)        /* Bit [31] - R/W Command Bit */
-#define SPI_RW_FLAG_S                  31
-#define SPI_ACCESS_M                   BITFIELD_MASK(1)        /* Bit [30] - Fixed/Incr Access */
-#define SPI_ACCESS_S                   30
-#define SPI_FUNCTION_M                 BITFIELD_MASK(2)        /* Bit [29:28] - Function Number */
-#define SPI_FUNCTION_S                 28
-#define SPI_REG_ADDR_M                 BITFIELD_MASK(17)       /* Bit [27:11] - Address */
-#define SPI_REG_ADDR_S                 11
-#define SPI_LEN_M                      BITFIELD_MASK(11)       /* Bit [10:0] - Packet length */
-#define SPI_LEN_S                      0
diff --git a/drivers/net/wireless/bcm4329/include/spid.h b/drivers/net/wireless/bcm4329/include/spid.h
deleted file mode 100644 (file)
index c740296..0000000
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * SPI device spec header file
- *
- * Copyright (C) 2010, Broadcom Corporation
- * All Rights Reserved.
- * 
- * This is UNPUBLISHED PROPRIETARY SOURCE CODE of Broadcom Corporation;
- * the contents of this file may not be disclosed to third parties, copied
- * or duplicated in any form, in whole or in part, without the prior
- * written permission of Broadcom Corporation.
- *
- * $Id: spid.h,v 1.7.10.1.16.3 2009/04/09 19:23:14 Exp $
- */
-
-#ifndef        _SPI_H
-#define        _SPI_H
-
-/*
- * Brcm SPI Device Register Map.
- *
- */
-
-typedef volatile struct {
-       uint8   config;                 /* 0x00, len, endian, clock, speed, polarity, wakeup */
-       uint8   response_delay;         /* 0x01, read response delay in bytes (corerev < 3) */
-       uint8   status_enable;          /* 0x02, status-enable, intr with status, response_delay
-                                        * function selection, command/data error check
-                                        */
-       uint8   reset_bp;               /* 0x03, reset on wlan/bt backplane reset (corerev >= 1) */
-       uint16  intr_reg;               /* 0x04, Intr status register */
-       uint16  intr_en_reg;            /* 0x06, Intr mask register */
-       uint32  status_reg;             /* 0x08, RO, Status bits of last spi transfer */
-       uint16  f1_info_reg;            /* 0x0c, RO, enabled, ready for data transfer, blocksize */
-       uint16  f2_info_reg;            /* 0x0e, RO, enabled, ready for data transfer, blocksize */
-       uint16  f3_info_reg;            /* 0x10, RO, enabled, ready for data transfer, blocksize */
-       uint32  test_read;              /* 0x14, RO 0xfeedbead signature */
-       uint32  test_rw;                /* 0x18, RW */
-       uint8   resp_delay_f0;          /* 0x1c, read resp delay bytes for F0 (corerev >= 3) */
-       uint8   resp_delay_f1;          /* 0x1d, read resp delay bytes for F1 (corerev >= 3) */
-       uint8   resp_delay_f2;          /* 0x1e, read resp delay bytes for F2 (corerev >= 3) */
-       uint8   resp_delay_f3;          /* 0x1f, read resp delay bytes for F3 (corerev >= 3) */
-} spi_regs_t;
-
-/* SPI device register offsets */
-#define SPID_CONFIG                    0x00
-#define SPID_RESPONSE_DELAY            0x01
-#define SPID_STATUS_ENABLE             0x02
-#define SPID_RESET_BP                  0x03    /* (corerev >= 1) */
-#define SPID_INTR_REG                  0x04    /* 16 bits - Interrupt status */
-#define SPID_INTR_EN_REG               0x06    /* 16 bits - Interrupt mask */
-#define SPID_STATUS_REG                        0x08    /* 32 bits */
-#define SPID_F1_INFO_REG               0x0C    /* 16 bits */
-#define SPID_F2_INFO_REG               0x0E    /* 16 bits */
-#define SPID_F3_INFO_REG               0x10    /* 16 bits */
-#define SPID_TEST_READ                 0x14    /* 32 bits */
-#define SPID_TEST_RW                   0x18    /* 32 bits */
-#define SPID_RESP_DELAY_F0             0x1c    /* 8 bits (corerev >= 3) */
-#define SPID_RESP_DELAY_F1             0x1d    /* 8 bits (corerev >= 3) */
-#define SPID_RESP_DELAY_F2             0x1e    /* 8 bits (corerev >= 3) */
-#define SPID_RESP_DELAY_F3             0x1f    /* 8 bits (corerev >= 3) */
-
-/* Bit masks for SPID_CONFIG device register */
-#define WORD_LENGTH_32 0x1     /* 0/1 16/32 bit word length */
-#define ENDIAN_BIG     0x2     /* 0/1 Little/Big Endian */
-#define CLOCK_PHASE    0x4     /* 0/1 clock phase delay */
-#define CLOCK_POLARITY 0x8     /* 0/1 Idle state clock polarity is low/high */
-#define HIGH_SPEED_MODE        0x10    /* 1/0 High Speed mode / Normal mode */
-#define INTR_POLARITY  0x20    /* 1/0 Interrupt active polarity is high/low */
-#define WAKE_UP                0x80    /* 0/1 Wake-up command from Host to WLAN */
-
-/* Bit mask for SPID_RESPONSE_DELAY device register */
-#define RESPONSE_DELAY_MASK    0xFF    /* Configurable rd response delay in multiples of 8 bits */
-
-/* Bit mask for SPID_STATUS_ENABLE device register */
-#define STATUS_ENABLE          0x1     /* 1/0 Status sent/not sent to host after read/write */
-#define INTR_WITH_STATUS       0x2     /* 0/1 Do-not / do-interrupt if status is sent */
-#define RESP_DELAY_ALL         0x4     /* Applicability of resp delay to F1 or all func's read */
-#define DWORD_PKT_LEN_EN       0x8     /* Packet len denoted in dwords instead of bytes */
-#define CMD_ERR_CHK_EN         0x20    /* Command error check enable */
-#define DATA_ERR_CHK_EN                0x40    /* Data error check enable */
-
-/* Bit mask for SPID_RESET_BP device register */
-#define RESET_ON_WLAN_BP_RESET 0x4     /* enable reset for WLAN backplane */
-#define RESET_ON_BT_BP_RESET   0x8     /* enable reset for BT backplane */
-#define RESET_SPI              0x80    /* reset the above enabled logic */
-
-/* Bit mask for SPID_INTR_REG device register */
-#define DATA_UNAVAILABLE       0x0001  /* Requested data not available; Clear by writing a "1" */
-#define F2_F3_FIFO_RD_UNDERFLOW        0x0002
-#define F2_F3_FIFO_WR_OVERFLOW 0x0004
-#define COMMAND_ERROR          0x0008  /* Cleared by writing 1 */
-#define DATA_ERROR             0x0010  /* Cleared by writing 1 */
-#define F2_PACKET_AVAILABLE    0x0020
-#define F3_PACKET_AVAILABLE    0x0040
-#define F1_OVERFLOW            0x0080  /* Due to last write. Bkplane has pending write requests */
-#define MISC_INTR0             0x0100
-#define MISC_INTR1             0x0200
-#define MISC_INTR2             0x0400
-#define MISC_INTR3             0x0800
-#define MISC_INTR4             0x1000
-#define F1_INTR                        0x2000
-#define F2_INTR                        0x4000
-#define F3_INTR                        0x8000
-
-/* Bit mask for 32bit SPID_STATUS_REG device register */
-#define STATUS_DATA_NOT_AVAILABLE      0x00000001
-#define STATUS_UNDERFLOW               0x00000002
-#define STATUS_OVERFLOW                        0x00000004
-#define STATUS_F2_INTR                 0x00000008
-#define STATUS_F3_INTR                 0x00000010
-#define STATUS_F2_RX_READY             0x00000020
-#define STATUS_F3_RX_READY             0x00000040
-#define STATUS_HOST_CMD_DATA_ERR       0x00000080
-#define STATUS_F2_PKT_AVAILABLE                0x00000100
-#define STATUS_F2_PKT_LEN_MASK         0x000FFE00
-#define STATUS_F2_PKT_LEN_SHIFT                9
-#define STATUS_F3_PKT_AVAILABLE                0x00100000
-#define STATUS_F3_PKT_LEN_MASK         0xFFE00000
-#define STATUS_F3_PKT_LEN_SHIFT                21
-
-/* Bit mask for 16 bits SPID_F1_INFO_REG device register */
-#define F1_ENABLED                     0x0001
-#define F1_RDY_FOR_DATA_TRANSFER       0x0002
-#define F1_MAX_PKT_SIZE                        0x01FC
-
-/* Bit mask for 16 bits SPID_F2_INFO_REG device register */
-#define F2_ENABLED                     0x0001
-#define F2_RDY_FOR_DATA_TRANSFER       0x0002
-#define F2_MAX_PKT_SIZE                        0x3FFC
-
-/* Bit mask for 16 bits SPID_F3_INFO_REG device register */
-#define F3_ENABLED                     0x0001
-#define F3_RDY_FOR_DATA_TRANSFER       0x0002
-#define F3_MAX_PKT_SIZE                        0x3FFC
-
-/* Bit mask for 32 bits SPID_TEST_READ device register read in 16bit LE mode */
-#define TEST_RO_DATA_32BIT_LE          0xFEEDBEAD
-
-/* Maximum number of I/O funcs */
-#define SPI_MAX_IOFUNCS                4
-
-#define SPI_MAX_PKT_LEN                (2048*4)
-
-/* Misc defines */
-#define SPI_FUNC_0             0
-#define SPI_FUNC_1             1
-#define SPI_FUNC_2             2
-#define SPI_FUNC_3             3
-
-#define WAIT_F2RXFIFORDY       100
-#define WAIT_F2RXFIFORDY_DELAY 20
-
-#endif /* _SPI_H */