target/linux/pxa/patches-3.3/004-smsc911x_verdex_pro_support.patch

   1 From 7645a459feb02f7aae4c3a5724b7800495d1b659 Mon Sep 17 00:00:00 2001
   2 From: Bobby Powers <bobbypowers@gmail.com>
   3 Date: Wed, 28 Oct 2009 22:41:31 -0400
   4 Subject: [PATCH] [ARM] smsc911x: Verdex Pro support
   5
   6 Basically Joseph Kortje's patch, cleaned up to apply to Linus's
   7 tree.  Some of the smsc911x.c had been applied already
   8
   9 Signed-off-by: Bobby Powers <bobbypowers@gmail.com>
  10 ---
  11  drivers/net/smsc911x.c   |   50 +++++++++++++++++++++++++++++++++++++--------
  12  drivers/net/smsc911x.h   |    2 +-
  13  include/linux/smsc911x.h |   11 ++++++++++
  14  3 files changed, 53 insertions(+), 10 deletions(-)
  15
  16 --- a/drivers/net/ethernet/smsc/smsc911x.c
  17 +++ b/drivers/net/ethernet/smsc/smsc911x.c
  18 @@ -1485,7 +1485,7 @@ static int smsc911x_open(struct net_devi
  19                 SMSC_WARN(pdata, ifup,
  20                           "Timed out waiting for EEPROM busy bit to clear");
  21
  22 -       smsc911x_reg_write(pdata, GPIO_CFG, 0x70070000);
  23 +       smsc911x_reg_write(pdata, GPIO_CFG, GPIO_CFG_LED1_EN_ | GPIO_CFG_LED2_EN_ | (1 << 20));
  24
  25         /* The soft reset above cleared the device's MAC address,
  26          * restore it from local copy (set in probe) */
  27 @@ -1497,8 +1497,8 @@ static int smsc911x_open(struct net_devi
  28         smsc911x_reg_write(pdata, INT_EN, 0);
  29         smsc911x_reg_write(pdata, INT_STS, 0xFFFFFFFF);
  30
  31 -       /* Set interrupt deassertion to 100uS */
  32 -       intcfg = ((10 << 24) | INT_CFG_IRQ_EN_);
  33 +       /* Set interrupt deassertion to 22*10uS */
  34 +       intcfg = ((22 << 24) | INT_CFG_IRQ_EN_);
  35
  36         if (pdata->config.irq_polarity) {
  37                 SMSC_TRACE(pdata, ifup, "irq polarity: active high");
  38 @@ -1524,7 +1524,7 @@ static int smsc911x_open(struct net_devi
  39         temp |= INT_EN_SW_INT_EN_;
  40         smsc911x_reg_write(pdata, INT_EN, temp);
  41
  42 -       timeout = 1000;
  43 +       timeout = 2000;
  44         while (timeout--) {
  45                 if (pdata->software_irq_signal)
  46                         break;
  47 @@ -2332,6 +2332,38 @@ static inline int smsc911x_probe_config_
  48  }
  49  #endif /* CONFIG_OF */
  50
  51 +static inline unsigned int is_gumstix_oui(u8 *addr)
  52 +{
  53 +       return (addr[0] == 0x00 && addr[1] == 0x15 && addr[2] == 0xC9);
  54 +}
  55 +
  56 +/**
  57 + * gen_serial_ether_addr - Generate software assigned Ethernet address
  58 + * based on the system_serial number
  59 + * @addr: Pointer to a six-byte array containing the Ethernet address
  60 + *
  61 + * Generate an Ethernet address (MAC) that is not multicast
  62 + * and has the local assigned bit set, keyed on the system_serial
  63 + */
  64 +static inline void gen_serial_ether_addr(u8 *addr)
  65 +{
  66 +       static u8 ether_serial_digit = 0;
  67 +       addr [0] = system_serial_high >> 8;
  68 +       addr [1] = system_serial_high;
  69 +       addr [2] = system_serial_low >> 24;
  70 +       addr [3] = system_serial_low >> 16;
  71 +       addr [4] = system_serial_low >> 8;
  72 +       addr [5] = (system_serial_low & 0xc0) | /* top bits are from system serial */
  73 +               (1 << 4) |                      /* 2 bits identify interface type 1=ether, 2=usb, 3&4 undef */
  74 +               ((ether_serial_digit++) & 0x0f);        /* 15 possible interfaces of each type */
  75 +
  76 +       if(!is_gumstix_oui(addr))
  77 +       {
  78 +               addr [0] &= 0xfe;               /* clear multicast bit */
  79 +               addr [0] |= 0x02;               /* set local assignment bit (IEEE802) */
  80 +       }
  81 +}
  82 +
  83  static int __devinit smsc911x_drv_probe(struct platform_device *pdev)
  84  {
  85         struct device_node *np = pdev->dev.of_node;
  86 @@ -2481,11 +2513,11 @@ static int __devinit smsc911x_drv_probe(
  87                         SMSC_TRACE(pdata, probe,
  88                                    "Mac Address is read from LAN911x EEPROM");
  89                 } else {
  90 -                       /* eeprom values are invalid, generate random MAC */
  91 -                       random_ether_addr(dev->dev_addr);
  92 +                       /* eeprom values are invalid, generate MAC from serial number */
  93 +                       gen_serial_ether_addr(dev->dev_addr);
  94                         smsc911x_set_hw_mac_address(pdata, dev->dev_addr);
  95                         SMSC_TRACE(pdata, probe,
  96 -                                  "MAC Address is set to random_ether_addr");
  97 +                               "MAC Address is derived from system serial number");
  98                 }
  99         }
 100