diff options
| author | Michael Buesch <mb@bu3sch.de> | 2008-04-08 10:31:22 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-04-16 14:53:22 -0400 |
| commit | 51e8b885902fc8cc2ded48322ad9402bbcff23fe (patch) | |
| tree | bf4acc8b3718a9b76a560915054d52629314c643 | |
| parent | 50c4afb99166dc0d2e8a0b063fe83befaa426a44 (diff) | |
| download | op-kernel-dev-51e8b885902fc8cc2ded48322ad9402bbcff23fe.zip op-kernel-dev-51e8b885902fc8cc2ded48322ad9402bbcff23fe.tar.gz | |
ssb-pcicore: Remove b44 TPS flag workaround
Now that we fixed the TPS flag assignment in commit
b63009b456c8d9abe684bdf8d4bd8f27eb040019
we don't need the workaround for the bcm44xx chip anymore.
Signed-off-by: Michael Buesch <mb@bu3sch.de>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | drivers/ssb/driver_pcicore.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/drivers/ssb/driver_pcicore.c b/drivers/ssb/driver_pcicore.c index 2cc668a..75def13 100644 --- a/drivers/ssb/driver_pcicore.c +++ b/drivers/ssb/driver_pcicore.c @@ -562,15 +562,9 @@ int ssb_pcicore_dev_irqvecs_enable(struct ssb_pcicore *pc, u32 intvec; intvec = ssb_read32(pdev, SSB_INTVEC); - if ((bus->chip_id & 0xFF00) == 0x4400) { - /* Workaround: On the BCM44XX the BPFLAG routing - * bit is wrong. Use a hardcoded constant. */ - intvec |= 0x00000002; - } else { - tmp = ssb_read32(dev, SSB_TPSFLAG); - tmp &= SSB_TPSFLAG_BPFLAG; - intvec |= (1 << tmp); - } + tmp = ssb_read32(dev, SSB_TPSFLAG); + tmp &= SSB_TPSFLAG_BPFLAG; + intvec |= (1 << tmp); ssb_write32(pdev, SSB_INTVEC, intvec); } |
