[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-76-ga52acec
Brought to you by:
sszy
|
From: Julien B a. A. <ar...@us...> - 2009-12-28 14:14:37
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via a52acec7ba7be66ac964a57ce64bd1d6c034e17a (commit)
from 5805ae8adbbbc3feba1e4d4e47d63026fd53f7d6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit a52acec7ba7be66ac964a57ce64bd1d6c034e17a
Author: Julien Boibessot <jul...@ar...>
Date: Mon Dec 28 14:09:26 2009 +0100
[LINUX] Backport some 2.6.3x convenient patches for LAN95xx
-----------------------------------------------------------------------
Summary of changes:
.../346-smsc-lan95xx-activates_led_outputs.patch | 57 ++++++++++++++++++++
...-smsc-lan95xx-removes_eeprom_loaded_check.patch | 37 +++++++++++++
2 files changed, 94 insertions(+), 0 deletions(-)
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/346-smsc-lan95xx-activates_led_outputs.patch
create mode 100644 buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/347-smsc-lan95xx-removes_eeprom_loaded_check.patch
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/346-smsc-lan95xx-activates_led_outputs.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/346-smsc-lan95xx-activates_led_outputs.patch
new file mode 100644
index 0000000..f7aa8c0
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/346-smsc-lan95xx-activates_led_outputs.patch
@@ -0,0 +1,57 @@
+From f293501c61c50b014ad2347661c6acd951c80fed Mon Sep 17 00:00:00 2001
+From: Steve Glendinning <ste...@sm...>
+Date: Fri, 1 May 2009 05:46:51 +0000
+Subject: [PATCH] smsc95xx: configure LED outputs
+
+SMSC LAN9500 has dual purpose GPIO/LED pins, and by default at power-on
+these are configured as GPIOs. This means that if LEDs are fitted they
+won't ever light.
+
+This patch sets them to be LED outputs for speed, duplex and
+link/activity.
+
+Signed-off-by: Steve Glendinning <ste...@sm...>
+Signed-off-by: David S. Miller <da...@da...>
+---
+ drivers/net/usb/smsc95xx.c | 10 ++++++++++
+ drivers/net/usb/smsc95xx.h | 3 +++
+ 2 files changed, 13 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
+index dc16653..0fd68a5 100644
+--- a/drivers/net/usb/smsc95xx.c
++++ b/drivers/net/usb/smsc95xx.c
+@@ -941,6 +941,16 @@ static int smsc95xx_reset(struct usbnet *dev)
+ if (netif_msg_ifup(dev))
+ devdbg(dev, "ID_REV = 0x%08x", read_buf);
+
++ /* Configure GPIO pins as LED outputs */
++ write_buf = LED_GPIO_CFG_SPD_LED | LED_GPIO_CFG_LNK_LED |
++ LED_GPIO_CFG_FDX_LED;
++ ret = smsc95xx_write_reg(dev, LED_GPIO_CFG, write_buf);
++ if (ret < 0) {
++ devwarn(dev, "Failed to write LED_GPIO_CFG register, ret=%d",
++ ret);
++ return ret;
++ }
++
+ /* Init Tx */
+ write_buf = 0;
+ ret = smsc95xx_write_reg(dev, FLOW, write_buf);
+diff --git a/drivers/net/usb/smsc95xx.h b/drivers/net/usb/smsc95xx.h
+index 66b5c84..86bc449 100644
+--- a/drivers/net/usb/smsc95xx.h
++++ b/drivers/net/usb/smsc95xx.h
+@@ -99,6 +99,9 @@
+ #define PM_CTL_WUPS_MULTI_ (0x00000003)
+
+ #define LED_GPIO_CFG (0x24)
++#define LED_GPIO_CFG_SPD_LED (0x01000000)
++#define LED_GPIO_CFG_LNK_LED (0x00100000)
++#define LED_GPIO_CFG_FDX_LED (0x00010000)
+
+ #define GPIO_CFG (0x28)
+
+--
+1.6.6
+
diff --git a/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/347-smsc-lan95xx-removes_eeprom_loaded_check.patch b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/347-smsc-lan95xx-removes_eeprom_loaded_check.patch
new file mode 100644
index 0000000..33bf36d
--- /dev/null
+++ b/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/347-smsc-lan95xx-removes_eeprom_loaded_check.patch
@@ -0,0 +1,37 @@
+From bcd218be5aebed94951a750b1d477aea86fb68ea Mon Sep 17 00:00:00 2001
+From: Steve Glendinning <ste...@sm...>
+Date: Tue, 28 Jul 2009 02:37:58 +0000
+Subject: [PATCH] smsc95xx: remove EEPROM loaded check
+
+The eeprom read & write commands currently check the E2P_CMD_LOADED_ bit is
+set before allowing any operations. This prevents any reading or writing
+unless a correctly programmed EEPROM is installed.
+
+This patch removes the check, so it is possible to program blank EEPROMS
+via ethtool.
+
+Signed-off-by: Steve Glendinning <ste...@sm...>
+Signed-off-by: David S. Miller <da...@da...>
+---
+ drivers/net/usb/smsc95xx.c | 5 -----
+ 1 files changed, 0 insertions(+), 5 deletions(-)
+
+diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
+index fe04589..09bd635 100644
+--- a/drivers/net/usb/smsc95xx.c
++++ b/drivers/net/usb/smsc95xx.c
+@@ -220,11 +220,6 @@ static int smsc95xx_eeprom_confirm_not_busy(struct usbnet *dev)
+ do {
+ smsc95xx_read_reg(dev, E2P_CMD, &val);
+
+- if (!(val & E2P_CMD_LOADED_)) {
+- devwarn(dev, "No EEPROM present");
+- return -EIO;
+- }
+-
+ if (!(val & E2P_CMD_BUSY_))
+ return 0;
+
+--
+1.6.6
+
hooks/post-receive
--
armadeus
|