diff options
| author | Hauke Mehrtens <hauke@openwrt.org> | 2010-11-07 13:44:48 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@openwrt.org> | 2010-11-07 13:44:48 +0000 |
| commit | b9454a94c5f4538653461123abcfc96739f17075 (patch) | |
| tree | f553162b2d3bf57d6510e0d9240878a220779acb /target/linux/brcm47xx/patches-2.6.35/700-ssb-gigabit-ethernet-driver.patch | |
| parent | b0efee87de06ce7ad7a2c4083bad2e8aa3123788 (diff) | |
| download | upstream-b9454a94c5f4538653461123abcfc96739f17075.tar.gz upstream-b9454a94c5f4538653461123abcfc96739f17075.tar.bz2 upstream-b9454a94c5f4538653461123abcfc96739f17075.zip | |
brcm47xx: Fix boot problem with wgt634u.
Readd the workarround from the old version again which was removed in r22296 and refresh the patches.
This should close #7874
Thank you Russell Senior for testing.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23911 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.35/700-ssb-gigabit-ethernet-driver.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.35/700-ssb-gigabit-ethernet-driver.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.35/700-ssb-gigabit-ethernet-driver.patch b/target/linux/brcm47xx/patches-2.6.35/700-ssb-gigabit-ethernet-driver.patch index 29b1a9da13..5621b73294 100644 --- a/target/linux/brcm47xx/patches-2.6.35/700-ssb-gigabit-ethernet-driver.patch +++ b/target/linux/brcm47xx/patches-2.6.35/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; -@@ -872,7 +879,7 @@ static int tg3_writephy(struct tg3 *tp, +@@ -872,7 +879,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); -@@ -905,6 +912,11 @@ static int tg3_writephy(struct tg3 *tp, +@@ -905,6 +912,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) { -@@ -7179,9 +7217,12 @@ static int tg3_halt_cpu(struct tg3 *tp, +@@ -7179,9 +7217,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 -@@ -7302,6 +7348,11 @@ static int tg3_load_tso_firmware(struct +@@ -7302,6 +7348,11 @@ static int tg3_load_tso_firmware(struct unsigned long cpu_base, cpu_scratch_base, cpu_scratch_size; int err, i; @@ -242,7 +242,7 @@ tw32_f(GRC_EEPROM_ADDR, (EEPROM_ADDR_FSM_RESET | (EEPROM_DEFAULT_CLOCK_PERIOD << -@@ -11855,6 +11922,9 @@ static int tg3_nvram_write_block(struct +@@ -11855,6 +11922,9 @@ static int tg3_nvram_write_block(struct { int ret; |