Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit b87e5e2b8ed9336566100c8c796ab6dd52436881

Authored by Lennert Buytenhek
Committed by Linus Torvalds
1 parent 80647b959f
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

serial: add support for the Lava Quattro PCI quad-port 16550A card 

This seems to be a different model (with a different PCI ID) than the
"Quatro" card that is also in the list.

Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 8 additions and 0 deletions Side-by-side Diff

drivers/serial/8250_pci.c
Diff comments   View file @ b87e5e2
... ... @@ -3139,6 +3139,12 @@
3139 3139 { PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_QUATRO_B,
3140 3140 PCI_ANY_ID, PCI_ANY_ID, 0, 0,
3141 3141 pbn_b0_bt_2_115200 },
  3142 + { PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_QUATTRO_A,
  3143 + PCI_ANY_ID, PCI_ANY_ID, 0, 0,
  3144 + pbn_b0_bt_2_115200 },
  3145 + { PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_QUATTRO_B,
  3146 + PCI_ANY_ID, PCI_ANY_ID, 0, 0,
  3147 + pbn_b0_bt_2_115200 },
3142 3148 { PCI_VENDOR_ID_LAVA, PCI_DEVICE_ID_LAVA_OCTO_A,
3143 3149 PCI_ANY_ID, PCI_ANY_ID, 0, 0,
3144 3150 pbn_b0_bt_4_460800 },
include/linux/pci_ids.h
Diff comments   View file @ b87e5e2
... ... @@ -1956,6 +1956,8 @@
1956 1956 #define PCI_DEVICE_ID_LAVA_DSERIAL 0x0100 /* 2x 16550 */
1957 1957 #define PCI_DEVICE_ID_LAVA_QUATRO_A 0x0101 /* 2x 16550, half of 4 port */
1958 1958 #define PCI_DEVICE_ID_LAVA_QUATRO_B 0x0102 /* 2x 16550, half of 4 port */
  1959 +#define PCI_DEVICE_ID_LAVA_QUATTRO_A 0x0120 /* 2x 16550A, half of 4 port */
  1960 +#define PCI_DEVICE_ID_LAVA_QUATTRO_B 0x0121 /* 2x 16550A, half of 4 port */
1959 1961 #define PCI_DEVICE_ID_LAVA_OCTO_A 0x0180 /* 4x 16550A, half of 8 port */
1960 1962 #define PCI_DEVICE_ID_LAVA_OCTO_B 0x0181 /* 4x 16550A, half of 8 port */
1961 1963 #define PCI_DEVICE_ID_LAVA_PORT_PLUS 0x0200 /* 2x 16650 */