From patchwork Fri Jul 15 11:01:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kefeng Wang X-Patchwork-Id: 9231693 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id BDA976075D for ; Fri, 15 Jul 2016 11:03:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B05EE27D5D for ; Fri, 15 Jul 2016 11:03:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A548428324; Fri, 15 Jul 2016 11:03:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C343427D5D for ; Fri, 15 Jul 2016 11:03:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932553AbcGOLDG (ORCPT ); Fri, 15 Jul 2016 07:03:06 -0400 Received: from szxga01-in.huawei.com ([58.251.152.64]:65406 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932537AbcGOLDF (ORCPT ); Fri, 15 Jul 2016 07:03:05 -0400 Received: from 172.24.1.36 (EHLO szxeml434-hub.china.huawei.com) ([172.24.1.36]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DNR83115; Fri, 15 Jul 2016 19:03:00 +0800 (CST) Received: from linux-ibm.site (10.175.102.37) by szxeml434-hub.china.huawei.com (10.82.67.225) with Microsoft SMTP Server id 14.3.235.1; Fri, 15 Jul 2016 19:02:49 +0800 From: Kefeng Wang To: , , , CC: , , , , , Kefeng Wang Subject: [PATCH v3 3/3] serial: 8250_dw: add ACPI support for uart on Hisilicon Hip05 soc Date: Fri, 15 Jul 2016 19:01:25 +0800 Message-ID: <1468580485-28567-4-git-send-email-wangkefeng.wang@huawei.com> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1468580485-28567-1-git-send-email-wangkefeng.wang@huawei.com> References: <1468580485-28567-1-git-send-email-wangkefeng.wang@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.102.37] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090205.5788C2E5.026D, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 3c20c6792ab08e04d45676e493d119c2 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Use built-in device properties to set device parameters for the existing device probed by acpi. Add ACPI identifier for UART on Hisilicon Hip05 soc, be careful that it is not 16550 compatibal, so we need set "reg-io-width" and "reg-shift" by _DSD method in DSDT. Signed-off-by: Kefeng Wang --- drivers/tty/serial/8250/8250_dw.c | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c index d6934310..5ab9cfe 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c @@ -297,12 +297,6 @@ static void dw8250_quirks(struct uart_port *p, struct dw8250_data *data) p->serial_in = dw8250_serial_in32be; 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; - /* So far none of there implement the Busy Functionality */ - data->uart_16550_compatible = true; } /* Platforms with iDMA */ @@ -352,6 +346,19 @@ static void dw8250_setup_port(struct uart_port *p) up->capabilities |= UART_CAP_AFE; } +static struct property_entry dw8250_properties[] = { + PROPERTY_ENTRY_U32("reg-io-width", 4), + PROPERTY_ENTRY_U32("reg-shift", 2), + PROPERTY_ENTRY_BOOL("snps,uart-16550-compatible"), + { }, +}; + +/* non 16550 compatible id list*/ +static const struct acpi_device_id non_16550_ids[] = { + { "HISI0031", 0 }, + { }, +}; + static int dw8250_probe(struct platform_device *pdev) { struct uart_8250_port uart = {}; @@ -395,6 +402,9 @@ static int dw8250_probe(struct platform_device *pdev) if (!data) return -ENOMEM; + if (has_acpi_companion(dev) && !acpi_match_device(non_16550_ids, dev)) + platform_device_add_properties(pdev, dw8250_properties); + data->dma.fn = dw8250_fallback_dma_filter; data->usr_reg = DW_UART_USR; p->private_data = data; @@ -619,6 +629,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);