brcm47xx: refresh 2.6.33 kernel patches
SVN-Revision: 21265
This commit is contained in:
parent
81f5f10a62
commit
6a40947c31
6 changed files with 17 additions and 18 deletions
|
@ -41,19 +41,18 @@ Signed-off-by: Steve Brown <sbrown@cortland.com>
|
|||
- ssb_write32(dev, 0x400, tmp);
|
||||
- tmp = ssb_read32(dev, 0x400);
|
||||
- printk("USB20H fcr: 0x%0x\n", tmp);
|
||||
-
|
||||
+ /* Work around for 5354 failures */
|
||||
+ if ((dev->id.revision == 2) && (dev->bus->chip_id == 0x5354)) {
|
||||
+ /* Change syn01 reg */
|
||||
+ tmp = 0x00fe00fe;
|
||||
+ ssb_write32(dev, 0x894, tmp);
|
||||
|
||||
- /* Change Shim control reg */
|
||||
- tmp = ssb_read32(dev, 0x304);
|
||||
- tmp &= ~0x100;
|
||||
- ssb_write32(dev, 0x304, tmp);
|
||||
- tmp = ssb_read32(dev, 0x304);
|
||||
- printk("USB20H shim: 0x%0x\n", tmp);
|
||||
+ /* Work around for 5354 failures */
|
||||
+ if ((dev->id.revision == 2) && (dev->bus->chip_id == 0x5354)) {
|
||||
+ /* Change syn01 reg */
|
||||
+ tmp = 0x00fe00fe;
|
||||
+ ssb_write32(dev, 0x894, tmp);
|
||||
+
|
||||
+ /* Change syn03 reg */
|
||||
+ tmp = ssb_read32(dev, 0x89c);
|
||||
+ tmp |= 0x1;
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/net/b44.c
|
||||
+++ b/drivers/net/b44.c
|
||||
@@ -815,7 +815,7 @@ static int b44_rx(struct b44 *bp, int bu
|
||||
@@ -848,7 +848,7 @@ static int b44_rx(struct b44 *bp, int bu
|
||||
struct sk_buff *copy_skb;
|
||||
|
||||
b44_recycle_rx(bp, cons, bp->rx_prod);
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
--- a/drivers/ssb/main.c
|
||||
+++ b/drivers/ssb/main.c
|
||||
@@ -385,6 +385,34 @@ static int ssb_device_uevent(struct devi
|
||||
@@ -384,6 +384,34 @@ static int ssb_device_uevent(struct devi
|
||||
ssb_dev->id.revision);
|
||||
}
|
||||
|
||||
|
@ -35,7 +35,7 @@
|
|||
static struct bus_type ssb_bustype = {
|
||||
.name = "ssb",
|
||||
.match = ssb_bus_match,
|
||||
@@ -394,6 +422,7 @@ static struct bus_type ssb_bustype = {
|
||||
@@ -393,6 +421,7 @@ static struct bus_type ssb_bustype = {
|
||||
.suspend = ssb_device_suspend,
|
||||
.resume = ssb_device_resume,
|
||||
.uevent = ssb_device_uevent,
|
||||
|
|
Loading…
Reference in a new issue