From: Mark Einon <mark.einon@gmail.com>
To: gregkh@suse.de
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
o.hartmann@telovital.com, Mark Einon <mark.einon@gmail.com>
Subject: [PATCH 10/12] staging: et131x: Remove struct mi_regs from et1310_phy.h
Date: Sun, 4 Sep 2011 11:24:41 +0100 [thread overview]
Message-ID: <1315131883-11068-11-git-send-email-mark.einon@gmail.com> (raw)
In-Reply-To: <1315131883-11068-1-git-send-email-mark.einon@gmail.com>
This structure is no longer used, and references registers defined in mii.h and other parts of et1310_phy.h
Signed-off-by: Mark Einon <mark.einon@gmail.com>
---
drivers/staging/et131x/et1310_phy.h | 34 +++++-----------------------------
1 files changed, 5 insertions(+), 29 deletions(-)
diff --git a/drivers/staging/et131x/et1310_phy.h b/drivers/staging/et131x/et1310_phy.h
index 104008e..82037ac 100644
--- a/drivers/staging/et131x/et1310_phy.h
+++ b/drivers/staging/et131x/et1310_phy.h
@@ -61,6 +61,11 @@
#include "et1310_address_map.h"
+/*
+ * Defines for generic MII registers 0x00 -> 0x0F can be found in
+ * include/linux/mii.h
+ */
+
/* some defines for modem registers that seem to be 'reserved' */
#define PHY_INDEX_REG 0x10
#define PHY_DATA_REG 0x11
@@ -80,35 +85,6 @@
/* TRU_VMI_LINK_CONTROL_REG 29 */
/* TRU_VMI_TIMING_CONTROL_REG */
-/* PHY Register Mapping(MI) Management Interface Regs */
-struct mi_regs {
- u8 bmcr; /* Basic mode control reg(Reg 0x00) */
- u8 bmsr; /* Basic mode status reg(Reg 0x01) */
- u8 idr1; /* Phy identifier reg 1(Reg 0x02) */
- u8 idr2; /* Phy identifier reg 2(Reg 0x03) */
- u8 anar; /* Auto-Negotiation advertisement(Reg 0x04) */
- u8 anlpar; /* Auto-Negotiation link Partner Ability(Reg 0x05) */
- u8 aner; /* Auto-Negotiation expansion reg(Reg 0x06) */
- u8 annptr; /* Auto-Negotiation next page transmit reg(Reg 0x07) */
- u8 lpnpr; /* link partner next page reg(Reg 0x08) */
- u8 gcr; /* Gigabit basic mode control reg(Reg 0x09) */
- u8 gsr; /* Gigabit basic mode status reg(Reg 0x0A) */
- u8 mi_res1[4]; /* Future use by MI working group(Reg 0x0B - 0x0E) */
- u8 esr; /* Extended status reg(Reg 0x0F) */
- u8 mi_res2[3]; /* Future use by MI working group(Reg 0x10 - 0x12) */
- u8 loop_ctl; /* Loopback Control Reg(Reg 0x13) */
- u8 mi_res3; /* Future use by MI working group(Reg 0x14) */
- u8 mcr; /* MI Control Reg(Reg 0x15) */
- u8 pcr; /* Configuration Reg(Reg 0x16) */
- u8 phy_ctl; /* PHY Control Reg(Reg 0x17) */
- u8 imr; /* Interrupt Mask Reg(Reg 0x18) */
- u8 isr; /* Interrupt Status Reg(Reg 0x19) */
- u8 psr; /* PHY Status Reg(Reg 0x1A) */
- u8 lcr1; /* LED Control 1 Reg(Reg 0x1B) */
- u8 lcr2; /* LED Control 2 Reg(Reg 0x1C) */
- u8 mi_res4[3]; /* Future use by MI working group(Reg 0x1D - 0x1F) */
-};
-
/* MI Register 10: Gigabit basic mode status reg(Reg 0x0A) */
#define ET_1000BT_MSTR_SLV 0x4000
--
1.7.6
next prev parent reply other threads:[~2011-09-04 10:28 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-04 10:24 [PATCH 00/12] staging: et131x: Following mvoe to use phydev, remove detritus Mark Einon
2011-09-04 10:24 ` [PATCH 01/12] staging: et131x: Remove private adapter->linkspeed and use phydev->speed instead Mark Einon
2011-09-04 10:24 ` [PATCH 02/12] staging: et131x: Remove private adapter->duplex_mode and use phydev->duplex instead Mark Einon
2011-09-04 10:24 ` [PATCH 03/12] staging: et131x: Remove redundant struct adapter members Mark Einon
2011-09-04 10:24 ` [PATCH 04/12] staging: et131x: Remove PHY interrupt handling code from driver isr handler Mark Einon
2011-09-04 10:24 ` [PATCH 05/12] staging: et131x: remove calls to netif_carrier_[on|off] from et131x_mii_check Mark Einon
2011-09-04 10:24 ` [PATCH 06/12] staging: et131x: Remove registry_rx_mem_end from struct et131x_adapter Mark Einon
2011-09-04 10:24 ` [PATCH 07/12] staging: et131x: Remove cached_mask_value from et131x_adapter Mark Einon
2011-09-04 10:24 ` [PATCH 08/12] staging: et131x: Remove duplicated register defines from et1310_phy.h Mark Einon
2011-09-04 10:24 ` [PATCH 09/12] staging: et131x: Replace magic numbers in et1310_phy.c with defines Mark Einon
2011-09-04 10:24 ` Mark Einon [this message]
2011-09-04 10:24 ` [PATCH 11/12] staging: et131x: Remove ai_force_[duplex|speed] from et131x_adapter Mark Einon
2011-09-04 10:24 ` [PATCH 12/12] staging: et131x: Update README file Mark Einon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1315131883-11068-11-git-send-email-mark.einon@gmail.com \
--to=mark.einon@gmail.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=o.hartmann@telovital.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox