pxa: moved to targets feed

[openwrt/staging/chunkeey.git] / target / linux / pxa / patches-3.10 / 004-smsc911x_verdex_pro_support.patch

diff --git a/target/linux/pxa/patches-3.10/004-smsc911x_verdex_pro_support.patch b/target/linux/pxa/patches-3.10/004-smsc911x_verdex_pro_support.patch
deleted file mode 100644 (file)
index ace44df..0000000
--- a/target/linux/pxa/patches-3.10/004-smsc911x_verdex_pro_support.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 7645a459feb02f7aae4c3a5724b7800495d1b659 Mon Sep 17 00:00:00 2001
-From: Bobby Powers <bobbypowers@gmail.com>
-Date: Wed, 28 Oct 2009 22:41:31 -0400
-Subject: [PATCH] [ARM] smsc911x: Verdex Pro support
-
-Basically Joseph Kortje's patch, cleaned up to apply to Linus's
-tree.  Some of the smsc911x.c had been applied already
-
-Signed-off-by: Bobby Powers <bobbypowers@gmail.com>
----
- drivers/net/smsc911x.c   |   50 +++++++++++++++++++++++++++++++++++++--------
- drivers/net/smsc911x.h   |    2 +-
- include/linux/smsc911x.h |   11 ++++++++++
- 3 files changed, 53 insertions(+), 10 deletions(-)
-
---- a/drivers/net/ethernet/smsc/smsc911x.c
-+++ b/drivers/net/ethernet/smsc/smsc911x.c
-@@ -60,6 +60,7 @@
- #include <linux/of_device.h>
- #include <linux/of_gpio.h>
- #include <linux/of_net.h>
-+#include <asm/system_info.h>
- #include "smsc911x.h"
- 
- #define SMSC_CHIPNAME         "smsc911x"
-@@ -1514,7 +1515,7 @@ static int smsc911x_open(struct net_devi
-               SMSC_WARN(pdata, ifup,
-                         "Timed out waiting for EEPROM busy bit to clear");
- 
--      smsc911x_reg_write(pdata, GPIO_CFG, 0x70070000);
-+      smsc911x_reg_write(pdata, GPIO_CFG, GPIO_CFG_LED1_EN_ | GPIO_CFG_LED2_EN_ | (1 << 20));
- 
-       /* The soft reset above cleared the device's MAC address,
-        * restore it from local copy (set in probe) */
-@@ -1525,8 +1526,8 @@ static int smsc911x_open(struct net_devi
-       /* Initialise irqs, but leave all sources disabled */
-       smsc911x_disable_irq_chip(dev);
- 
--      /* Set interrupt deassertion to 100uS */
--      intcfg = ((10 << 24) | INT_CFG_IRQ_EN_);
-+      /* Set interrupt deassertion to 22*10uS */
-+      intcfg = ((22 << 24) | INT_CFG_IRQ_EN_);
- 
-       if (pdata->config.irq_polarity) {
-               SMSC_TRACE(pdata, ifup, "irq polarity: active high");
-@@ -1552,7 +1553,7 @@ static int smsc911x_open(struct net_devi
-       temp |= INT_EN_SW_INT_EN_;
-       smsc911x_reg_write(pdata, INT_EN, temp);
- 
--      timeout = 1000;
-+      timeout = 2000;
-       while (timeout--) {
-               if (pdata->software_irq_signal)
-                       break;
-@@ -2370,6 +2371,38 @@ static inline int smsc911x_probe_config_
- }
- #endif /* CONFIG_OF */
- 
-+static inline unsigned int is_gumstix_oui(u8 *addr)
-+{
-+      return (addr[0] == 0x00 && addr[1] == 0x15 && addr[2] == 0xC9);
-+}
-+
-+/**
-+ * gen_serial_ether_addr - Generate software assigned Ethernet address
-+ * based on the system_serial number
-+ * @addr: Pointer to a six-byte array containing the Ethernet address
-+ *
-+ * Generate an Ethernet address (MAC) that is not multicast
-+ * and has the local assigned bit set, keyed on the system_serial
-+ */
-+static inline void gen_serial_ether_addr(u8 *addr)
-+{
-+      static u8 ether_serial_digit = 0;
-+      addr [0] = system_serial_high >> 8;
-+      addr [1] = system_serial_high;
-+      addr [2] = system_serial_low >> 24;
-+      addr [3] = system_serial_low >> 16;
-+      addr [4] = system_serial_low >> 8;
-+      addr [5] = (system_serial_low & 0xc0) | /* top bits are from system serial */
-+              (1 << 4) |                      /* 2 bits identify interface type 1=ether, 2=usb, 3&4 undef */
-+              ((ether_serial_digit++) & 0x0f);        /* 15 possible interfaces of each type */
-+
-+      if(!is_gumstix_oui(addr))
-+      {
-+              addr [0] &= 0xfe;               /* clear multicast bit */
-+              addr [0] |= 0x02;               /* set local assignment bit (IEEE802) */
-+      }
-+}
-+
- static int smsc911x_drv_probe(struct platform_device *pdev)
- {
-       struct device_node *np = pdev->dev.of_node;
-@@ -2516,11 +2549,11 @@ static int smsc911x_drv_probe(struct pla
-                       SMSC_TRACE(pdata, probe,
-                                  "Mac Address is read from LAN911x EEPROM");
-               } else {
--                      /* eeprom values are invalid, generate random MAC */
--                      eth_hw_addr_random(dev);
-+                      /* eeprom values are invalid, generate MAC from serial number */
-+                      gen_serial_ether_addr(dev->dev_addr);
-                       smsc911x_set_hw_mac_address(pdata, dev->dev_addr);
-                       SMSC_TRACE(pdata, probe,
--                                 "MAC Address is set to eth_random_addr");
-+                              "MAC Address is derived from system serial number");
-               }
-       }
-