serial: 8250_pci: Correct uartclk for xr17v35x expansion chips

commit 899f0c1c7dbcc487fdc8756a49ff70b1d5d75f89 upstream.

The internal clock of the master chip, which is usually 125MHz, is only half
(62.5MHz) for the slave chips. So we have to adjust the uartclk for all the
slave ports. Therefor we add a new function to determine if a slave chip is
present and update pci_xr17v35x_setup accordingly.

Signed-off-by: Soeren Grunewald <soeren.grunewald@desy.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 996f8f3fd423eabcb8f9a55be000a8219d2635a7..1e1fed47eabcf39b0dc5bc7fbb0954b1d6996ccc 100644 (file)
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -1613,6 +1613,9 @@ static int pci_eg20t_init(struct pci_dev *dev)
 #endif
 }
 
+#define PCI_DEVICE_ID_EXAR_XR17V4358   0x4358
+#define PCI_DEVICE_ID_EXAR_XR17V8358   0x8358
+
 static int
 pci_xr17c154_setup(struct serial_private *priv,
                  const struct pciserial_board *board,
@@ -1622,6 +1625,15 @@ pci_xr17c154_setup(struct serial_private *priv,
        return pci_default_setup(priv, board, port, idx);
 }
 
+static inline int
+xr17v35x_has_slave(struct serial_private *priv)
+{
+       const int dev_id = priv->dev->device;
+
+       return ((dev_id == PCI_DEVICE_ID_EXAR_XR17V4358) ||
+               (dev_id == PCI_DEVICE_ID_EXAR_XR17V8358));
+}
+
 static int
 pci_xr17v35x_setup(struct serial_private *priv,
                  const struct pciserial_board *board,
@@ -1635,6 +1647,13 @@ pci_xr17v35x_setup(struct serial_private *priv,
 
        port->port.flags |= UPF_EXAR_EFR;
 
+       /*
+        * Setup the uart clock for the devices on expansion slot to
+        * half the clock speed of the main chip (which is 125MHz)
+        */
+       if (xr17v35x_has_slave(priv) && idx >= 8)
+               port->port.uartclk = (7812500 * 16 / 2);
+
        /*
         * Setup Multipurpose Input/Output pins.
         */
@@ -1772,9 +1791,6 @@ pci_wch_ch353_setup(struct serial_private *priv,
 #define PCI_DEVICE_ID_SUNIX_1999       0x1999
 
 
-#define PCI_DEVICE_ID_EXAR_XR17V4358   0x4358
-#define PCI_DEVICE_ID_EXAR_XR17V8358   0x8358
-
 /* Unknown vendors/cards - this should not be in linux/pci_ids.h */
 #define PCI_SUBDEVICE_ID_UNKNOWN_0x1584        0x1584
 #define PCI_SUBDEVICE_ID_UNKNOWN_0x1588        0x1588