diff options
Diffstat (limited to 'target/linux/brcm47xx/patches-3.2/700-ssb-gigabit-ethernet-driver.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-3.2/700-ssb-gigabit-ethernet-driver.patch | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/target/linux/brcm47xx/patches-3.2/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-3.2/700-ssb-gigabit-ethernet-driver.patch index 2cc9f60b80..d07511ceae 100644 --- a/target/linux/brcm47xx/patches-3.2/700-ssb-gigabit-ethernet-driver.patch +++ b/target/linux/brcm47xx/patches-3.2/700-ssb-gigabit-ethernet-driver.patch @@ -80,7 +80,7 @@ static int tg3_phy_cl45_write(struct tg3 *tp, u32 devad, u32 addr, u32 val) { int err; -@@ -2963,6 +2975,9 @@ static int tg3_nvram_read(struct tg3 *tp +@@ -2965,6 +2977,9 @@ static int tg3_nvram_read(struct tg3 *tp { int ret; @@ -90,7 +90,7 @@ if (!tg3_flag(tp, NVRAM)) return tg3_nvram_read_using_eeprom(tp, offset, val); -@@ -3045,9 +3060,12 @@ static int tg3_halt_cpu(struct tg3 *tp, +@@ -3047,9 +3062,12 @@ static int tg3_halt_cpu(struct tg3 *tp, return -ENODEV; } @@ -106,7 +106,7 @@ return 0; } -@@ -3166,6 +3184,11 @@ static int tg3_load_tso_firmware(struct +@@ -3168,6 +3186,11 @@ static int tg3_load_tso_firmware(struct unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size; int err, i; @@ -118,7 +118,7 @@ if (tg3_flag(tp, HW_TSO_1) || tg3_flag(tp, HW_TSO_2) || tg3_flag(tp, HW_TSO_3)) -@@ -3512,8 +3535,10 @@ static int tg3_power_down_prepare(struct +@@ -3514,8 +3537,10 @@ static int tg3_power_down_prepare(struct tg3_frob_aux_power(tp, true); /* Workaround for unstable PLL clock */ @@ -131,7 +131,7 @@ u32 val = tr32(0x7d00); val &= ~((1 << 16) | (1 << 4) | (1 << 2) | (1 << 1) | 1); -@@ -4041,6 +4066,14 @@ relink: +@@ -4043,6 +4068,14 @@ relink: if (current_link_up == 0 || (tp->phy_flags & TG3_PHYFLG_IS_LOW_POWER)) { tg3_phy_copper_begin(tp); @@ -146,7 +146,7 @@ tg3_readphy(tp, MII_BMSR, &bmsr); if ((!tg3_readphy(tp, MII_BMSR, &bmsr) && (bmsr & BMSR_LSTATUS)) || (tp->mac_mode & MAC_MODE_PORT_INT_LPBACK)) -@@ -7747,6 +7780,11 @@ static int tg3_chip_reset(struct tg3 *tp +@@ -7749,6 +7782,11 @@ static int tg3_chip_reset(struct tg3 *tp } } @@ -158,7 +158,7 @@ if (GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_5906) { tw32(VCPU_STATUS, tr32(VCPU_STATUS) | VCPU_STATUS_DRV_RESET); tw32(GRC_VCPU_EXT_CTRL, -@@ -7845,6 +7883,14 @@ static int tg3_chip_reset(struct tg3 *tp +@@ -7847,6 +7885,14 @@ static int tg3_chip_reset(struct tg3 *tp tw32(0x5000, 0x400); } @@ -173,7 +173,7 @@ tw32(GRC_MODE, tp->grc_mode); if (tp->pci_chip_rev_id == CHIPREV_ID_5705_A0) { -@@ -9220,6 +9266,11 @@ static void tg3_timer(unsigned long __op +@@ -9222,6 +9268,11 @@ static void tg3_timer(unsigned long __op GET_ASIC_REV(tp->pci_chip_rev_id) == ASIC_REV_57765) tg3_chk_missed_msi(tp); @@ -185,7 +185,7 @@ if (!tg3_flag(tp, TAGGED_STATUS)) { /* All of this garbage is because when using non-tagged * IRQ status the mailbox/status_block protocol the chip -@@ -9509,6 +9560,11 @@ static int tg3_request_firmware(struct t +@@ -9511,6 +9562,11 @@ static int tg3_request_firmware(struct t return -ENOENT; } @@ -197,7 +197,7 @@ fw_data = (void *)tp->fw->data; /* Firmware blob starts with version numbers, followed by -@@ -10867,6 +10923,11 @@ static int tg3_test_nvram(struct tg3 *tp +@@ -10869,6 +10925,11 @@ static int tg3_test_nvram(struct tg3 *tp if (tg3_flag(tp, NO_NVRAM)) return 0; @@ -209,7 +209,7 @@ if (tg3_nvram_read(tp, 0, &magic) != 0) return -EIO; -@@ -11827,7 +11888,7 @@ static int tg3_ioctl(struct net_device * +@@ -11829,7 +11890,7 @@ static int tg3_ioctl(struct net_device * return -EAGAIN; spin_lock_bh(&tp->lock); @@ -218,7 +218,7 @@ spin_unlock_bh(&tp->lock); data->val_out = mii_regval; -@@ -11843,7 +11904,7 @@ static int tg3_ioctl(struct net_device * +@@ -11845,7 +11906,7 @@ static int tg3_ioctl(struct net_device * return -EAGAIN; spin_lock_bh(&tp->lock); @@ -227,7 +227,7 @@ spin_unlock_bh(&tp->lock); return err; -@@ -12573,6 +12634,13 @@ static void __devinit tg3_get_5720_nvram +@@ -12575,6 +12636,13 @@ static void __devinit tg3_get_5720_nvram /* Chips other than 5700/5701 use the NVRAM for fetching info. */ static void __devinit tg3_nvram_init(struct tg3 *tp) { @@ -241,7 +241,7 @@ tw32_f(GRC_EEPROM_ADDR, (EEPROM_ADDR_FSM_RESET | (EEPROM_DEFAULT_CLOCK_PERIOD << -@@ -12839,6 +12907,9 @@ static int tg3_nvram_write_block(struct +@@ -12841,6 +12909,9 @@ static int tg3_nvram_write_block(struct { int ret; @@ -251,7 +251,7 @@ if (tg3_flag(tp, EEPROM_WRITE_PROT)) { tw32_f(GRC_LOCAL_CTRL, tp->grc_local_ctrl & ~GRC_LCLCTRL_GPIO_OUTPUT1); -@@ -14263,6 +14334,11 @@ static int __devinit tg3_get_invariants( +@@ -14265,6 +14336,11 @@ static int __devinit tg3_get_invariants( } } @@ -263,7 +263,7 @@ /* Get eeprom hw config before calling tg3_set_power_state(). * In particular, the TG3_FLAG_IS_NIC flag must be * determined before calling tg3_set_power_state() so that -@@ -14673,6 +14749,8 @@ static int __devinit tg3_get_device_addr +@@ -14675,6 +14751,8 @@ static int __devinit tg3_get_device_addr } if (!is_valid_ether_addr(&dev->dev_addr[0])) { @@ -272,7 +272,7 @@ #ifdef CONFIG_SPARC if (!tg3_get_default_macaddr_sparc(tp)) return 0; -@@ -15171,6 +15249,7 @@ static char * __devinit tg3_phy_string(s +@@ -15173,6 +15251,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"; @@ -280,7 +280,7 @@ case TG3_PHY_ID_BCM5752: return "5752"; case TG3_PHY_ID_BCM5714: return "5714"; case TG3_PHY_ID_BCM5780: return "5780"; -@@ -15366,6 +15445,13 @@ static int __devinit tg3_init_one(struct +@@ -15368,6 +15447,13 @@ static int __devinit tg3_init_one(struct tp->msg_enable = tg3_debug; else tp->msg_enable = TG3_DEF_MSG_ENABLE; |