diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-13 08:42:26 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-13 08:42:26 -0700 |
| commit | 8c4753ce7abb2f0cc0b93f857bff31269113c485 (patch) | |
| tree | 11cbf693513b01d80d3aaa112ef2451c6532ae28 | |
| parent | abc4f1945f19413b0f2de035fe1385705f9f162e (diff) | |
| download | patches-8c4753ce7abb2f0cc0b93f857bff31269113c485.tar.gz | |
add irq support to serial patch
| -rw-r--r-- | serial-8250_pci-add-support-for-fintek-4-8-and-12-port-cards.patch | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/serial-8250_pci-add-support-for-fintek-4-8-and-12-port-cards.patch b/serial-8250_pci-add-support-for-fintek-4-8-and-12-port-cards.patch index d9294181e51dd3..5a6af5a81432b5 100644 --- a/serial-8250_pci-add-support-for-fintek-4-8-and-12-port-cards.patch +++ b/serial-8250_pci-add-support-for-fintek-4-8-and-12-port-cards.patch @@ -16,8 +16,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- - drivers/tty/serial/8250/8250_pci.c | 128 +++++++++++++++++++++++++++++++++++-- - 1 file changed, 122 insertions(+), 6 deletions(-) + drivers/tty/serial/8250/8250_pci.c | 131 +++++++++++++++++++++++++++++++++++-- + 1 file changed, 125 insertions(+), 6 deletions(-) --- a/drivers/tty/serial/8250/8250_pci.c +++ b/drivers/tty/serial/8250/8250_pci.c @@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> /* * init function returns: -@@ -1344,6 +1344,74 @@ pci_brcm_trumanage_setup(struct serial_p +@@ -1344,6 +1344,77 @@ pci_brcm_trumanage_setup(struct serial_p return ret; } @@ -95,6 +95,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + /* MSB UART */ + pci_write_config_byte(pdev, config_base + 0x05, (u8)((iobase & 0xff00) >> 8)); + ++ /* irq number */ ++ pci_write_config_byte(pdev, config_base + 0x06, pdev->irq); ++ + dev_dbg(&priv->dev->dev, "%s: iobase=%lx ciobase=%lx\n", __func__, iobase, ciobase); + + port->port.iotype = UPIO_PORT; @@ -112,7 +115,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> static int skip_tx_en_setup(struct serial_private *priv, const struct pciserial_board *board, struct uart_8250_port *port, int idx) -@@ -2255,6 +2323,27 @@ static struct pci_serial_quirk pci_seria +@@ -2255,6 +2326,27 @@ static struct pci_serial_quirk pci_seria .subdevice = PCI_ANY_ID, .setup = pci_brcm_trumanage_setup, }, @@ -140,7 +143,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> /* * Default "match everything" terminator entry -@@ -2452,6 +2541,9 @@ enum pci_board_num_t { +@@ -2452,6 +2544,9 @@ enum pci_board_num_t { pbn_omegapci, pbn_NETMOS9900_2s_115200, pbn_brcm_trumanage, @@ -150,7 +153,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> }; /* -@@ -3202,6 +3294,24 @@ static struct pciserial_board pci_boards +@@ -3202,6 +3297,24 @@ static struct pciserial_board pci_boards .reg_shift = 2, .base_baud = 115200, }, @@ -175,7 +178,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> }; static const struct pci_device_id blacklist[] = { -@@ -3362,14 +3472,15 @@ pciserial_init_ports(struct pci_dev *dev +@@ -3362,14 +3475,15 @@ pciserial_init_ports(struct pci_dev *dev if (quirk->setup(priv, board, &uart, i)) break; @@ -196,7 +199,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> break; } } -@@ -4918,6 +5029,11 @@ static struct pci_device_id serial_pci_t +@@ -4918,6 +5032,11 @@ static struct pci_device_id serial_pci_t 0, 0, pbn_exar_XR17V358 }, |