pasemi_mac: Minor cleanup / define fixes

* Remove some unused defines
* Fix a couple of wrong chip register defines, and add a few more fields
  that might be used in the near future.

Signed-off-by: Olof Johansson <olof@lixom.net>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

2 files changed, 8 insertions, 10 deletions

diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index 216bb4a2c633..f18fd07973b1 100644
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -61,12 +61,6 @@
 
 #define BUF_SIZE 1646 /* 1500 MTU + ETH_HLEN + VLAN_HLEN + 2 64B cachelines */
 
-/* XXXOJN these should come out of the device tree some day */
-#define PAS_DMA_CAP_BASE   0xe00d0040
-#define PAS_DMA_CAP_SIZE   0x100
-#define PAS_DMA_COM_BASE   0xe00d0100
-#define PAS_DMA_COM_SIZE   0x100
-
 static struct pasdma_status *dma_status;
 
 static int pasemi_get_mac_addr(struct pasemi_mac *mac)
diff --git a/drivers/net/pasemi_mac.h b/drivers/net/pasemi_mac.h
index 88edaa51c661..3dcc1f288adf 100644
--- a/drivers/net/pasemi_mac.h
+++ b/drivers/net/pasemi_mac.h
@@ -195,11 +195,15 @@ enum {
 #define PAS_DMA_RXINT_RCMDSTA(i)        (0x200+(i)*_PAS_DMA_RXINT_STRIDE)
 #define    PAS_DMA_RXINT_RCMDSTA_EN     0x00000001
 #define    PAS_DMA_RXINT_RCMDSTA_ST     0x00000002
-#define    PAS_DMA_RXINT_RCMDSTA_OO     0x00000100
-#define    PAS_DMA_RXINT_RCMDSTA_BP     0x00000200
-#define    PAS_DMA_RXINT_RCMDSTA_DR     0x00000400
+#define    PAS_DMA_RXINT_RCMDSTA_MBT    0x00000008
+#define    PAS_DMA_RXINT_RCMDSTA_MDR    0x00000010
+#define    PAS_DMA_RXINT_RCMDSTA_MOO    0x00000020
+#define    PAS_DMA_RXINT_RCMDSTA_MBP    0x00000040
 #define    PAS_DMA_RXINT_RCMDSTA_BT     0x00000800
-#define    PAS_DMA_RXINT_RCMDSTA_TB     0x00001000
+#define    PAS_DMA_RXINT_RCMDSTA_DR     0x00001000
+#define    PAS_DMA_RXINT_RCMDSTA_OO     0x00002000
+#define    PAS_DMA_RXINT_RCMDSTA_BP     0x00004000
+#define    PAS_DMA_RXINT_RCMDSTA_TB     0x00008000
 #define    PAS_DMA_RXINT_RCMDSTA_ACT    0x00010000
 #define    PAS_DMA_RXINT_RCMDSTA_DROPS_M        0xfffe0000
 #define    PAS_DMA_RXINT_RCMDSTA_DROPS_S        17