git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From 39aced68d664291db3324d0fcf0985ab5626aac2 Mon Sep 17 00:00:00 2001
   2 From: Niels de Vos <niels.devos@wincor-nixdorf.com>
   3 Date: Fri, 2 Jan 2009 13:46:58 +0000
   4 Subject: serial: set correct baud_base for Oxford Semiconductor Ltd EXSYS EX-41092 Dual 16950 Serial adapter
   5
   6 From: Niels de Vos <niels.devos@wincor-nixdorf.com>
   7
   8 commit 39aced68d664291db3324d0fcf0985ab5626aac2 upstream.
   9
  10 The PCI-card identified as "Oxford Semiconductor Ltd EXSYS EX-41092 Dual
  11 16950 Serial adapter" is only usable with other devices (i.e. not the same
  12 card) after doing a "setserial /dev/ttyS<n> baud_base 115200".  This
  13 baud_base should be default for this card.
  14
  15 Signed-off-by: Niels de Vos <niels.devos@wincor-nixdorf.com>
  16 Signed-off-by: Alan Cox <alan@redhat.com>
  17 Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  18 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  19
  20 ---
  21  drivers/serial/8250_pci.c |    3 +++
  22  include/linux/pci_ids.h   |    1 +
  23  2 files changed, 4 insertions(+)
  24
  25 --- a/drivers/serial/8250_pci.c
  26 +++ b/drivers/serial/8250_pci.c
  27 @@ -2375,6 +2375,9 @@ static struct pci_device_id serial_pci_t
  28                  * For now just used the hex ID 0x950a.
  29                  */
  30         {       PCI_VENDOR_ID_OXSEMI, 0x950a,
  31 +               PCI_SUBVENDOR_ID_SIIG, PCI_SUBDEVICE_ID_SIIG_DUAL_SERIAL, 0, 0,
  32 +               pbn_b0_2_115200 },
  33 +       {       PCI_VENDOR_ID_OXSEMI, 0x950a,
  34                 PCI_ANY_ID, PCI_ANY_ID, 0, 0,
  35                 pbn_b0_2_1130000 },
  36         {       PCI_VENDOR_ID_OXSEMI, PCI_DEVICE_ID_OXSEMI_16PCI954,
  37 --- a/include/linux/pci_ids.h
  38 +++ b/include/linux/pci_ids.h
  39 @@ -1770,6 +1770,7 @@
  40  #define PCI_DEVICE_ID_SIIG_8S_20x_650  0x2081
  41  #define PCI_DEVICE_ID_SIIG_8S_20x_850  0x2082
  42  #define PCI_SUBDEVICE_ID_SIIG_QUARTET_SERIAL   0x2050
  43 +#define PCI_SUBDEVICE_ID_SIIG_DUAL_SERIAL      0x2530
  44
  45  #define PCI_VENDOR_ID_RADISYS          0x1331
  46