diff options
Diffstat (limited to 'drivers/serial/8250_pci.c')
-rw-r--r-- | drivers/serial/8250_pci.c | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/drivers/serial/8250_pci.c b/drivers/serial/8250_pci.c index 536d8e510f6..533f82025ad 100644 --- a/drivers/serial/8250_pci.c +++ b/drivers/serial/8250_pci.c | |||
@@ -798,6 +798,21 @@ pci_default_setup(struct serial_private *priv, | |||
798 | return setup_port(priv, port, bar, offset, board->reg_shift); | 798 | return setup_port(priv, port, bar, offset, board->reg_shift); |
799 | } | 799 | } |
800 | 800 | ||
801 | static int skip_tx_en_setup(struct serial_private *priv, | ||
802 | const struct pciserial_board *board, | ||
803 | struct uart_port *port, int idx) | ||
804 | { | ||
805 | port->flags |= UPF_NO_TXEN_TEST; | ||
806 | printk(KERN_DEBUG "serial8250: skipping TxEn test for device " | ||
807 | "[%04x:%04x] subsystem [%04x:%04x]\n", | ||
808 | priv->dev->vendor, | ||
809 | priv->dev->device, | ||
810 | priv->dev->subsystem_vendor, | ||
811 | priv->dev->subsystem_device); | ||
812 | |||
813 | return pci_default_setup(priv, board, port, idx); | ||
814 | } | ||
815 | |||
801 | /* This should be in linux/pci_ids.h */ | 816 | /* This should be in linux/pci_ids.h */ |
802 | #define PCI_VENDOR_ID_SBSMODULARIO 0x124B | 817 | #define PCI_VENDOR_ID_SBSMODULARIO 0x124B |
803 | #define PCI_SUBVENDOR_ID_SBSMODULARIO 0x124B | 818 | #define PCI_SUBVENDOR_ID_SBSMODULARIO 0x124B |
@@ -864,6 +879,27 @@ static struct pci_serial_quirk pci_serial_quirks[] __refdata = { | |||
864 | .init = pci_inteli960ni_init, | 879 | .init = pci_inteli960ni_init, |
865 | .setup = pci_default_setup, | 880 | .setup = pci_default_setup, |
866 | }, | 881 | }, |
882 | { | ||
883 | .vendor = PCI_VENDOR_ID_INTEL, | ||
884 | .device = PCI_DEVICE_ID_INTEL_8257X_SOL, | ||
885 | .subvendor = PCI_ANY_ID, | ||
886 | .subdevice = PCI_ANY_ID, | ||
887 | .setup = skip_tx_en_setup, | ||
888 | }, | ||
889 | { | ||
890 | .vendor = PCI_VENDOR_ID_INTEL, | ||
891 | .device = PCI_DEVICE_ID_INTEL_82573L_SOL, | ||
892 | .subvendor = PCI_ANY_ID, | ||
893 | .subdevice = PCI_ANY_ID, | ||
894 | .setup = skip_tx_en_setup, | ||
895 | }, | ||
896 | { | ||
897 | .vendor = PCI_VENDOR_ID_INTEL, | ||
898 | .device = PCI_DEVICE_ID_INTEL_82573E_SOL, | ||
899 | .subvendor = PCI_ANY_ID, | ||
900 | .subdevice = PCI_ANY_ID, | ||
901 | .setup = skip_tx_en_setup, | ||
902 | }, | ||
867 | /* | 903 | /* |
868 | * ITE | 904 | * ITE |
869 | */ | 905 | */ |