summaryrefslogtreecommitdiff
path: root/drivers/atm
diff options
context:
space:
mode:
authorDavid Woodhouse <David.Woodhouse@intel.com>2009-01-30 14:27:26 +1100
committerDavid Woodhouse <David.Woodhouse@intel.com>2009-01-30 14:27:26 +1100
commiteab50f73ca51384d8f17886edc7bbc9969b91c0e (patch)
treeec424f815c17ee887e2bdf2a64ce0db18ee22cd8 /drivers/atm
parentcd5549e0f4b5129cdb7b02fbb6a559f78eda7f4c (diff)
downloadlinux-3.10-eab50f73ca51384d8f17886edc7bbc9969b91c0e.tar.gz
linux-3.10-eab50f73ca51384d8f17886edc7bbc9969b91c0e.tar.bz2
linux-3.10-eab50f73ca51384d8f17886edc7bbc9969b91c0e.zip
solos: Set RX empty flag at startup only for !dma mode
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'drivers/atm')
-rw-r--r--drivers/atm/solos-pci.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c
index df016825519..7c26bd2ac11 100644
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
@@ -1090,8 +1090,6 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
iowrite32(0, card->config_regs + FPGA_MODE);
data32 = ioread32(card->config_regs + FPGA_MODE);
}
- //Set RX empty flags
- iowrite32(0xF0, card->config_regs + FLAGS_ADDR);
data32 = ioread32(card->config_regs + FPGA_VER);
fpga_ver = (data32 & 0x0000FFFF);
@@ -1102,6 +1100,10 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id)
if (fpga_ver > 27)
card->using_dma = 1;
+ else {
+ /* Set RX empty flag for all ports */
+ iowrite32(0xF0, card->config_regs + FLAGS_ADDR);
+ }
card->nr_ports = 2; /* FIXME: Detect daughterboard */