diff options
Diffstat (limited to 'drivers/tty/serial/8250/8250_mid.c')
-rw-r--r-- | drivers/tty/serial/8250/8250_mid.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/tty/serial/8250/8250_mid.c b/drivers/tty/serial/8250/8250_mid.c index ec957cce8c9a..efa0515139f8 100644 --- a/drivers/tty/serial/8250/8250_mid.c +++ b/drivers/tty/serial/8250/8250_mid.c | |||
@@ -1,12 +1,9 @@ | |||
1 | // SPDX-License-Identifier: GPL-2.0 | ||
1 | /* | 2 | /* |
2 | * 8250_mid.c - Driver for UART on Intel Penwell and various other Intel SOCs | 3 | * 8250_mid.c - Driver for UART on Intel Penwell and various other Intel SOCs |
3 | * | 4 | * |
4 | * Copyright (C) 2015 Intel Corporation | 5 | * Copyright (C) 2015 Intel Corporation |
5 | * Author: Heikki Krogerus <heikki.krogerus@linux.intel.com> | 6 | * Author: Heikki Krogerus <heikki.krogerus@linux.intel.com> |
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License version 2 as | ||
9 | * published by the Free Software Foundation. | ||
10 | */ | 7 | */ |
11 | 8 | ||
12 | #include <linux/bitops.h> | 9 | #include <linux/bitops.h> |
@@ -23,10 +20,11 @@ | |||
23 | #define PCI_DEVICE_ID_INTEL_PNW_UART2 0x081c | 20 | #define PCI_DEVICE_ID_INTEL_PNW_UART2 0x081c |
24 | #define PCI_DEVICE_ID_INTEL_PNW_UART3 0x081d | 21 | #define PCI_DEVICE_ID_INTEL_PNW_UART3 0x081d |
25 | #define PCI_DEVICE_ID_INTEL_TNG_UART 0x1191 | 22 | #define PCI_DEVICE_ID_INTEL_TNG_UART 0x1191 |
23 | #define PCI_DEVICE_ID_INTEL_CDF_UART 0x18d8 | ||
26 | #define PCI_DEVICE_ID_INTEL_DNV_UART 0x19d8 | 24 | #define PCI_DEVICE_ID_INTEL_DNV_UART 0x19d8 |
27 | 25 | ||
28 | /* Intel MID Specific registers */ | 26 | /* Intel MID Specific registers */ |
29 | #define INTEL_MID_UART_DNV_FISR 0x08 | 27 | #define INTEL_MID_UART_FISR 0x08 |
30 | #define INTEL_MID_UART_PS 0x30 | 28 | #define INTEL_MID_UART_PS 0x30 |
31 | #define INTEL_MID_UART_MUL 0x34 | 29 | #define INTEL_MID_UART_MUL 0x34 |
32 | #define INTEL_MID_UART_DIV 0x38 | 30 | #define INTEL_MID_UART_DIV 0x38 |
@@ -130,7 +128,7 @@ static int dnv_handle_irq(struct uart_port *p) | |||
130 | { | 128 | { |
131 | struct mid8250 *mid = p->private_data; | 129 | struct mid8250 *mid = p->private_data; |
132 | struct uart_8250_port *up = up_to_u8250p(p); | 130 | struct uart_8250_port *up = up_to_u8250p(p); |
133 | unsigned int fisr = serial_port_in(p, INTEL_MID_UART_DNV_FISR); | 131 | unsigned int fisr = serial_port_in(p, INTEL_MID_UART_FISR); |
134 | u32 status; | 132 | u32 status; |
135 | int ret = 0; | 133 | int ret = 0; |
136 | int err; | 134 | int err; |
@@ -377,6 +375,7 @@ static const struct pci_device_id pci_ids[] = { | |||
377 | MID_DEVICE(PCI_DEVICE_ID_INTEL_PNW_UART2, pnw_board), | 375 | MID_DEVICE(PCI_DEVICE_ID_INTEL_PNW_UART2, pnw_board), |
378 | MID_DEVICE(PCI_DEVICE_ID_INTEL_PNW_UART3, pnw_board), | 376 | MID_DEVICE(PCI_DEVICE_ID_INTEL_PNW_UART3, pnw_board), |
379 | MID_DEVICE(PCI_DEVICE_ID_INTEL_TNG_UART, tng_board), | 377 | MID_DEVICE(PCI_DEVICE_ID_INTEL_TNG_UART, tng_board), |
378 | MID_DEVICE(PCI_DEVICE_ID_INTEL_CDF_UART, dnv_board), | ||
380 | MID_DEVICE(PCI_DEVICE_ID_INTEL_DNV_UART, dnv_board), | 379 | MID_DEVICE(PCI_DEVICE_ID_INTEL_DNV_UART, dnv_board), |
381 | { }, | 380 | { }, |
382 | }; | 381 | }; |