From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kefeng Wang Subject: [PATCH v2 2/2] serial: 8250_dw: add ACPI support for uart on Hisilicon Hip05 soc Date: Thu, 30 Jun 2016 09:27:42 +0800 Message-ID: <1467250062-61583-3-git-send-email-wangkefeng.wang@huawei.com> References: <1467250062-61583-1-git-send-email-wangkefeng.wang@huawei.com> Mime-Version: 1.0 Content-Type: text/plain Return-path: Received: from szxga03-in.huawei.com ([119.145.14.66]:35745 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751483AbcF3B3P (ORCPT ); Wed, 29 Jun 2016 21:29:15 -0400 In-Reply-To: <1467250062-61583-1-git-send-email-wangkefeng.wang@huawei.com> Sender: linux-acpi-owner@vger.kernel.org List-Id: linux-acpi@vger.kernel.org To: Greg Kroah-Hartman Cc: Jiri Slaby , linux-serial@vger.kernel.org, linux-kernel@vger.kernel.org, Andy Shevchenko , z.liuxinliang@hisilicon.com, guohanjun@huawei.com, linux-acpi@vger.kernel.org, xuwei5@hisilicon.com, graeme.gregory@linaro.org, Kefeng Wang Add ACPI identifier for UART on Hisilicon Hip05 soc, be careful that it is not 16550 compatibal. Meanwhile, set dw8250_serial_out32 to keep consistent between serial_out and serial_in in ACPI. Signed-off-by: Kefeng Wang --- drivers/tty/serial/8250/8250_dw.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c index 65f3da7..096431b 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c @@ -272,6 +272,12 @@ static bool dw8250_idma_filter(struct dma_chan *chan, void *param) return param == chan->device->dev->parent; } +/* non 16550 compatible id list*/ +static const struct acpi_device_id non_16550_id_list[] = { + { "HISI0031", 0 }, + { }, +}; + static void dw8250_quirks(struct uart_port *p, struct dw8250_data *data) { if (p->dev->of_node) { @@ -301,8 +307,10 @@ static void dw8250_quirks(struct uart_port *p, struct dw8250_data *data) p->iotype = UPIO_MEM32; p->regshift = 2; p->serial_in = dw8250_serial_in32; - /* So far none of there implement the Busy Functionality */ - data->uart_16550_compatible = true; + p->serial_out = dw8250_serial_out32; + + if (!acpi_match_device(non_16550_id_list, p->dev)) + data->uart_16550_compatible = true; } /* Platforms with iDMA */ @@ -618,6 +626,7 @@ static const struct acpi_device_id dw8250_acpi_match[] = { { "APMC0D08", 0}, { "AMD0020", 0 }, { "AMDI0020", 0 }, + { "HISI0031", 0 }, { }, }; MODULE_DEVICE_TABLE(acpi, dw8250_acpi_match); -- 1.7.12.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751835AbcF3B3S (ORCPT ); Wed, 29 Jun 2016 21:29:18 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:35745 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751483AbcF3B3P (ORCPT ); Wed, 29 Jun 2016 21:29:15 -0400 From: Kefeng Wang To: Greg Kroah-Hartman CC: Jiri Slaby , , , Andy Shevchenko , , , , , , Kefeng Wang Subject: [PATCH v2 2/2] serial: 8250_dw: add ACPI support for uart on Hisilicon Hip05 soc Date: Thu, 30 Jun 2016 09:27:42 +0800 Message-ID: <1467250062-61583-3-git-send-email-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1467250062-61583-1-git-send-email-wangkefeng.wang@huawei.com> References: <1467250062-61583-1-git-send-email-wangkefeng.wang@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.175.102.37] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090201.577475E8.0042,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 3fca6c34bc758cf4dc5bee104bc64b68 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add ACPI identifier for UART on Hisilicon Hip05 soc, be careful that it is not 16550 compatibal. Meanwhile, set dw8250_serial_out32 to keep consistent between serial_out and serial_in in ACPI. Signed-off-by: Kefeng Wang --- drivers/tty/serial/8250/8250_dw.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c index 65f3da7..096431b 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c @@ -272,6 +272,12 @@ static bool dw8250_idma_filter(struct dma_chan *chan, void *param) return param == chan->device->dev->parent; } +/* non 16550 compatible id list*/ +static const struct acpi_device_id non_16550_id_list[] = { + { "HISI0031", 0 }, + { }, +}; + static void dw8250_quirks(struct uart_port *p, struct dw8250_data *data) { if (p->dev->of_node) { @@ -301,8 +307,10 @@ static void dw8250_quirks(struct uart_port *p, struct dw8250_data *data) p->iotype = UPIO_MEM32; p->regshift = 2; p->serial_in = dw8250_serial_in32; - /* So far none of there implement the Busy Functionality */ - data->uart_16550_compatible = true; + p->serial_out = dw8250_serial_out32; + + if (!acpi_match_device(non_16550_id_list, p->dev)) + data->uart_16550_compatible = true; } /* Platforms with iDMA */ @@ -618,6 +626,7 @@ static const struct acpi_device_id dw8250_acpi_match[] = { { "APMC0D08", 0}, { "AMD0020", 0 }, { "AMDI0020", 0 }, + { "HISI0031", 0 }, { }, }; MODULE_DEVICE_TABLE(acpi, dw8250_acpi_match); -- 1.7.12.4