From: Parker Newman <pnewman@xxxxxxxxxxxxxxx>
Add code for getting number of ports of CTI cards to exar_get_nr_ports()
Changes in v3:
- moved to separate patch
- added spaces to single line comments
Signed-off-by: Parker Newman <pnewman@xxxxxxxxxxxxxxx>
---
drivers/tty/serial/8250/8250_exar.c | 22 +++++++++++++++++++---
1 file changed, 19 insertions(+), 3 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c
index 7e47a4145c7b..ada01c6394a3 100644
--- a/drivers/tty/serial/8250/8250_exar.c
+++ b/drivers/tty/serial/8250/8250_exar.c
@@ -710,12 +710,28 @@ static unsigned int exar_get_nr_ports(struct exar8250_board *board,
{
unsigned int nr_ports = 0;
- if (pcidev->vendor == PCI_VENDOR_ID_ACCESSIO)
+ if (pcidev->vendor == PCI_VENDOR_ID_ACCESSIO) {
nr_ports = BIT(((pcidev->device & 0x38) >> 3) - 1);
- else if (board->num_ports)
+ } else if (board->num_ports > 0) {
+ // Check if board struct overrides number of ports
nr_ports = board->num_ports;
- else
+ } else if (pcidev->vendor == PCI_VENDOR_ID_EXAR) {
+ // Exar encodes # ports in last nibble of PCI Device ID ex. 0358
nr_ports = pcidev->device & 0x0f;
+ } else if (pcidev->vendor == PCI_VENDOR_ID_CONNECT_TECH) {
+ // Handle CTI FPGA cards
+ switch (pcidev->device) {
+ case PCI_DEVICE_ID_CONNECT_TECH_PCI_XR79X_12_XIG00X:
+ case PCI_DEVICE_ID_CONNECT_TECH_PCI_XR79X_12_XIG01X:
+ nr_ports = 12;
+ break;
+ case PCI_DEVICE_ID_CONNECT_TECH_PCI_XR79X_16:
+ nr_ports = 16;
+ break;
+ default:
+ break;
+ }
+ }
return nr_ports;
}
--
2.43.2
