diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-29 22:27:26 -0500 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2009-01-29 22:27:26 -0500 |
commit | eab50f73ca51384d8f17886edc7bbc9969b91c0e (patch) | |
tree | ec424f815c17ee887e2bdf2a64ce0db18ee22cd8 /drivers/atm/solos-pci.c | |
parent | cd5549e0f4b5129cdb7b02fbb6a559f78eda7f4c (diff) |
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/solos-pci.c')
-rw-r--r-- | drivers/atm/solos-pci.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/atm/solos-pci.c b/drivers/atm/solos-pci.c index df016825519d..7c26bd2ac113 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) | |||
1090 | iowrite32(0, card->config_regs + FPGA_MODE); | 1090 | iowrite32(0, card->config_regs + FPGA_MODE); |
1091 | data32 = ioread32(card->config_regs + FPGA_MODE); | 1091 | data32 = ioread32(card->config_regs + FPGA_MODE); |
1092 | } | 1092 | } |
1093 | //Set RX empty flags | ||
1094 | iowrite32(0xF0, card->config_regs + FLAGS_ADDR); | ||
1095 | 1093 | ||
1096 | data32 = ioread32(card->config_regs + FPGA_VER); | 1094 | data32 = ioread32(card->config_regs + FPGA_VER); |
1097 | fpga_ver = (data32 & 0x0000FFFF); | 1095 | fpga_ver = (data32 & 0x0000FFFF); |
@@ -1102,6 +1100,10 @@ static int fpga_probe(struct pci_dev *dev, const struct pci_device_id *id) | |||
1102 | 1100 | ||
1103 | if (fpga_ver > 27) | 1101 | if (fpga_ver > 27) |
1104 | card->using_dma = 1; | 1102 | card->using_dma = 1; |
1103 | else { | ||
1104 | /* Set RX empty flag for all ports */ | ||
1105 | iowrite32(0xF0, card->config_regs + FLAGS_ADDR); | ||
1106 | } | ||
1105 | 1107 | ||
1106 | card->nr_ports = 2; /* FIXME: Detect daughterboard */ | 1108 | card->nr_ports = 2; /* FIXME: Detect daughterboard */ |
1107 | 1109 | ||