brcm47xx: Fix boot problem with wgt634u.

[openwrt/svn-archive/archive.git] / target / linux / brcm47xx / patches-2.6.36 / 700-ssb-gigabit-ethernet-driver.patch

diff --git a/target/linux/brcm47xx/patches-2.6.36/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-2.6.36/700-ssb-gigabit-ethernet-driver.patch
index fc5454e9a2ddd7e7c729b79b015e008de3d053f0..db7e229e4abc1440c50fe9aa89f3cd955c0da4fb 100644 (file)
--- a/target/linux/brcm47xx/patches-2.6.36/700-ssb-gigabit-ethernet-driver.patch
+++ b/target/linux/brcm47xx/patches-2.6.36/700-ssb-gigabit-ethernet-driver.patch
@@ -8,7 +8,7 @@
  
  #include <net/checksum.h>
  #include <net/ip.h>
-@@ -494,8 +495,9 @@ static void _tw32_flush(struct tg3 *tp, 
+@@ -494,8 +495,9 @@ static void _tw32_flush(struct tg3 *tp,
  static inline void tw32_mailbox_flush(struct tg3 *tp, u32 off, u32 val)
  {
        tp->write32_mbox(tp, off, val);
@@ -61,7 +61,7 @@
  {
        u32 frame_val;
        unsigned int loops;
-@@ -889,7 +896,7 @@ static int tg3_writephy(struct tg3 *tp, 
+@@ -889,7 +896,7 @@ static int tg3_writephy(struct tg3 *tp,
                udelay(80);
        }
  
@@ -70,7 +70,7 @@
                      MI_COM_PHY_ADDR_MASK);
        frame_val |= ((reg << MI_COM_REG_ADDR_SHIFT) &
                      MI_COM_REG_ADDR_MASK);
-@@ -922,6 +929,11 @@ static int tg3_writephy(struct tg3 *tp, 
+@@ -922,6 +929,11 @@ static int tg3_writephy(struct tg3 *tp,
        return ret;
  }
  
@@ -147,7 +147,7 @@
        tw32(GRC_MODE, tp->grc_mode);
  
        if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0) {
-@@ -7202,9 +7240,12 @@ static int tg3_halt_cpu(struct tg3 *tp, 
+@@ -7202,9 +7240,12 @@ static int tg3_halt_cpu(struct tg3 *tp,
                return -ENODEV;
        }
  
@@ -175,7 +175,7 @@
        fw_data = (void *)tp->fw->data;
  
        /* Firmware blob starts with version numbers, followed by
-@@ -7325,6 +7371,11 @@ static int tg3_load_tso_firmware(struct 
+@@ -7325,6 +7371,11 @@ static int tg3_load_tso_firmware(struct
        unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size;
        int err, i;
  
@@ -199,7 +199,7 @@
        if (!(tp->tg3_flags & TG3_FLAG_TAGGED_STATUS)) {
                /* All of this garbage is because when using non-tagged
                 * IRQ status the mailbox/status_block protocol the chip
-@@ -10131,6 +10187,11 @@ static int tg3_test_nvram(struct tg3 *tp
+@@ -10133,6 +10189,11 @@ static int tg3_test_nvram(struct tg3 *tp
        if (tp->tg3_flags3 & TG3_FLG3_NO_NVRAM)
                return 0;
  
@@ -211,7 +211,7 @@
        if (tg3_nvram_read(tp, 0, &magic) != 0)
                return -EIO;
  
-@@ -10951,7 +11012,7 @@ static int tg3_ioctl(struct net_device *
+@@ -10953,7 +11014,7 @@ static int tg3_ioctl(struct net_device *
                        return -EAGAIN;
  
                spin_lock_bh(&tp->lock);
@@ -220,7 +220,7 @@
                spin_unlock_bh(&tp->lock);
  
                data->val_out = mii_regval;
-@@ -10967,7 +11028,7 @@ static int tg3_ioctl(struct net_device *
+@@ -10969,7 +11030,7 @@ static int tg3_ioctl(struct net_device *
                        return -EAGAIN;
  
                spin_lock_bh(&tp->lock);
@@ -229,7 +229,7 @@
                spin_unlock_bh(&tp->lock);
  
                return err;
-@@ -11612,6 +11673,12 @@ static void __devinit tg3_get_5717_nvram
+@@ -11614,6 +11675,12 @@ static void __devinit tg3_get_5717_nvram
  /* Chips other than 5700/5701 use the NVRAM for fetching info. */
  static void __devinit tg3_nvram_init(struct tg3 *tp)
  {
@@ -242,7 +242,7 @@
        tw32_f(GRC_EEPROM_ADDR,
             (EEPROM_ADDR_FSM_RESET |
              (EEPROM_DEFAULT_CLOCK_PERIOD <<
-@@ -11875,6 +11942,9 @@ static int tg3_nvram_write_block(struct 
+@@ -11877,6 +11944,9 @@ static int tg3_nvram_write_block(struct
  {
        int ret;
  
@@ -252,7 +252,7 @@
        if (tp->tg3_flags & TG3_FLAG_EEPROM_WRITE_PROT) {
                tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl &
                       ~GRC_LCLCTRL_GPIO_OUTPUT1);
-@@ -13267,6 +13337,11 @@ static int __devinit tg3_get_invariants(
+@@ -13269,6 +13339,11 @@ static int __devinit tg3_get_invariants(
              GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5701)))
                tp->tg3_flags |= TG3_FLAG_SRAM_USE_CONFIG;
  
@@ -264,7 +264,7 @@
        /* Get eeprom hw config before calling tg3_set_power_state().
         * In particular, the TG3_FLG2_IS_NIC flag must be
         * determined before calling tg3_set_power_state() so that
-@@ -13665,6 +13740,10 @@ static int __devinit tg3_get_device_addr
+@@ -13667,6 +13742,10 @@ static int __devinit tg3_get_device_addr
        }
  
        if (!is_valid_ether_addr(&dev->dev_addr[0])) {
@@ -275,7 +275,7 @@
  #ifdef CONFIG_SPARC
                if (!tg3_get_default_macaddr_sparc(tp))
                        return 0;
-@@ -14181,6 +14260,7 @@ static char * __devinit tg3_phy_string(s
+@@ -14183,6 +14262,7 @@ static char * __devinit tg3_phy_string(s
        case TG3_PHY_ID_BCM5704:        return "5704";
        case TG3_PHY_ID_BCM5705:        return "5705";
        case TG3_PHY_ID_BCM5750:        return "5750";
@@ -283,7 +283,7 @@
        case TG3_PHY_ID_BCM5752:        return "5752";
        case TG3_PHY_ID_BCM5714:        return "5714";
        case TG3_PHY_ID_BCM5780:        return "5780";
-@@ -14392,6 +14472,13 @@ static int __devinit tg3_init_one(struct
+@@ -14394,6 +14474,13 @@ static int __devinit tg3_init_one(struct
                tp->msg_enable = tg3_debug;
        else
                tp->msg_enable = TG3_DEF_MSG_ENABLE;