diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-01-26 20:30:32 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-01-26 20:30:32 +0000 |
| commit | a39071768edb08b8f5b3d919ab113b5c9df620ba (patch) | |
| tree | d01844c266d13273b6a3012461826d92bd6b04cf /target/linux/brcm47xx-2.6/patches/120-b44_ssb_support.patch | |
| parent | c1b874e44af89be269db385679bec0eaea7cda00 (diff) | |
| download | master-187ad058-a39071768edb08b8f5b3d919ab113b5c9df620ba.tar.gz master-187ad058-a39071768edb08b8f5b3d919ab113b5c9df620ba.tar.bz2 master-187ad058-a39071768edb08b8f5b3d919ab113b5c9df620ba.zip | |
merge another batch of code from michael buesch's wireless-dev tree, fix up extpci support and remove scache probe like on brcm-2.6 - tested on the wgt634u with madwifi
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6213 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx-2.6/patches/120-b44_ssb_support.patch')
| -rw-r--r-- | target/linux/brcm47xx-2.6/patches/120-b44_ssb_support.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm47xx-2.6/patches/120-b44_ssb_support.patch b/target/linux/brcm47xx-2.6/patches/120-b44_ssb_support.patch index 0e91f781e5..44b2c4297d 100644 --- a/target/linux/brcm47xx-2.6/patches/120-b44_ssb_support.patch +++ b/target/linux/brcm47xx-2.6/patches/120-b44_ssb_support.patch @@ -17,7 +17,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c #include <linux/delay.h> #include <linux/init.h> #include <linux/dma-mapping.h> -+#include <linux/ssb.h> ++#include <linux/ssb/ssb.h> #include <asm/uaccess.h> #include <asm/io.h> @@ -663,7 +663,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c - if (ssb_is_core_up(bp)) { + struct ssb_device *sdev = bp->sdev; + -+ if (ssb_core_is_enabled(bp->sdev)) { ++ if (ssb_device_is_enabled(bp->sdev)) { bw32(bp, B44_RCV_LAZY, 0); bw32(bp, B44_ENET_CTRL, ENET_CTRL_DISABLE); b44_wait_bit(bp, B44_ENET_CTRL, ENET_CTRL_DISABLE, 100, 1); @@ -679,7 +679,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c - ssb_core_reset(bp); - -+ ssb_core_enable(bp->sdev, 0); ++ ssb_device_enable(bp->sdev, 0); b44_clear_stats(bp); - /* Make PHY accessible. */ @@ -1096,7 +1096,7 @@ diff -urN linux.old/drivers/net/b44.c linux.dev/drivers/net/b44.c - err = b44_read_eeprom(bp, &eeprom[0]); - if (err) - goto out; -+ bp->dma_offset = ssb_dma_offset(sdev); ++ bp->dma_offset = ssb_dma_translation(sdev); - bp->dev->dev_addr[0] = eeprom[79]; - bp->dev->dev_addr[1] = eeprom[78]; |