[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-282-gfa36feb
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] armadeus branch, master, updated. release-3.2-282-gfa36feb
|
From: Fabien M <fa...@us...> - 2010-04-09 16:57:25
|
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 fa36febaac9894dd49fe3ff7fc6425a6b8378489 (commit)
from b8bbe5906f1048f5e3ffe1be48f836194dce94e3 (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 fa36febaac9894dd49fe3ff7fc6425a6b8378489
Author: Fabien Marteau <fab...@ar...>
Date: Fri Apr 9 18:57:04 2010 +0200
[linux] Fix smsc95xx led output
-----------------------------------------------------------------------
Summary of changes:
.../346-smsc-lan95xx-activates_led_outputs.patch | 43 +++++++++++++-------
1 files changed, 28 insertions(+), 15 deletions(-)
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
index f7aa8c0..e2e5eca 100644
--- 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
@@ -17,17 +17,19 @@ Signed-off-by: David S. Miller <da...@da...>
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)
+Index: linux-2.6.29.6/drivers/net/usb/smsc95xx.c
+===================================================================
+--- linux-2.6.29.6.orig/drivers/net/usb/smsc95xx.c 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.6/drivers/net/usb/smsc95xx.c 2010-04-09 18:53:56.000000000 +0200
+@@ -945,6 +945,18 @@
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;
++ write_buf = LED_GPIO_CFG_SPD_LED | LED_GPIO_CFG_SPD_POL |
++ LED_GPIO_CFG_LNK_LED | LED_GPIO_CFG_LNK_POL |
++ LED_GPIO_CFG_FDX_LED | LED_GPIO_CFG_FDX_POL |
++ LED_GPIO_CFG_LED_SEL;
+ ret = smsc95xx_write_reg(dev, LED_GPIO_CFG, write_buf);
+ if (ret < 0) {
+ devwarn(dev, "Failed to write LED_GPIO_CFG register, ret=%d",
@@ -38,20 +40,31 @@ index dc16653..0fd68a5 100644
/* 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 @@
+@@ -1221,7 +1233,7 @@
+ static const struct usb_device_id products[] = {
+ {
+ /* SMSC9500 USB Ethernet Device */
+- USB_DEVICE(0x0424, 0x9500),
++ USB_DEVICE(0x0424, 0x9e00),
+ .driver_info = (unsigned long) &smsc95xx_info,
+ },
+ { }, /* END */
+Index: linux-2.6.29.6/drivers/net/usb/smsc95xx.h
+===================================================================
+--- linux-2.6.29.6.orig/drivers/net/usb/smsc95xx.h 2009-03-24 00:12:14.000000000 +0100
++++ linux-2.6.29.6/drivers/net/usb/smsc95xx.h 2010-04-09 18:55:34.000000000 +0200
+@@ -99,6 +99,14 @@
#define PM_CTL_WUPS_MULTI_ (0x00000003)
#define LED_GPIO_CFG (0x24)
++#define LED_GPIO_CFG_LED_SEL (0x80000000)
+#define LED_GPIO_CFG_SPD_LED (0x01000000)
+#define LED_GPIO_CFG_LNK_LED (0x00100000)
+#define LED_GPIO_CFG_FDX_LED (0x00010000)
++
++#define LED_GPIO_CFG_SPD_POL (0x00000004)
++#define LED_GPIO_CFG_LNK_POL (0x00000002)
++#define LED_GPIO_CFG_FDX_POL (0x00000001)
#define GPIO_CFG (0x28)
---
-1.6.6
-
hooks/post-receive
--
armadeus
|
