mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-tc
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-tc: [EISA] EISA registration with !CONFIG_EISA [TC] pmagb-b-fb: Convert to the driver model [TC] dec_esp: Driver model for the PMAZ-A [TC] mips: pmag-ba-fb: Convert to the driver model [TC] defxx: TURBOchannel support [TC] TURBOchannel support for the DECstation [TC] MIPS: TURBOchannel resources off-by-one fix [TC] MIPS: TURBOchannel update to the driver model
This commit is contained in:
Linus Torvalds
commit
68a696a01f
33 changed files with 1537 additions and 906 deletions
|
|
@ -2545,7 +2545,7 @@ config RIONET_RX_SIZE
|
|||
|
||||
config FDDI
|
||||
bool "FDDI driver support"
|
||||
depends on (PCI || EISA)
|
||||
depends on (PCI || EISA || TC)
|
||||
help
|
||||
Fiber Distributed Data Interface is a high speed local area network
|
||||
design; essentially a replacement for high speed Ethernet. FDDI can
|
||||
|
|
@ -2555,11 +2555,31 @@ config FDDI
|
|||
will say N.
|
||||
|
||||
config DEFXX
|
||||
tristate "Digital DEFEA and DEFPA adapter support"
|
||||
depends on FDDI && (PCI || EISA)
|
||||
help
|
||||
This is support for the DIGITAL series of EISA (DEFEA) and PCI
|
||||
(DEFPA) controllers which can connect you to a local FDDI network.
|
||||
tristate "Digital DEFTA/DEFEA/DEFPA adapter support"
|
||||
depends on FDDI && (PCI || EISA || TC)
|
||||
---help---
|
||||
This is support for the DIGITAL series of TURBOchannel (DEFTA),
|
||||
EISA (DEFEA) and PCI (DEFPA) controllers which can connect you
|
||||
to a local FDDI network.
|
||||
|
||||
To compile this driver as a module, choose M here: the module
|
||||
will be called defxx. If unsure, say N.
|
||||
|
||||
config DEFXX_MMIO
|
||||
bool
|
||||
prompt "Use MMIO instead of PIO" if PCI || EISA
|
||||
depends on DEFXX
|
||||
default n if PCI || EISA
|
||||
default y
|
||||
---help---
|
||||
This instructs the driver to use EISA or PCI memory-mapped I/O
|
||||
(MMIO) as appropriate instead of programmed I/O ports (PIO).
|
||||
Enabling this gives an improvement in processing time in parts
|
||||
of the driver, but it may cause problems with EISA (DEFEA)
|
||||
adapters. TURBOchannel does not have the concept of I/O ports,
|
||||
so MMIO is always used for these (DEFTA) adapters.
|
||||
|
||||
If unsure, say N.
|
||||
|
||||
config SKFP
|
||||
tristate "SysKonnect FDDI PCI support"
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -26,6 +26,7 @@
|
|||
* 12-Sep-96 LVS Removed packet request header pointers.
|
||||
* 04 Aug 2003 macro Converted to the DMA API.
|
||||
* 23 Oct 2006 macro Big-endian host support.
|
||||
* 14 Dec 2006 macro TURBOchannel support.
|
||||
*/
|
||||
|
||||
#ifndef _DEFXX_H_
|
||||
|
|
@ -1471,9 +1472,17 @@ typedef union
|
|||
|
||||
#endif /* __BIG_ENDIAN */
|
||||
|
||||
/* Define TC PDQ CSR offset and length */
|
||||
|
||||
#define PI_TC_K_CSR_OFFSET 0x100000
|
||||
#define PI_TC_K_CSR_LEN 0x40 /* 64 bytes */
|
||||
|
||||
/* Define EISA controller register offsets */
|
||||
|
||||
#define PI_ESIC_K_BURST_HOLDOFF 0x040
|
||||
#define PI_ESIC_K_CSR_IO_LEN 0x80 /* 128 bytes */
|
||||
|
||||
#define PI_DEFEA_K_BURST_HOLDOFF 0x040
|
||||
|
||||
#define PI_ESIC_K_SLOT_ID 0xC80
|
||||
#define PI_ESIC_K_SLOT_CNTRL 0xC84
|
||||
#define PI_ESIC_K_MEM_ADD_CMP_0 0xC85
|
||||
|
|
@ -1488,14 +1497,14 @@ typedef union
|
|||
#define PI_ESIC_K_MEM_ADD_LO_CMP_0 0xC8E
|
||||
#define PI_ESIC_K_MEM_ADD_LO_CMP_1 0xC8F
|
||||
#define PI_ESIC_K_MEM_ADD_LO_CMP_2 0xC90
|
||||
#define PI_ESIC_K_IO_CMP_0_0 0xC91
|
||||
#define PI_ESIC_K_IO_CMP_0_1 0xC92
|
||||
#define PI_ESIC_K_IO_CMP_1_0 0xC93
|
||||
#define PI_ESIC_K_IO_CMP_1_1 0xC94
|
||||
#define PI_ESIC_K_IO_CMP_2_0 0xC95
|
||||
#define PI_ESIC_K_IO_CMP_2_1 0xC96
|
||||
#define PI_ESIC_K_IO_CMP_3_0 0xC97
|
||||
#define PI_ESIC_K_IO_CMP_3_1 0xC98
|
||||
#define PI_ESIC_K_IO_ADD_CMP_0_0 0xC91
|
||||
#define PI_ESIC_K_IO_ADD_CMP_0_1 0xC92
|
||||
#define PI_ESIC_K_IO_ADD_CMP_1_0 0xC93
|
||||
#define PI_ESIC_K_IO_ADD_CMP_1_1 0xC94
|
||||
#define PI_ESIC_K_IO_ADD_CMP_2_0 0xC95
|
||||
#define PI_ESIC_K_IO_ADD_CMP_2_1 0xC96
|
||||
#define PI_ESIC_K_IO_ADD_CMP_3_0 0xC97
|
||||
#define PI_ESIC_K_IO_ADD_CMP_3_1 0xC98
|
||||
#define PI_ESIC_K_IO_ADD_MASK_0_0 0xC99
|
||||
#define PI_ESIC_K_IO_ADD_MASK_0_1 0xC9A
|
||||
#define PI_ESIC_K_IO_ADD_MASK_1_0 0xC9B
|
||||
|
|
@ -1518,11 +1527,16 @@ typedef union
|
|||
#define PI_ESIC_K_INPUT_PORT 0xCAC
|
||||
#define PI_ESIC_K_OUTPUT_PORT 0xCAD
|
||||
#define PI_ESIC_K_FUNCTION_CNTRL 0xCAE
|
||||
#define PI_ESIC_K_CSR_IO_LEN PI_ESIC_K_FUNCTION_CNTRL+1 /* always last reg + 1 */
|
||||
|
||||
/* Define the value all drivers must write to the function control register. */
|
||||
/* Define the bits in the function control register. */
|
||||
|
||||
#define PI_ESIC_K_FUNCTION_CNTRL_IO_ENB 0x03
|
||||
#define PI_FUNCTION_CNTRL_M_IOCS0 0x01
|
||||
#define PI_FUNCTION_CNTRL_M_IOCS1 0x02
|
||||
#define PI_FUNCTION_CNTRL_M_IOCS2 0x04
|
||||
#define PI_FUNCTION_CNTRL_M_IOCS3 0x08
|
||||
#define PI_FUNCTION_CNTRL_M_MEMCS0 0x10
|
||||
#define PI_FUNCTION_CNTRL_M_MEMCS1 0x20
|
||||
#define PI_FUNCTION_CNTRL_M_DMA 0x80
|
||||
|
||||
/* Define the bits in the slot control register. */
|
||||
|
||||
|
|
@ -1540,6 +1554,10 @@ typedef union
|
|||
#define PI_BURST_HOLDOFF_V_RESERVED 1
|
||||
#define PI_BURST_HOLDOFF_V_MEM_MAP 0
|
||||
|
||||
/* Define the implicit mask of the Memory Address Mask Register. */
|
||||
|
||||
#define PI_MEM_ADD_MASK_M 0x3ff
|
||||
|
||||
/*
|
||||
* Define the fields in the IO Compare registers.
|
||||
* The driver must initialize the slot field with the slot ID shifted by the
|
||||
|
|
@ -1577,6 +1595,7 @@ typedef union
|
|||
#define DEFEA_PROD_ID_1 0x0130A310 /* DEC product 300, rev 1 */
|
||||
#define DEFEA_PROD_ID_2 0x0230A310 /* DEC product 300, rev 2 */
|
||||
#define DEFEA_PROD_ID_3 0x0330A310 /* DEC product 300, rev 3 */
|
||||
#define DEFEA_PROD_ID_4 0x0430A310 /* DEC product 300, rev 4 */
|
||||
|
||||
/**********************************************/
|
||||
/* Digital PFI Specification v1.0 Definitions */
|
||||
|
|
@ -1633,12 +1652,6 @@ typedef union
|
|||
#define PFI_STATUS_V_FIFO_EMPTY 1
|
||||
#define PFI_STATUS_V_DMA_IN_PROGRESS 0
|
||||
|
||||
#define DFX_MAX_EISA_SLOTS 16 /* maximum number of EISA slots to scan */
|
||||
#define DFX_MAX_NUM_BOARDS 8 /* maximum number of adapters supported */
|
||||
|
||||
#define DFX_BUS_TYPE_PCI 0 /* type code for DEC FDDIcontroller/PCI */
|
||||
#define DFX_BUS_TYPE_EISA 1 /* type code for DEC FDDIcontroller/EISA */
|
||||
|
||||
#define DFX_FC_PRH2_PRH1_PRH0 0x54003820 /* Packet Request Header bytes + FC */
|
||||
#define DFX_PRH0_BYTE 0x20 /* Packet Request Header byte 0 */
|
||||
#define DFX_PRH1_BYTE 0x38 /* Packet Request Header byte 1 */
|
||||
|
|
@ -1756,10 +1769,11 @@ typedef struct DFX_board_tag
|
|||
/* Store device, bus-specific, and parameter information for this adapter */
|
||||
|
||||
struct net_device *dev; /* pointer to device structure */
|
||||
struct net_device *next;
|
||||
u32 bus_type; /* bus type (0 == PCI, 1 == EISA) */
|
||||
u16 base_addr; /* base I/O address (same as dev->base_addr) */
|
||||
struct pci_dev * pci_dev;
|
||||
union {
|
||||
void __iomem *mem;
|
||||
int port;
|
||||
} base; /* base address */
|
||||
struct device *bus_dev;
|
||||
u32 full_duplex_enb; /* FDDI Full Duplex enable (1 == on, 2 == off) */
|
||||
u32 req_ttrt; /* requested TTRT value (in 80ns units) */
|
||||
u32 burst_size; /* adapter burst size (enumerated) */
|
||||
|
|
|
|||
Loading…
Reference in a new issue