[kernel] r11363 - in dists/trunk/linux-2.6/debian/patches: features/all series

[Maximilian Attems]

Author: maks
Date: Sun May 11 22:04:15 2008
New Revision: 11363

Log:
net add atl1 PHY power save mode patch

2.6.27 target, but we'd want that for Lenny.


Added:
   dists/trunk/linux-2.6/debian/patches/features/all/drivers-net-atl1-PHY-power-save-mode.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/1~experimental.1

Added: dists/trunk/linux-2.6/debian/patches/features/all/drivers-net-atl1-PHY-power-save-mode.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/features/all/drivers-net-atl1-PHY-power-save-mode.patch	Sun May 11 22:04:15 2008
@@ -0,0 +1,75 @@
+From: Jay Cliburn <jacliburn at bellsouth.net>
+To: jeff at garzik.org
+Cc: netdev at vger.kernel.org, linux-kernel at vger.kernel.org,
+	csnook at redhat.com, pelle at dsv.su.se,
+	Jay Cliburn <jacliburn at bellsouth.net>
+Subject: [PATCH 1/4] atl1: add PHY power save mode
+Date:	Fri,  9 May 2008 22:12:06 -0500
+Message-Id: <1210389129-3868-2-git-send-email-jacliburn at bellsouth.net>
+X-Mailer: git-send-email 1.5.4.1
+In-Reply-To: <1210389129-3868-1-git-send-email-jacliburn at bellsouth.net>
+References: <1210389129-3868-1-git-send-email-jacliburn at bellsouth.net>
+Sender: netdev-owner at vger.kernel.org
+Precedence: bulk
+List-ID: <netdev.vger.kernel.org>
+X-Mailing-List:	netdev at vger.kernel.org
+
+Using vendor-provided magic, add code to enter power save mode
+on the PHY.  We'll need this for suspend and wake-on-lan.
+
+Signed-off-by: Jay Cliburn <jacliburn at bellsouth.net>
+---
+ drivers/net/atlx/atl1.c |   19 ++++++++-----------
+ drivers/net/atlx/atlx.h |    3 +++
+ 2 files changed, 11 insertions(+), 11 deletions(-)
+
+diff --git a/drivers/net/atlx/atl1.c b/drivers/net/atlx/atl1.c
+index 0afe522..3beb44e 100644
+--- a/drivers/net/atlx/atl1.c
++++ b/drivers/net/atlx/atl1.c
+@@ -638,21 +638,18 @@ static s32 atl1_phy_leave_power_saving(struct atl1_hw *hw)
+ }
+ 
+ /*
+- *TODO: do something or get rid of this
++ * Force the PHY into power saving mode using vendor magic.
+  */
+ #ifdef CONFIG_PM
+-static s32 atl1_phy_enter_power_saving(struct atl1_hw *hw)
++static void atl1_phy_enter_power_saving(struct atl1_hw *hw)
+ {
+-/*    s32 ret_val;
+- *    u16 phy_data;
+- */
++	atl1_write_phy_reg(hw, MII_DBG_ADDR, 0);
++	atl1_write_phy_reg(hw, MII_DBG_DATA, 0x124E);
++	atl1_write_phy_reg(hw, MII_DBG_ADDR, 2);
++	atl1_write_phy_reg(hw, MII_DBG_DATA, 0x3000);
++	atl1_write_phy_reg(hw, MII_DBG_ADDR, 3);
++	atl1_write_phy_reg(hw, MII_DBG_DATA, 0);
+ 
+-/*
+-    ret_val = atl1_write_phy_reg(hw, ...);
+-    ret_val = atl1_write_phy_reg(hw, ...);
+-    ....
+-*/
+-	return 0;
+ }
+ #endif
+ 
+diff --git a/drivers/net/atlx/atlx.h b/drivers/net/atlx/atlx.h
+index 3be7c09..9672188 100644
+--- a/drivers/net/atlx/atlx.h
++++ b/drivers/net/atlx/atlx.h
+@@ -460,6 +460,9 @@ MODULE_VERSION(ATLX_DRIVER_VERSION);
+ #define MII_ATLX_PSSR_100MBS		0x4000	/* 01=100Mbs */
+ #define MII_ATLX_PSSR_1000MBS		0x8000	/* 10=1000Mbs */
+ 
++#define MII_DBG_ADDR			0x1D
++#define MII_DBG_DATA			0x1E
++
+ /* PCI Command Register Bit Definitions */
+ #define PCI_REG_COMMAND			0x04	/* PCI Command Register */
+ #define CMD_IO_SPACE			0x0001
+-- 
+1.5.4.1

Modified: dists/trunk/linux-2.6/debian/patches/series/1~experimental.1
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/1~experimental.1	Sun May 11 22:04:15 2008
@@ -31,6 +31,7 @@
 + features/arm/cache-align2.patch
 + features/arm/speed_flush_cache.patch
 + features/arm/5281d0.patch
++ features/all/atl1-PHY-power-save-mode.patch
 + features/all/at76.patch 
 + bugfix/fix-hifn_795X-divdi3.patch
 + bugfix/all/mtd-prevent-physmap-from-causing-request_module-runaway-loop-modprobe-net-pf-1.patch