From mboxrd@z Thu Jan 1 00:00:00 1970 From: Francois Romieu Subject: Re: [PATCH net-next 1/6] r8169: adjust some registers Date: Tue, 5 Jul 2011 20:53:47 +0200 Message-ID: <20110705185347.GA5105@electric-eye.fr.zoreil.com> References: <1309859095-32031-1-git-send-email-hayeswang@realtek.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org To: Hayes Wang Return-path: Content-Disposition: inline In-Reply-To: <1309859095-32031-1-git-send-email-hayeswang@realtek.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org Hayes Wang : > Define new registers and modify some existing ones. > > Signed-off-by: Hayes Wang > --- > drivers/net/r8169.c | 30 +++++++++++++++++++++++------- > 1 files changed, 23 insertions(+), 7 deletions(-) > > diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c > index fbd6838..701ab6b 100644 > --- a/drivers/net/r8169.c > +++ b/drivers/net/r8169.c > @@ -327,7 +327,7 @@ enum rtl8168_8101_registers { > #define EPHYAR_REG_SHIFT 16 > #define EPHYAR_DATA_MASK 0xffff > DLLPR = 0xd0, > -#define PM_SWITCH (1 << 6) > +#define PFM_EN (1 << 6) > DBG_REG = 0xd1, > #define FIX_NAK_1 (1 << 4) > #define FIX_NAK_2 (1 << 3) > @@ -335,6 +335,7 @@ enum rtl8168_8101_registers { > MCU = 0xd3, > #define EN_NDP (1 << 3) > #define EN_OOB_RESET (1 << 2) > +#define NOW_IS_OOB (1 << 7) ^^^ there should be a tab, not a space. Nit : 3, 2, 7 is a bit surprizing. 7, 3, 2 ? @@ -345,18 +346,31 @@ enum rtl8168_8101_registers { }; enum rtl8168_registers { + LED_FREQ = 0x1a, + EEE_LED = 0x1b, + + /* TxConfig */ +#define AUTO_FIFO (1 << 7) +#define TX_EMPTY (1 << 11) Eventually move these close to the existing TxConfig register as : +#define TXCFG_AUTO_FIFO (1 << 7) /* 8168e (?) */ +#define TXCFG_EMPTY (1 << 11) /* 8168e (?) */ -- Ueimor