aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Cox <alan@linux.intel.com>2009-08-27 06:02:43 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-09-15 15:02:29 -0400
commitbc7f9c597fa55814548845a7c43f53d6bbbce94b (patch)
treeb21067128eb813cfa7dd17c4d604fd24de4c8f4c
parente266b2022209a2bc389c1cd6b809395c67671a92 (diff)
Staging: et131x: kill the loopback type
Kill off the loopback type in the driver Signed-off-by: Alan Cox <alan@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/staging/et131x/et1310_address_map.h22
-rw-r--r--drivers/staging/et131x/et131x_initpci.c4
2 files changed, 7 insertions, 19 deletions
diff --git a/drivers/staging/et131x/et1310_address_map.h b/drivers/staging/et131x/et1310_address_map.h
index 1a2c73acdec6..39ba922bd2b6 100644
--- a/drivers/staging/et131x/et1310_address_map.h
+++ b/drivers/staging/et131x/et1310_address_map.h
@@ -139,23 +139,11 @@
139#define ET_MSI_TC 0x00070000 139#define ET_MSI_TC 0x00070000
140 140
141/* 141/*
142 * structure for Loopback reg in global address map 142 * Loopback reg located at address 0x0034
143 * located at address 0x0034
144 */ 143 */
145typedef union _LOOPBACK_t { 144
146 u32 value; 145#define ET_LOOP_MAC 0x00000001
147 struct { 146#define ET_LOOP_DMA 0x00000002
148#ifdef _BIT_FIELDS_HTOL
149 u32 unused:30; /* bits 2-31 */
150 u32 dma_loopback:1; /* bit 1 */
151 u32 mac_loopback:1; /* bit 0 */
152#else
153 u32 mac_loopback:1; /* bit 0 */
154 u32 dma_loopback:1; /* bit 1 */
155 u32 unused:30; /* bits 2-31 */
156#endif
157 } bits;
158} LOOPBACK_t, *PLOOPBACK_t;
159 147
160/* 148/*
161 * GLOBAL Module of JAGCore Address Mapping 149 * GLOBAL Module of JAGCore Address Mapping
@@ -175,7 +163,7 @@ typedef struct _GLOBAL_t { /* Location: */
175 u32 sw_reset; /* 0x0028 */ 163 u32 sw_reset; /* 0x0028 */
176 u32 slv_timer; /* 0x002C */ 164 u32 slv_timer; /* 0x002C */
177 u32 msi_config; /* 0x0030 */ 165 u32 msi_config; /* 0x0030 */
178 LOOPBACK_t loopback; /* 0x0034 */ 166 u32 loopback; /* 0x0034 */
179 u32 watchdog_timer; /* 0x0038 */ 167 u32 watchdog_timer; /* 0x0038 */
180} GLOBAL_t, *PGLOBAL_t; 168} GLOBAL_t, *PGLOBAL_t;
181 169
diff --git a/drivers/staging/et131x/et131x_initpci.c b/drivers/staging/et131x/et131x_initpci.c
index 33f49959ea7c..0662e7ff964e 100644
--- a/drivers/staging/et131x/et131x_initpci.c
+++ b/drivers/staging/et131x/et131x_initpci.c
@@ -573,7 +573,7 @@ void ConfigGlobalRegs(struct et131x_adapter *etdev)
573 } 573 }
574 574
575 /* Initialize the loopback register. Disable all loopbacks. */ 575 /* Initialize the loopback register. Disable all loopbacks. */
576 writel(0, &regs->loopback.value); 576 writel(0, &regs->loopback);
577 } else { 577 } else {
578 /* For PHY Line loopback, the memory is configured as if Tx 578 /* For PHY Line loopback, the memory is configured as if Tx
579 * and Rx both have all the memory. This is because the 579 * and Rx both have all the memory. This is because the
@@ -586,7 +586,7 @@ void ConfigGlobalRegs(struct et131x_adapter *etdev)
586 writel(INTERNAL_MEM_SIZE - 1, &regs->txq_end_addr); 586 writel(INTERNAL_MEM_SIZE - 1, &regs->txq_end_addr);
587 587
588 /* Initialize the loopback register (MAC loopback). */ 588 /* Initialize the loopback register (MAC loopback). */
589 writel(1, &regs->loopback); 589 writel(ET_LOOP_MAC, &regs->loopback);
590 } 590 }
591 591
592 /* MSI Register */ 592 /* MSI Register */