serial: 8250_mid: Enable HSU on Intel Cedar Fork PCH

Intel Cedar Fork PCH has similar HSU as has been used on Intel Denverton.
Add PCI ID to get it enumerated.

While here, remove DNV part form INTEL_MID_UART_DNV_FISR to show that is
used not only on Intel Denverton from now on.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/serial/8250/8250_mid.c b/drivers/tty/serial/8250/8250_mid.c
index ec957cce8c9a72662d838edf3b915e50b4524da4..b8f0b7f70d5a4eeed061b150eebfee39ec540607 100644 (file)
--- a/drivers/tty/serial/8250/8250_mid.c
+++ b/drivers/tty/serial/8250/8250_mid.c
@@ -23,10 +23,11 @@
 #define PCI_DEVICE_ID_INTEL_PNW_UART2  0x081c
 #define PCI_DEVICE_ID_INTEL_PNW_UART3  0x081d
 #define PCI_DEVICE_ID_INTEL_TNG_UART   0x1191
+#define PCI_DEVICE_ID_INTEL_CDF_UART   0x18d8
 #define PCI_DEVICE_ID_INTEL_DNV_UART   0x19d8
 
 /* Intel MID Specific registers */
-#define INTEL_MID_UART_DNV_FISR                0x08
+#define INTEL_MID_UART_FISR            0x08
 #define INTEL_MID_UART_PS              0x30
 #define INTEL_MID_UART_MUL             0x34
 #define INTEL_MID_UART_DIV             0x38
@@ -130,7 +131,7 @@ static int dnv_handle_irq(struct uart_port *p)
 {
        struct mid8250 *mid = p->private_data;
        struct uart_8250_port *up = up_to_u8250p(p);
-       unsigned int fisr = serial_port_in(p, INTEL_MID_UART_DNV_FISR);
+       unsigned int fisr = serial_port_in(p, INTEL_MID_UART_FISR);
        u32 status;
        int ret = 0;
        int err;
@@ -377,6 +378,7 @@ static const struct pci_device_id pci_ids[] = {
        MID_DEVICE(PCI_DEVICE_ID_INTEL_PNW_UART2, pnw_board),
        MID_DEVICE(PCI_DEVICE_ID_INTEL_PNW_UART3, pnw_board),
        MID_DEVICE(PCI_DEVICE_ID_INTEL_TNG_UART, tng_board),
+       MID_DEVICE(PCI_DEVICE_ID_INTEL_CDF_UART, dnv_board),
        MID_DEVICE(PCI_DEVICE_ID_INTEL_DNV_UART, dnv_board),
        { },
 };

diff --git a/drivers/tty/serial/8250/8250_pci.c b/drivers/tty/serial/8250/8250_pci.c
index 0c101a7470b0eedb6306f3bca609b097ecac7b27..a6bf59d8b1d65cc353357cdb0d4a3f27a0467dc3 100644 (file)
--- a/drivers/tty/serial/8250/8250_pci.c
+++ b/drivers/tty/serial/8250/8250_pci.c
@@ -3368,6 +3368,7 @@ static const struct pci_device_id blacklist[] = {
        { PCI_VDEVICE(INTEL, 0x081c), },
        { PCI_VDEVICE(INTEL, 0x081d), },
        { PCI_VDEVICE(INTEL, 0x1191), },
+       { PCI_VDEVICE(INTEL, 0x18d8), },
        { PCI_VDEVICE(INTEL, 0x19d8), },
 
        /* Intel platforms with DesignWare UART */