summaryrefslogtreecommitdiff
path: root/drivers/net/ethernet/intel/e1000/e1000_osdep.h
diff options
context:
space:
mode:
authorNoe Rubinstein <nrubinstein@avencall.com>2012-02-09 12:04:05 +0100
committerNoe Rubinstein <nrubinstein@avencall.com>2012-02-16 10:54:51 +0100
commit9be5a1c601171fd77aca2c978d1895f669a846f3 (patch)
tree33d83dcb1828941671330cca0168d82f916419bd /drivers/net/ethernet/intel/e1000/e1000_osdep.h
parentaaf6dd2e34de5db8b8f40297ef4660c7196e8407 (diff)
net: e1000: Add support for Intel EP80579 and some OEM phys
Support for the following PHYs is addded via the e1000_oem_phy portion of the addition: Intel M88E1000 Intel M88E1011 Intel IGP01E1000 Intel M88E1141 Vitesse VSC8211 Vitesse VSC8601 Signed-off-by: Noe Rubinstein <nrubinstein@avencall.com>
Diffstat (limited to 'drivers/net/ethernet/intel/e1000/e1000_osdep.h')
-rw-r--r--drivers/net/ethernet/intel/e1000/e1000_osdep.h14
1 files changed, 12 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/e1000/e1000_osdep.h b/drivers/net/ethernet/intel/e1000/e1000_osdep.h
index 33e7c45a4fe..69538aff9f8 100644
--- a/drivers/net/ethernet/intel/e1000/e1000_osdep.h
+++ b/drivers/net/ethernet/intel/e1000/e1000_osdep.h
@@ -59,10 +59,20 @@
(writel((value), (hw->hw_addr + ((hw->mac_type >= e1000_82543) \
? E1000_##reg : E1000_82542_##reg))))
+#define E1000_WRITE_REG(a, reg, value) ( \
+ writel((value), ((a)->hw_addr + \
+ (((a)->mac_type >= e1000_82543) ? E1000_##reg : \
+ E1000_82542_##reg))))
+
+#define E1000_READ_REG(a, reg) ( \
+ readl((a)->hw_addr + \
+ (((a)->mac_type >= e1000_82543) ? E1000_##reg : \
+ E1000_82542_##reg)))
+
#define E1000_WRITE_REG_ARRAY(a, reg, offset, value) ( \
writel((value), ((a)->hw_addr + \
- (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \
- ((offset) << 2))))
+ (((a)->mac_type >= e1000_82543) ? E1000_##reg : E1000_82542_##reg) + \
+ ((offset) << 2))))
#define E1000_READ_REG_ARRAY(a, reg, offset) ( \
readl((a)->hw_addr + \