diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-10-02 01:35:42 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-10-02 01:35:42 +0200 |
| commit | 52ff5adc1f942008a790d6f964dec13793480c27 (patch) | |
| tree | d45ebe69cee9706eaedf0f149d4050114c3aa021 /drivers/tty | |
| parent | 08895a8b6b06ed2323cd97a36ee40a116b3db8ed (diff) | |
| parent | 20a875e2e86e73d13ec256781a7d55a7885868ec (diff) | |
| download | linux-52ff5adc1f942008a790d6f964dec13793480c27.tar.bz2 | |
Merge branch 'device-properties'
* device-properties:
serial: 8250_dw: Add quirk for APM X-Gene SoC
ACPI / LPSS: Provide build-in properties of the UART
ACPI / APD: Provide build-in properties of the UART
driver core: Don't leak secondary fwnode on device removal
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/serial/8250/8250_dw.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c index e19969614203..5c0c123565ad 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c @@ -298,12 +298,17 @@ static void dw8250_quirks(struct uart_port *p, struct dw8250_data *data) p->serial_out = dw8250_serial_out32be; } } else if (has_acpi_companion(p->dev)) { - p->iotype = UPIO_MEM32; - p->regshift = 2; - p->serial_in = dw8250_serial_in32; + const struct acpi_device_id *id; + + id = acpi_match_device(p->dev->driver->acpi_match_table, + p->dev); + if (id && !strcmp(id->id, "APMC0D08")) { + p->iotype = UPIO_MEM32; + p->regshift = 2; + p->serial_in = dw8250_serial_in32; + data->uart_16550_compatible = true; + } p->set_termios = dw8250_set_termios; - /* So far none of there implement the Busy Functionality */ - data->uart_16550_compatible = true; } /* Platforms with iDMA */ |